Merge lp:~uriboni/camera-app/content-hub-video-source into lp:camera-app/staging

[Ugo Riboni]

Enable camera-app as source for videos for content-hub export, and adjust the UI

Enable camera-app as source for videos for content-hub export, and adjust the UI

[lp:~uriboni/camera-app/content-hub-video-source]

623. By Ugo Riboni on 2015-12-10

Merge changes from staging

624. By Ugo Riboni on 2015-12-10

Cleanup

[Florian Boucault (fboucault)]

It's all good in fact. Well done

review: Approve

=== added file 'VideoReview.qml'
--- VideoReview.qml	1970-01-01 00:00:00 +0000
+++ VideoReview.qml	2015-12-10 12:37:24 +0000
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+Item {
+    property string videoPath
+    property int bottomMargin
+
+    Image {
+        id: thumbnail
+        anchors.fill: parent
+
+        fillMode: Image.PreserveAspectFit
+        sourceSize.width: width
+        sourceSize.height: height
+
+        source: videoPath ? "image://thumbnailer/%1".arg(videoPath) : ""
+        opacity: status == Image.Ready ? 1.0 : 0.0
+        Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.FastDuration } }
+    }
+
+    Item {
+        anchors.fill: parent
+        anchors.bottomMargin: parent.bottomMargin
+
+        ActivityIndicator {
+            anchors.centerIn: parent
+            visible: running
+            running: thumbnail.status != Image.Ready
+        }
+
+        Icon {
+            width: units.gu(5)
+            height: units.gu(5)
+            anchors.centerIn: parent
+            name: "media-playback-start"
+            color: "white"
+            opacity: 0.8
+        }
+
+        MouseArea {
+            anchors.centerIn: parent
+            width: units.gu(10)
+            height: units.gu(10)
+            onClicked: Qt.openUrlExternally("video://%1".arg(videoPath));
+        }
+    }
+}
 
=== modified file 'ViewFinderExportConfirmation.qml'
--- ViewFinderExportConfirmation.qml	2015-10-22 12:21:14 +0000
+++ ViewFinderExportConfirmation.qml	2015-12-10 12:37:24 +0000
@@ -20,6 +20,7 @@
 Item {
     id: viewFinderExportConfirmation
 
+    property bool isVideo
     property string mediaPath
     property Snapshot snapshot
 
@@ -27,7 +28,7 @@
         viewFinder.visible = false;
         viewFinderOverlay.visible = false;
         mediaPath = path;
-        snapshot.visible = true;
+        if (!isVideo) snapshot.visible = true;
         visible = true;
     }
 
@@ -46,54 +47,70 @@
         asynchronous: true
         sourceComponent: Component {
             Item {
-                CircleButton {
-                    id: retryButton
-                    objectName: "retryButton"
-
-                    anchors {
-                        right: validateButton.left
-                        rightMargin: units.gu(7.5)
-                        bottom: parent.bottom
-                        bottomMargin: units.gu(6)
-                    }
-
-                    iconName: "reload"
-                    onClicked: viewFinderExportConfirmation.hide()
-                }
-
-                CircleButton {
-                    id: validateButton
-                    objectName: "validateButton"
-
-                    width: units.gu(8)
-                    anchors {
-                        bottom: parent.bottom
-                        bottomMargin: units.gu(5)
-                        horizontalCenter: parent.horizontalCenter
-                    }
-
-                    iconName: "ok"
-                    onClicked: {
-                        viewFinderExportConfirmation.hide();
-                        main.exportContent([mediaPath]);
-                    }
-                }
-
-                CircleButton {
-                    id: cancelButton
-                    objectName: "cancelButton"
-
-                    anchors {
-                        left: validateButton.right
-                        leftMargin: units.gu(7.5)
-                        bottom: parent.bottom
-                        bottomMargin: units.gu(6)
-                    }
-
-                    iconName: "close"
-                    onClicked: {
-                        viewFinderExportConfirmation.hide();
-                        main.cancelExport();
+                VideoReview {
+                    id: videoReview
+                    anchors.fill: parent
+                    bottomMargin: buttons.height
+                    videoPath: mediaPath
+                    visible: isVideo
+                }
+
+                Item {
+                    id: buttons
+                    anchors.bottom: parent.bottom
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    height: childrenRect.height
+
+                    CircleButton {
+                        id: retryButton
+                        objectName: "retryButton"
+
+                        anchors {
+                            right: validateButton.left
+                            rightMargin: units.gu(7.5)
+                            bottom: parent.bottom
+                            bottomMargin: units.gu(6)
+                        }
+
+                        iconName: "reload"
+                        onClicked: viewFinderExportConfirmation.hide()
+                    }
+
+                    CircleButton {
+                        id: validateButton
+                        objectName: "validateButton"
+
+                        width: units.gu(8)
+                        anchors {
+                            bottom: parent.bottom
+                            bottomMargin: units.gu(5)
+                            horizontalCenter: parent.horizontalCenter
+                        }
+
+                        iconName: "ok"
+                        onClicked: {
+                            viewFinderExportConfirmation.hide();
+                            main.exportContent([mediaPath]);
+                        }
+                    }
+
+                    CircleButton {
+                        id: cancelButton
+                        objectName: "cancelButton"
+
+                        anchors {
+                            left: validateButton.right
+                            leftMargin: units.gu(7.5)
+                            bottom: parent.bottom
+                            bottomMargin: units.gu(6)
+                        }
+
+                        iconName: "close"
+                        onClicked: {
+                            viewFinderExportConfirmation.hide();
+                            main.cancelExport();
+                        }
                     }
                 }
             }
 
=== modified file 'ViewFinderOverlay.qml'
--- ViewFinderOverlay.qml	2015-12-08 15:14:04 +0000
+++ ViewFinderOverlay.qml	2015-12-10 12:37:24 +0000
@@ -667,7 +667,9 @@
             }
 
             if (camera.captureMode == Camera.CaptureVideo) {
-                if (application.removableStoragePresent && settings.preferRemovableStorage) {
+                if (main.contentExportMode) {
+                    camera.videoRecorder.outputLocation = application.temporaryLocation;
+                } else if (application.removableStoragePresent && settings.preferRemovableStorage) {
                     camera.videoRecorder.outputLocation = application.removableStorageVideosLocation;
                 } else {
                     camera.videoRecorder.outputLocation = application.videosLocation;
 
=== modified file 'ViewFinderView.qml'
--- ViewFinderView.qml	2015-12-07 15:04:16 +0000
+++ ViewFinderView.qml	2015-12-10 12:37:24 +0000
@@ -20,6 +20,7 @@
 import QtMultimedia 5.0
 import CameraApp 0.1
 import QtGraphicalEffects 1.0
+import Ubuntu.Content 0.1
 
 Item {
     id: viewFinderView
@@ -33,7 +34,6 @@
     signal photoTaken(string filePath)
     signal videoShot(string filePath)
 
-
     onInViewChanged: decideCameraState()
     Connections {
         target: viewFinderOverlay
@@ -58,7 +58,7 @@
         }
     }
 
-    Camera {
+    property Camera camera: Camera {
         id: camera
         captureMode: Camera.CaptureStillImage
         cameraState: Camera.UnloadedState
@@ -100,8 +100,17 @@
         property alias currentZoom: camera.digitalZoom
         property alias maximumZoom: camera.maximumDigitalZoom
         property bool switchInProgress: false
-        
+
         imageCapture {
+            onReadyChanged: {
+                if (camera.imageCapture.ready && main.transfer) {
+                    if (main.transfer.contentType === ContentType.Videos) {
+                        viewFinderView.captureMode = Camera.CaptureVideo;
+                    } else {
+                        viewFinderView.captureMode = Camera.CaptureStillImage;
+                    }
+                }
+            }
             onCaptureFailed: {
                 console.log("Capture failed for request " + requestId + ": " + message);
             }
@@ -124,16 +133,18 @@
                 console.log("Picture saved as " + path);
             }
         }
-        
+
         videoRecorder {
             onRecorderStateChanged: {
                 if (videoRecorder.recorderState === CameraRecorder.StoppedState) {
-                    if (photoRollHint.necessary) {
-                        photoRollHint.enable();
-                    }
                     metricVideos.increment()
                     viewFinderOverlay.visible = true;
                     viewFinderView.videoShot(videoRecorder.actualLocation);
+                    if (main.contentExportMode) {
+                        viewFinderExportConfirmation.confirmExport(videoRecorder.actualLocation);
+                    } else if (photoRollHint.necessary) {
+                        photoRollHint.enable();
+                    }
                 }
             }
         }
@@ -168,7 +179,7 @@
                 angle: 180
             }
         }
-        
+
         transform: [
             Scale {
                 id: viewFinderSwitcherScale
@@ -185,11 +196,11 @@
                 angle: 0
             }
         ]
-        
-        
+
+
         SequentialAnimation {
             id: viewFinderSwitcherAnimation
-            
+
             SequentialAnimation {
                 ParallelAnimation {
                     UbuntuNumberAnimation {target: viewFinderSwitcherScale; property: "xScale"; from: 1.0; to: 0.8; duration: UbuntuAnimation.BriskDuration ; easing: UbuntuAnimation.StandardEasing}
@@ -218,16 +229,16 @@
                 }
             }
         }
-        
+
         VideoOutput {
             id: viewFinder
-            
+
             x: 0
             y: -viewFinderGeometry.y
             width: parent.width
             height: parent.height
             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.
@@ -245,7 +256,7 @@
                 // may change.
                 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
@@ -253,7 +264,7 @@
                    - 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
@@ -434,5 +445,6 @@
         id: viewFinderExportConfirmation
         anchors.fill: parent
         snapshot: snapshot
+        isVideo: main.transfer.contentType == ContentType.Videos
     }
 }
 
=== modified file 'camera-app.qml'
--- camera-app.qml	2015-11-20 15:36:00 +0000
+++ camera-app.qml	2015-12-10 12:37:24 +0000
@@ -311,10 +311,17 @@
         target: ContentHub
         onExportRequested: {
             viewSwitcher.switchToViewFinder();
-            if (transferContentType === ContentType.Videos) {
-                viewFinderView.captureMode = Camera.CaptureVideo;
-            } else {
-                viewFinderView.captureMode = Camera.CaptureStillImage;
+
+            // The exportRequested event can arrive before or after the
+            // app is active, but setting the recording type before the
+            // capture becomes ready does not have any effect.
+            // See camera.imageCapture.onReadyChanged for the other case.
+            if (viewFinderView.camera.imageCapture.ready) {
+                if (transfer.contentType === ContentType.Videos) {
+                    viewFinderView.captureMode = Camera.CaptureVideo;
+                } else {
+                    viewFinderView.captureMode = Camera.CaptureStillImage;
+                }
             }
             main.transfer = transfer;
         }
 
=== modified file 'camera-contenthub.json'
--- camera-contenthub.json	2014-07-31 18:41:17 +0000
+++ camera-contenthub.json	2015-12-10 12:37:24 +0000
@@ -1,5 +1,6 @@
 {
     "source": [
-        "pictures"
+        "pictures",
+        "videos"
     ]
 }