slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/5.5' into 5.6

Browse Source 
Change-Id: Ia563cf734178b821c2aadda8b79b1f09b17de7cd
This commit is contained in:
Christian Strømme
2016-01-12 15:12:24 +01:00
parent 9a2fcd06a8 c953ef3910
commit 963a534e33
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/android/src/mediacapture/qandroidcapturesession.cpp
View File

@@ -234,13 +234,15 @@ void QAndroidCaptureSession::start()
if (!m_mediaRecorder->prepare()) {
emit error(QMediaRecorder::FormatError, QLatin1String("Unable to prepare the media recorder."));
restartViewfinder();
if (m_cameraSession)
restartViewfinder();
return;
}
if (!m_mediaRecorder->start()) {
emit error(QMediaRecorder::FormatError, QLatin1String("Unable to start the media recorder."));
restartViewfinder();
if (m_cameraSession)
restartViewfinder();
return;
}
@@ -433,6 +435,9 @@ void QAndroidCaptureSession::updateViewfinder()
void QAndroidCaptureSession::restartViewfinder()
{
if (!m_cameraSession)
return;
m_cameraSession->camera()->reconnect();
// This is not necessary on most devices, but it crashes on some if we don't stop the