Android: support non OpenGL video surfaces for the camera.

QCamera can now pass raw frame data to its QAbstractVideoSurface.
The now deprecated Android camera API we're using doesn't allow to
get frame data without also displaying the frames in a SurfaceView
or a SurfaceTexture. To work around that, an invisible dummy
SurfaceView is used.
This allows to retrieve frames in the NV21, YV12, YUY2 or RGB565
formats, depending on the Android version and on the device.

Task-number: QTBUG-35416
Change-Id: I77b4f50505c3b91efb4b2288a57f50398922c0db
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>

3 files changed, 120 insertions, 6 deletions

diff --git a/src/plugins/android/jar/jar.pri b/src/plugins/android/jar/jar.pri
index d31839c61..713123baf 100644
--- a/src/plugins/android/jar/jar.pri
+++ b/src/plugins/android/jar/jar.pri
@@ -10,7 +10,8 @@ JAVASOURCES += $$PWD/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlay
                $$PWD/src/org/qtproject/qt5/android/multimedia/QtSurfaceTextureListener.java \
                $$PWD/src/org/qtproject/qt5/android/multimedia/QtSurfaceTextureHolder.java \
                $$PWD/src/org/qtproject/qt5/android/multimedia/QtMultimediaUtils.java \
-               $$PWD/src/org/qtproject/qt5/android/multimedia/QtMediaRecorderListener.java
+               $$PWD/src/org/qtproject/qt5/android/multimedia/QtMediaRecorderListener.java \
+               $$PWD/src/org/qtproject/qt5/android/multimedia/QtSurfaceHolderCallback.java
 
 # install
 target.path = $$[QT_INSTALL_PREFIX]/jar
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 974489c19..8724eeba4 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
@@ -54,6 +54,8 @@ public class QtCameraListener implements Camera.ShutterCallback,
     private byte[][] m_previewBuffers = null;
     private byte[] m_lastPreviewBuffer = null;
     private Camera.Size m_previewSize = null;
+    private int m_previewFormat = ImageFormat.NV21; // Default preview format on all devices
+    private int m_previewBytesPerLine = -1;
 
     private QtCameraListener(int id)
     {
@@ -86,6 +88,16 @@ public class QtCameraListener implements Camera.ShutterCallback,
         return m_previewSize.height;
     }
 
+    public int previewFormat()
+    {
+        return m_previewFormat;
+    }
+
+    public int previewBytesPerLine()
+    {
+        return m_previewBytesPerLine;
+    }
+
     public void setupPreviewCallback(Camera camera)
     {
         // Clear previous callback (also clears added buffers)
@@ -94,8 +106,37 @@ public class QtCameraListener implements Camera.ShutterCallback,
 
         final Camera.Parameters params = camera.getParameters();
         m_previewSize = params.getPreviewSize();
-        double bytesPerPixel = ImageFormat.getBitsPerPixel(params.getPreviewFormat()) / 8.0;
-        int bufferSizeNeeded = (int) Math.ceil(bytesPerPixel * m_previewSize.width * m_previewSize.height);
+        m_previewFormat = params.getPreviewFormat();
+
+        int bufferSizeNeeded = 0;
+        if (m_previewFormat == ImageFormat.YV12) {
+            // For YV12, bytes per line must be a multiple of 16
+            final int yStride = (int) Math.ceil(m_previewSize.width / 16.0) * 16;
+            final int uvStride = (int) Math.ceil((yStride / 2) / 16.0) * 16;
+            final int ySize = yStride * m_previewSize.height;
+            final int uvSize = uvStride * m_previewSize.height / 2;
+            bufferSizeNeeded = ySize + uvSize * 2;
+
+            m_previewBytesPerLine = yStride;
+
+        } else {
+            double bytesPerPixel = ImageFormat.getBitsPerPixel(m_previewFormat) / 8.0;
+            bufferSizeNeeded = (int) Math.ceil(bytesPerPixel * m_previewSize.width * m_previewSize.height);
+
+            // bytes per line are calculated only for the first plane
+            switch (m_previewFormat) {
+            case ImageFormat.NV21:
+                m_previewBytesPerLine = m_previewSize.width; // 1 byte per sample and tightly packed
+                break;
+            case ImageFormat.RGB_565:
+            case ImageFormat.YUY2:
+                m_previewBytesPerLine = m_previewSize.width * 2; // 2 bytes per pixel
+                break;
+            default:
+                m_previewBytesPerLine = -1;
+                break;
+            }
+        }
 
         // We could keep the same buffers when they are already bigger than the required size
         // but the Android doc says the size must match, so in doubt just replace them.
@@ -117,8 +158,12 @@ public class QtCameraListener implements Camera.ShutterCallback,
 
         m_lastPreviewBuffer = data;
 
-        if (data != null && m_notifyNewFrames)
-            notifyNewPreviewFrame(m_cameraId, data, m_previewSize.width, m_previewSize.height);
+        if (data != null && m_notifyNewFrames) {
+            notifyNewPreviewFrame(m_cameraId, data,
+                                  m_previewSize.width, m_previewSize.height,
+                                  m_previewFormat,
+                                  m_previewBytesPerLine);
+        }
     }
 
     @Override
@@ -142,5 +187,6 @@ public class QtCameraListener implements Camera.ShutterCallback,
     private static native void notifyAutoFocusComplete(int id, boolean success);
     private static native void notifyPictureExposed(int id);
     private static native void notifyPictureCaptured(int id, byte[] data);
-    private static native void notifyNewPreviewFrame(int id, byte[] data, int width, int height);
+    private static native void notifyNewPreviewFrame(int id, byte[] data, int width, int height,
+                                                     int pixelFormat, int bytesPerLine);
 }
diff --git a/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtSurfaceHolderCallback.java b/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtSurfaceHolderCallback.java
new file mode 100644
index 000000000..266d8a150
--- /dev/null
+++ b/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtSurfaceHolderCallback.java
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtMultimedia of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+package org.qtproject.qt5.android.multimedia;
+
+import android.view.SurfaceHolder;
+
+public class QtSurfaceHolderCallback implements SurfaceHolder.Callback
+{
+    private long m_id = -1;
+
+    public QtSurfaceHolderCallback(long id)
+    {
+        m_id = id;
+    }
+
+    @Override
+    public void surfaceChanged(SurfaceHolder holder, int format, int width, int height)
+    {
+    }
+
+    @Override
+    public void surfaceCreated(SurfaceHolder holder)
+    {
+        notifySurfaceCreated(m_id);
+    }
+
+    @Override
+    public void surfaceDestroyed(SurfaceHolder holder)
+    {
+        notifySurfaceDestroyed(m_id);
+    }
+
+
+    private static native void notifySurfaceCreated(long id);
+    private static native void notifySurfaceDestroyed(long id);
+}