From ecce937a054e4a96597cb13c40d216bddbd45891 Mon Sep 17 00:00:00 2001 From: Denis Kormalev Date: Thu, 5 Dec 2013 17:09:07 +0400 Subject: Android: fix camera preview At some(?) devices we can't rely on one shot preview callback because it receives data only after we start new previewing session. And this cause situation when imageCaptured signal is never emitted. This fix applies preview callback with already allocated buffers and collects all preview images in these buffers. When we capture image - we can simply fetch last preview image (if there was any) from c++ part. Task-number: QTBUG-34993 Change-Id: I608750c344ca3c089f4673df4907e0f47e57e2ba Reviewed-by: Yoann Lopes --- .../src/mediacapture/qandroidcamerasession.cpp | 20 +++++++------------- .../android/src/mediacapture/qandroidcamerasession.h | 1 - 2 files changed, 7 insertions(+), 14 deletions(-) (limited to 'src/plugins/android/src/mediacapture') diff --git a/src/plugins/android/src/mediacapture/qandroidcamerasession.cpp b/src/plugins/android/src/mediacapture/qandroidcamerasession.cpp index 5ff19d1c1..55065cb46 100644 --- a/src/plugins/android/src/mediacapture/qandroidcamerasession.cpp +++ b/src/plugins/android/src/mediacapture/qandroidcamerasession.cpp @@ -183,7 +183,6 @@ bool QAndroidCameraSession::open() if (m_camera) { connect(m_camera, SIGNAL(pictureExposed()), this, SLOT(onCameraPictureExposed())); connect(m_camera, SIGNAL(pictureCaptured(QByteArray)), this, SLOT(onCameraPictureCaptured(QByteArray))); - connect(m_camera, SIGNAL(previewFrameAvailable(QByteArray)), this, SLOT(onCameraPreviewFrameAvailable(QByteArray))); m_nativeOrientation = m_camera->getNativeOrientation(); @@ -484,7 +483,6 @@ int QAndroidCameraSession::capture(const QString &fileName) // adjust picture rotation depending on the device orientation m_camera->setRotation(currentCameraRotation()); - m_camera->requestPreviewFrame(); m_camera->takePicture(); } else { //: Drive mode is the camera's shutter mode, for example single shot, continuos exposure, etc. @@ -509,6 +507,13 @@ void QAndroidCameraSession::onCameraPictureExposed() return; emit imageExposed(m_currentImageCaptureId); + QByteArray lastFrame = m_camera->fetchLastPreviewFrame(); + if (lastFrame.size()) { + QtConcurrent::run(this, &QAndroidCameraSession::processPreviewImage, + m_currentImageCaptureId, + lastFrame, + m_camera->getRotation()); + } } void QAndroidCameraSession::onCameraPictureCaptured(const QByteArray &data) @@ -571,17 +576,6 @@ void QAndroidCameraSession::processCapturedImage(int id, } } -void QAndroidCameraSession::onCameraPreviewFrameAvailable(const QByteArray &data) -{ - if (m_captureCanceled || m_readyForCapture) - return; - - QtConcurrent::run(this, &QAndroidCameraSession::processPreviewImage, - m_currentImageCaptureId, - data, - m_camera->getRotation()); -} - void QAndroidCameraSession::processPreviewImage(int id, const QByteArray &data, int rotation) { QSize frameSize = m_camera->previewSize(); diff --git a/src/plugins/android/src/mediacapture/qandroidcamerasession.h b/src/plugins/android/src/mediacapture/qandroidcamerasession.h index 17ea4171f..61d8c1a17 100644 --- a/src/plugins/android/src/mediacapture/qandroidcamerasession.h +++ b/src/plugins/android/src/mediacapture/qandroidcamerasession.h @@ -114,7 +114,6 @@ private Q_SLOTS: void onCameraPictureExposed(); void onCameraPictureCaptured(const QByteArray &data); - void onCameraPreviewFrameAvailable(const QByteArray &data); private: bool open(); -- cgit v1.2.3