1 files changed, 18 insertions, 5 deletions
diff --git a/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtCameraListener.java b/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtCameraListener.java
index 8724eeba4..008458e89 100644
--- a/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtCameraListener.java
+++ b/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtCameraListener.java
@@ -51,6 +51,7 @@ public class QtCameraListener implements Camera.ShutterCallback,
     private int m_cameraId = -1;
 
     private boolean m_notifyNewFrames = false;
+    private boolean m_notifyWhenFrameAvailable = false;
     private byte[][] m_previewBuffers = null;
     private byte[] m_lastPreviewBuffer = null;
     private Camera.Size m_previewSize = null;
@@ -67,6 +68,11 @@ public class QtCameraListener implements Camera.ShutterCallback,
         m_notifyNewFrames = notify;
     }
 
+    public void notifyWhenFrameAvailable(boolean notify)
+    {
+        m_notifyWhenFrameAvailable = notify;
+    }
+
     public byte[] lastPreviewBuffer()
     {
         return m_lastPreviewBuffer;
@@ -158,11 +164,17 @@ public class QtCameraListener implements Camera.ShutterCallback,
 
         m_lastPreviewBuffer = data;
 
-        if (data != null && m_notifyNewFrames) {
-            notifyNewPreviewFrame(m_cameraId, data,
-                                  m_previewSize.width, m_previewSize.height,
-                                  m_previewFormat,
-                                  m_previewBytesPerLine);
+        if (data != null) {
+            if (m_notifyWhenFrameAvailable) {
+                m_notifyWhenFrameAvailable = false;
+                notifyFrameAvailable(m_cameraId);
+            }
+            if (m_notifyNewFrames) {
+                notifyNewPreviewFrame(m_cameraId, data,
+                                      m_previewSize.width, m_previewSize.height,
+                                      m_previewFormat,
+                                      m_previewBytesPerLine);
+            }
         }
     }
 
@@ -189,4 +201,5 @@ public class QtCameraListener implements Camera.ShutterCallback,
     private static native void notifyPictureCaptured(int id, byte[] data);
     private static native void notifyNewPreviewFrame(int id, byte[] data, int width, int height,
                                                      int pixelFormat, int bytesPerLine);
+    private static native void notifyFrameAvailable(int id);
 }