Android: implement QCameraInfoControl.

VideoOutput will now take into account the camera sensor orientation to
adjust the viewport orientation, we don't need to apply a rotation on
the Android Camera anymore.

Change-Id: Ia7639f0a5711ab6cc6f80b9716bc1a6f389499b4
Reviewed-by: Christian Stromme <christian.stromme@digia.com>

2 files changed, 0 insertions, 23 deletions

diff --git a/src/plugins/android/src/wrappers/jcamera.cpp b/src/plugins/android/src/wrappers/jcamera.cpp
index c880141af..23f3e14b4 100644
--- a/src/plugins/android/src/wrappers/jcamera.cpp
+++ b/src/plugins/android/src/wrappers/jcamera.cpp
@@ -158,8 +158,6 @@ class JCameraWorker : public QObject, public QJNIObjectPrivate
     Q_INVOKABLE JCamera::CameraFacing getFacing();
     Q_INVOKABLE int getNativeOrientation();
 
-    Q_INVOKABLE void setDisplayOrientation(int degrees);
-
     Q_INVOKABLE QSize getPreferredPreviewSizeForVideo();
     Q_INVOKABLE QList<QSize> getSupportedPreviewSizes();
 
@@ -231,7 +229,6 @@ class JCameraWorker : public QObject, public QJNIObjectPrivate
 
     QSize m_previewSize;
     int m_rotation;
-    int m_displayOrientation;
 
     bool m_hasAPI14;
 
@@ -337,17 +334,6 @@ int JCamera::getNativeOrientation()
     return d->getNativeOrientation();
 }
 
-int JCamera::getDisplayOrientation() const
-{
-    return d->m_displayOrientation;
-}
-
-void JCamera::setDisplayOrientation(int degrees)
-{
-    d->m_displayOrientation = degrees;
-    QMetaObject::invokeMethod(d, "setDisplayOrientation", Q_ARG(int, degrees));
-}
-
 QSize JCamera::getPreferredPreviewSizeForVideo()
 {
     return d->getPreferredPreviewSizeForVideo();
@@ -626,7 +612,6 @@ JCameraWorker::JCameraWorker(JCamera *camera, int cameraId, jobject cam, QThread
     , QJNIObjectPrivate(cam)
     , m_cameraId(cameraId)
     , m_rotation(0)
-    , m_displayOrientation(0)
     , m_hasAPI14(false)
     , m_parametersMutex(QMutex::Recursive)
 {
@@ -692,11 +677,6 @@ int JCameraWorker::getNativeOrientation()
     return m_info.getField<jint>("orientation");
 }
 
-void JCameraWorker::setDisplayOrientation(int degrees)
-{
-    callMethod<void>("setDisplayOrientation", "(I)V", degrees);
-}
-
 QSize JCameraWorker::getPreferredPreviewSizeForVideo()
 {
     QMutexLocker parametersLocker(&m_parametersMutex);
diff --git a/src/plugins/android/src/wrappers/jcamera.h b/src/plugins/android/src/wrappers/jcamera.h
index e9063f120..81c334eb4 100644
--- a/src/plugins/android/src/wrappers/jcamera.h
+++ b/src/plugins/android/src/wrappers/jcamera.h
@@ -88,9 +88,6 @@ public:
     CameraFacing getFacing();
     int getNativeOrientation();
 
-    int getDisplayOrientation() const;
-    void setDisplayOrientation(int degrees);
-
     QSize getPreferredPreviewSizeForVideo();
     QList<QSize> getSupportedPreviewSizes();