Merge lp:qtubuntu-camera/staging into lp:qtubuntu-camera

[Florian Boucault]

New release:
- Set the metering area to the same as the focus area.

New release:
- Set the metering area to the same as the focus area.

=== modified file 'src/aalcamerafocuscontrol.cpp'
--- src/aalcamerafocuscontrol.cpp	2016-01-21 16:14:37 +0000
+++ src/aalcamerafocuscontrol.cpp	2016-04-21 11:19:15 +0000
@@ -84,11 +84,13 @@
     if (m_focusPoint == point)
         return;
 
+    MeteringRegion meteringRegion;
     m_focusPoint = point;
-    m_focusRegion = point2Region(m_focusPoint);
+    point2Region(m_focusPoint, m_focusRegion, meteringRegion);
     Q_EMIT customFocusPointChanged(m_focusPoint);
 
     if (m_service->androidControl()) {
+        android_camera_set_metering_region(m_service->androidControl(), &meteringRegion);
         android_camera_set_focus_region(m_service->androidControl(), &m_focusRegion);
         startFocus();
     }
@@ -207,7 +209,7 @@
     }
 }
 
-FocusRegion AalCameraFocusControl::point2Region(const QPointF &point) const
+void AalCameraFocusControl::point2Region(const QPointF &point, FocusRegion& region, MeteringRegion& metering) const
 {
     int centerX = (point.x() * (2* focusFullSize)) - focusFullSize;
     int maxCenterPosition = focusFullSize - focusRegionSize;
@@ -215,12 +217,15 @@
     int centerY = (point.y() * (2 * focusFullSize)) - focusFullSize;
     centerY = std::max(std::min(centerY, maxCenterPosition), -maxCenterPosition);
 
-    FocusRegion region;
     region.left = centerX - focusRegionSize;
     region.right = centerX + focusRegionSize;
     region.top = centerY - focusRegionSize;
     region.bottom = centerY + focusRegionSize;
     region.weight = 5;
 
-    return region;
+    metering.left = region.left;
+    metering.right = region.right;
+    metering.top = region.top;
+    metering.bottom = region.bottom;
+    metering.weight = 5;
 }

=== modified file 'src/aalcamerafocuscontrol.h'
--- src/aalcamerafocuscontrol.h	2015-04-08 12:57:01 +0000
+++ src/aalcamerafocuscontrol.h	2016-04-21 11:19:15 +0000
@@ -54,7 +54,7 @@
 private:
     AutoFocusMode qt2Android(QCameraFocus::FocusModes mode);
     QCameraFocus::FocusModes android2Qt(AutoFocusMode mode);
-    FocusRegion point2Region(const QPointF &point) const;
+    void point2Region(const QPointF &point, FocusRegion& region, MeteringRegion& metering) const;
 
     AalCameraService *m_service;
     QCameraFocus::FocusModes m_focusMode;

=== modified file 'unittests/aalcamerafocuscontrol/tst_aalcamerafocuscontrol.cpp'
--- unittests/aalcamerafocuscontrol/tst_aalcamerafocuscontrol.cpp	2016-01-27 16:28:38 +0000
+++ unittests/aalcamerafocuscontrol/tst_aalcamerafocuscontrol.cpp	2016-04-21 11:19:15 +0000
@@ -143,12 +143,17 @@
     AalCameraFocusControl focusControl(0);
 
     QPointF point(x, y);
-    FocusRegion region;
-    region = m_focusControl->point2Region(point);
-    QCOMPARE(region.left, left);
-    QCOMPARE(region.right, right);
-    QCOMPARE(region.top, top);
-    QCOMPARE(region.bottom, bottom);
+    FocusRegion focusRegion;
+    MeteringRegion meteringRegion;
+    m_focusControl->point2Region(point, focusRegion, meteringRegion);
+    QCOMPARE(focusRegion.left, left);
+    QCOMPARE(focusRegion.right, right);
+    QCOMPARE(focusRegion.top, top);
+    QCOMPARE(focusRegion.bottom, bottom);
+    QCOMPARE(focusRegion.left, meteringRegion.left);
+    QCOMPARE(focusRegion.right, meteringRegion.right);
+    QCOMPARE(focusRegion.top, meteringRegion.top);
+    QCOMPARE(focusRegion.bottom, meteringRegion.bottom);
 }
 
 

=== modified file 'unittests/mocks/aal/camera_compatibility_layer.cpp'
--- unittests/mocks/aal/camera_compatibility_layer.cpp	2015-11-25 16:59:38 +0000
+++ unittests/mocks/aal/camera_compatibility_layer.cpp	2016-04-21 11:19:15 +0000
@@ -306,11 +306,22 @@
     crashTest(control);
 }
 
+void android_camera_set_metering_region(CameraControl* control, MeteringRegion* region)
+{
+    Q_UNUSED(region);
+    crashTest(control);
+}
+
 void android_camera_reset_focus_region(CameraControl* control)
 {
     crashTest(control);
 }
 
+void android_camera_reset_metering_region(CameraControl* control)
+{
+    crashTest(control);
+}
+
 void android_camera_set_rotation(CameraControl* control, int rotation)
 {
     Q_UNUSED(rotation);

=== modified file 'unittests/mocks/aal/camera_compatibility_layer_capabilities.h'
--- unittests/mocks/aal/camera_compatibility_layer_capabilities.h	2015-01-14 10:48:34 +0000
+++ unittests/mocks/aal/camera_compatibility_layer_capabilities.h	2016-04-21 11:19:15 +0000
@@ -95,6 +95,15 @@
     int weight;
 } FocusRegion;
 
+typedef struct
+{
+    int top;
+    int left;
+    int bottom;
+    int right;
+    int weight;
+} MeteringRegion;
+
 typedef void (*size_callback)(void* ctx, int width, int height);
 typedef void (*scene_mode_callback)(void* ctx, SceneMode mode);
 typedef void (*flash_mode_callback)(void* ctx, FlashMode mode);
@@ -139,6 +148,7 @@
 
 void android_camera_set_focus_region(CameraControl* control, FocusRegion* region);
 void android_camera_reset_focus_region(CameraControl* control);
+void android_camera_set_metering_region(CameraControl* control, MeteringRegion* region);
 
 // Set photo metadata
 void android_camera_set_rotation(CameraControl* control, int rotation);