Merge lp:~schwann/camera-app/camera-video-orientation into lp:camera-app

[Günter Schwann]

Set orientation for videos

Set orientation for videos

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:149
http://jenkins.qa.ubuntu.com/job/camera-app-ci/58/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-armhf-ci/11/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-i386-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/194
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/195
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/195/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/178

Click here to trigger a rebuild:
http://s-jenkins:8080/job/camera-app-ci/58/rebuild

review: Approve (continuous-integration)

[Ugo Riboni (uriboni)]

The change makes sense to me in terms of code, but I haven't tested on device.

review: Approve

[Günter Schwann (schwann)]

There is nothing to test on the phone - without the this (bigger) patch https://code.launchpad.net/~schwann/qtubuntu-camera/video-orientation-support/+merge/170062

So I top approve it

[Günter Schwann (schwann)]

Ups - won't integrate until https://code.launchpad.net/~schwann/camera-app/camera-toobarbutton-name/+merge/170489

[Günter Schwann (schwann)]

now approving ...

=== modified file 'Toolbar.qml'
--- Toolbar.qml	2013-02-19 16:31:00 +0000
+++ Toolbar.qml	2013-06-18 11:59:46 +0000
@@ -133,8 +133,20 @@
                    "camera"
 
             onClicked: {
+                var orientation = 90
+                if (device.isLandscape) {
+                    if (device.naturalOrientation === "portrait") {
+                        orientation = 180
+                    } else {
+                        orientation = 0
+                    }
+                }
+                if (device.isInverted)
+                    orientation += 180
+
                 if (camera.captureMode == Camera.CaptureVideo) {
                     if (camera.videoRecorder.recorderState == CameraRecorder.StoppedState) {
+                        camera.videoRecorder.setMetadata("Orientation", orientation)
                         camera.videoRecorder.record()
                     } else {
                         camera.videoRecorder.stop()
@@ -142,16 +154,6 @@
                         // and no preview to slide off anyway. Figure out what to do in this case.
                     }
                 } else {
-                    var orientation = 90
-                    if (device.isLandscape) {
-                        if (device.naturalOrientation === "portrait") {
-                           orientation = 180
-                        } else {
-                            orientation = 0
-                        }
-                    }
-                    if (device.isInverted)
-                        orientation += 180
                     camera.imageCapture.setMetadata("Orientation", orientation)
                     camera.imageCapture.capture()
                 }