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

Merge remote-tracking branch 'origin/release' into stable

Browse Source 
Change-Id: Ieb521fb1e9f297a167eea19c771cb5915c01df97
This commit is contained in:
Jani Heikkinen
2014-04-23 12:45:21 +03:00
parent 78cff36ba8 4c8284de46
commit 7a88dd8c97
62 changed files with 810 additions and 1121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/android/src/mediacapture/qandroidcamerasession.cpp
View File

@@ -286,8 +286,10 @@ void QAndroidCameraSession::close()
void QAndroidCameraSession::setVideoPreview(QObject *videoOutput)
{
if (m_videoOutput)
if (m_videoOutput) {
m_videoOutput->stop();
m_videoOutput->reset();
}
if (videoOutput) {
connect(videoOutput, SIGNAL(readyChanged(bool)), this, SLOT(onVideoOutputReady(bool)));
@@ -368,8 +370,12 @@ void QAndroidCameraSession::stopPreview()
m_camera->stopPreview();
m_camera->setPreviewSize(QSize());
if (m_videoOutput)
m_camera->setPreviewTexture(0);
if (m_videoOutput) {
m_videoOutput->stop();
m_videoOutput->reset();
}
m_previewStarted = false;
}