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

Android: Use QMutexLock in camera callbacks.

Browse Source 
We should not release the locks before the native callbacks returns.

Change-Id: Ia2691f6c5be66a3dcf371e48e3bac7498b401833
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
This commit is contained in:
Christian Strømme
2014-04-03 17:26:05 +02:00
committed by The Qt Project
parent 8a047ef087
commit 60a911096f
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/android/src/wrappers/jcamera.cpp
View File

@@ -82,27 +82,24 @@ static QJNIObjectPrivate rectToArea(const QRect &rect)
// native method for QtCamera.java // native method for QtCamera.java
static void notifyAutoFocusComplete(JNIEnv* , jobject, int id, jboolean success) static void notifyAutoFocusComplete(JNIEnv* , jobject, int id, jboolean success)
{ {
g_objectMapMutex.lock(); QMutexLocker locker(&g_objectMapMutex);
JCamera *obj = g_objectMap.value(id, 0); JCamera *obj = g_objectMap.value(id, 0);
g_objectMapMutex.unlock();
if (obj) if (obj)
Q_EMIT obj->autoFocusComplete(success); Q_EMIT obj->autoFocusComplete(success);
} }
static void notifyPictureExposed(JNIEnv* , jobject, int id) static void notifyPictureExposed(JNIEnv* , jobject, int id)
{ {
g_objectMapMutex.lock(); QMutexLocker locker(&g_objectMapMutex);
JCamera *obj = g_objectMap.value(id, 0); JCamera *obj = g_objectMap.value(id, 0);
g_objectMapMutex.unlock();
if (obj) if (obj)
Q_EMIT obj->pictureExposed(); Q_EMIT obj->pictureExposed();
} }
static void notifyPictureCaptured(JNIEnv *env, jobject, int id, jbyteArray data) static void notifyPictureCaptured(JNIEnv *env, jobject, int id, jbyteArray data)
{ {
g_objectMapMutex.lock(); QMutexLocker locker(&g_objectMapMutex);
JCamera *obj = g_objectMap.value(id, 0); JCamera *obj = g_objectMap.value(id, 0);
g_objectMapMutex.unlock();
if (obj) { if (obj) {
QByteArray bytes; QByteArray bytes;
int arrayLength = env->GetArrayLength(data); int arrayLength = env->GetArrayLength(data);
@@ -114,9 +111,8 @@ static void notifyPictureCaptured(JNIEnv *env, jobject, int id, jbyteArray data)
static void notifyFrameFetched(JNIEnv *env, jobject, int id, jbyteArray data) static void notifyFrameFetched(JNIEnv *env, jobject, int id, jbyteArray data)
{ {
g_objectMapMutex.lock(); QMutexLocker locker(&g_objectMapMutex);
JCamera *obj = g_objectMap.value(id, 0); JCamera *obj = g_objectMap.value(id, 0);
g_objectMapMutex.unlock();
if (obj) { if (obj) {
QByteArray bytes; QByteArray bytes;
int arrayLength = env->GetArrayLength(data); int arrayLength = env->GetArrayLength(data);