camera-app

Merge lp:~uriboni/camera-app/focus-area-coords into lp:camera-app/staging

focus-area-coords
Merge into staging

Proposed by Ugo Riboni on 2016-01-20

Status:	Merged
Approved by:	Florian Boucault on 2016-01-21
Approved revision:	640
Merged at revision:	638
Proposed branch:	lp:~uriboni/camera-app/focus-area-coords
Merge into:	lp:camera-app/staging
Diff against target:	58 lines (+16/-17) 1 file modified ViewFinderView.qml (+16/-17)
To merge this branch:	bzr merge lp:~uriboni/camera-app/focus-area-coords
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2016-01-21
Florian Boucault (community)		2016-01-20	Needs Fixing on 2016-01-21
Review via email: mp+283278@code.launchpad.net

Commit message

Fix some comments that are either formatter wrong or in the wrong place

Description of the change

Fix some comments that are either formatter wrong or in the wrong place

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-01-20:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-staging-ci/13/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Florian Boucault (fboucault) wrote on 2016-01-21:

The inversion of y coordinate should not be done between VideoOutput.mapPointToSourceNormalized and CameraFocus.customFocusPoint but instead between CameraFocus.customFocusPoint and android_camera_set_focus_region (in qtubuntu-camera).

review: Needs Fixing

lp:~uriboni/camera-app/focus-area-coords updated on 2016-01-21

639. By Ugo Riboni on 2016-01-21: Revert previous patch as fix was moved to qtubuntu-camera
640. By Ugo Riboni on 2016-01-21: Fix one more comment

Revision history for this message

Ugo Riboni (uriboni) wrote on 2016-01-21:

Moved the fix to qtubuntu-camera

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-01-21:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-staging-ci/16/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Ubuntu Phablet Team

Ugo Riboni

 === modified file 'ViewFinderView.qml'
 --- ViewFinderView.qml	2016-01-14 15:55:52 +0000
 +++ ViewFinderView.qml	2016-01-21 16:40:35 +0000
@@ -237,16 +237,16 @@
              source: camera
              /* This rotation need to be applied since the camera hardware in the
--                   Galaxy Nexus phone is mounted at an angle inside the device, so the video
--                   feed is rotated too.
--                   FIXME: This should come from a system configuration option so that we
--                   don't have to have a different codebase for each different device we want
--                   to run on. Android has that information and QML has an API to reflect it:
--                   the camera.orientation property. Unfortunately it is not hooked up yet.
++               Galaxy Nexus phone is mounted at an angle inside the device, so the video
++               feed is rotated too.
++               FIXME: This should come from a system configuration option so that we
++               don't have to have a different codebase for each different device we want
++               to run on. Android has that information and QML has an API to reflect it:
++               the camera.orientation property. Unfortunately it is not hooked up yet.
--                   Ref.: http://doc.qt.io/qt-5/qml-qtmultimedia-camera.html#orientation-prop
--                         http://doc.qt.io/qt-5/qcamerainfocontrol.html#cameraOrientation
--                         http://developer.android.com/reference/android/hardware/Camera.CameraInfo.html#orientation
++               Ref.: http://doc.qt.io/qt-5/qml-qtmultimedia-camera.html#orientation-prop
++                     http://doc.qt.io/qt-5/qcamerainfocontrol.html#cameraOrientation
++                     http://developer.android.com/reference/android/hardware/Camera.CameraInfo.html#orientation
              */
              Component.onCompleted: {
                  // Set orientation only at startup because later on Screen.primaryOrientation
@@ -254,14 +254,6 @@
                  orientation = Screen.primaryOrientation === Qt.PortraitOrientation  ? -90 : 0;
+             }
--            /* Convenience item tracking the real position and size of the real video feed.
--                   Having this helps since these values depend on a lot of rules:
--                   - the feed is automatically scaled to fit the viewfinder
--                   - the viewfinder might apply a rotation to the feed, depending on device orientation
--                   - the resolution and aspect ratio of the feed changes depending on the active camera
--                   The item is also separated in a component so it can be unit tested.
--                 */
--
              transform: Rotation {
                  origin.x: viewFinder.width / 2
                  origin.y: viewFinder.height / 2
@@ -270,6 +262,13 @@
+             }
+         }
++        /* Convenience item tracking the real position and size of the real video feed.
++           Having this helps since these values depend on a lot of rules:
++           - the feed is automatically scaled to fit the viewfinder
++           - the viewfinder might apply a rotation to the feed, depending on device orientation
++           - the resolution and aspect ratio of the feed changes depending on the active camera
++           The item is also separated in a component so it can be unit tested.
++         */
          ViewFinderGeometry {
              id: viewFinderGeometry
              anchors.centerIn: parent