Merge lp:~uriboni/camera-app/zoom-level-tests into lp:camera-app

[Ugo Riboni]

Fix zoom related AP tests from previous commit

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:632
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~uriboni/camera-app/zoom-level-tests/+merge/282201/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/camera-app-ci/481/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/176
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/177
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/177/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/176
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/364
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1035
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/898
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26553

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

=== modified file 'CameraApp/advancedcamerasettings.cpp'
--- CameraApp/advancedcamerasettings.cpp	2015-12-02 08:27:19 +0000
+++ CameraApp/advancedcamerasettings.cpp	2016-01-11 17:08:00 +0000
@@ -44,7 +44,8 @@
     m_cameraFlashControl(0),
     m_cameraExposureControl(0),
     m_imageEncoderControl(0),
-    m_videoEncoderControl(0)
+    m_videoEncoderControl(0),
+    m_hdrEnabled(false)
 {
 }
 
@@ -236,6 +237,9 @@
 
     m_cameraFlashControl = flashControlFromCamera(m_camera);
     m_cameraExposureControl = exposureControlFromCamera(m_camera);
+    QVariant exposureMode = m_hdrEnabled ? QVariant::fromValue(ExposureHdr)
+                                         : QVariant::fromValue(QCameraExposure::ExposureAuto);
+    m_cameraExposureControl->setValue(QCameraExposureControl::ExposureMode, exposureMode);
 
     if (m_cameraExposureControl) {
         QObject::connect(m_cameraExposureControl,
@@ -451,20 +455,20 @@
 
 bool AdvancedCameraSettings::hdrEnabled() const
 {
-    if (m_cameraExposureControl) {
-        QVariant exposureMode = m_cameraExposureControl->actualValue(QCameraExposureControl::ExposureMode);
-        return exposureMode.value<QCameraExposure::ExposureMode>() == ExposureHdr;
-    } else {
-        return false;
-    }
+    return m_hdrEnabled;
 }
 
 void AdvancedCameraSettings::setHdrEnabled(bool enabled)
 {
-    if (m_cameraExposureControl) {
-        QVariant exposureMode = enabled ? QVariant::fromValue(ExposureHdr)
-                                        : QVariant::fromValue(QCameraExposure::ExposureAuto);
-        m_cameraExposureControl->setValue(QCameraExposureControl::ExposureMode, exposureMode);
+    if (enabled != m_hdrEnabled) {
+        m_hdrEnabled = enabled;
+        if (m_cameraExposureControl) {
+            QVariant exposureMode = enabled ? QVariant::fromValue(ExposureHdr)
+                                            : QVariant::fromValue(QCameraExposure::ExposureAuto);
+            m_cameraExposureControl->setValue(QCameraExposureControl::ExposureMode, exposureMode);
+        } else {
+            Q_EMIT hdrEnabledChanged();
+        }
     }
 }
 

=== modified file 'CameraApp/advancedcamerasettings.h'
--- CameraApp/advancedcamerasettings.h	2015-11-17 15:25:03 +0000
+++ CameraApp/advancedcamerasettings.h	2016-01-11 17:08:00 +0000
@@ -108,6 +108,7 @@
     QCameraExposureControl* m_cameraExposureControl;
     QImageEncoderControl* m_imageEncoderControl;
     QVideoEncoderSettingsControl* m_videoEncoderControl;
+    bool m_hdrEnabled;
 };
 
 #endif // ADVANCEDCAMERASETTINGS_H

=== modified file 'SlideshowView.qml'
--- SlideshowView.qml	2015-11-26 13:45:38 +0000
+++ SlideshowView.qml	2016-01-11 17:08:00 +0000
@@ -170,7 +170,7 @@
             ActivityIndicator {
                 anchors.centerIn: parent
                 visible: running
-                running: image.status != Image.Ready
+                running: image.status == Image.Loading
             }
 
             PinchArea {

=== added file 'VideoReview.qml'
--- VideoReview.qml	1970-01-01 00:00:00 +0000
+++ VideoReview.qml	2016-01-11 17:08:00 +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.Loading
+        }
+
+        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	2016-01-11 17:08:00 +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-02 08:28:41 +0000
+++ ViewFinderOverlay.qml	2016-01-11 17:08:00 +0000
@@ -208,7 +208,12 @@
                              "value": sizeToString(camera.advanced.fittingResolution)};
 
         photoResolutionOptionsModel.insert(0, optionMaximum);
-        if (camera.advanced.fittingResolution != camera.advanced.maximumResolution) {
+
+        // Only show optionFitting if it's greater than 50% of the maximum available resolution
+        var fittingSize = camera.advanced.fittingResolution.width * camera.advanced.fittingResolution.height;
+        var maximumSize = camera.advanced.maximumResolution.width * camera.advanced.maximumResolution.height;
+        if (camera.advanced.fittingResolution != camera.advanced.maximumResolution &&
+            fittingSize / maximumSize >= 0.5) {
             photoResolutionOptionsModel.insert(1, optionFitting);
         }
 
@@ -220,13 +225,11 @@
         }
     }
 
-    Component.onCompleted: {
-        camera.cameraState = Camera.LoadedState;
+    function updateResolutionOptions() {
         updateVideoResolutionOptions();
         updatePhotoResolutionOptions();
         // FIXME: see workaround setting camera.viewfinder.resolution above
         camera.viewfinder.resolution = camera.advanced.resolution;
-        camera.cameraState = Camera.ActiveState;
     }
 
     Connections {
@@ -244,10 +247,7 @@
             // because the latter is not updated when the backend changes the resolution
             settings["photoResolution" + camera.advanced.activeCameraIndex] = sizeToString(camera.advanced.imageCaptureResolution);
             settings.videoResolution = sizeToString(camera.advanced.videoRecorderResolution);
-            updatePhotoResolutionOptions();
-            updateVideoResolutionOptions();
-            // FIXME: see workaround setting camera.viewfinder.resolution above
-            camera.viewfinder.resolution = camera.advanced.resolution;
+            updateResolutionOptions();
 
             // If no resolution has ever been chosen, select the one that fits the screen
             if (!hasPhotoResolutionSetting) {
@@ -285,6 +285,7 @@
             height: optionsOverlayLoader.height
             onOpenedChanged: optionsOverlayLoader.item.closeValueSelector()
             enabled: camera.videoRecorder.recorderState == CameraRecorder.StoppedState
+                     && !camera.photoCaptureInProgress
             opacity: enabled ? 1.0 : 0.3
 
             Item {
@@ -667,7 +668,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;
@@ -694,6 +697,8 @@
                         camera.imageCapture.setMetadata("GPSAltitude", position.coordinate.altitude);
                     }
                 }
+
+                camera.photoCaptureInProgress = true;
                 if (main.contentExportMode) {
                     camera.imageCapture.captureToLocation(application.temporaryLocation);
                 } else if (application.removableStoragePresent && settings.preferRemovableStorage) {
@@ -782,6 +787,7 @@
             iconName: (camera.captureMode == Camera.CaptureStillImage) ? "camcorder" : "camera-symbolic"
             onClicked: controls.changeRecordMode()
             enabled: camera.videoRecorder.recorderState == CameraRecorder.StoppedState && !main.contentExportMode
+                     && !camera.photoCaptureInProgress
         }
 
         ShootButton {
@@ -831,6 +837,7 @@
             }
 
             enabled: !camera.switchInProgress && camera.videoRecorder.recorderState == CameraRecorder.StoppedState
+                     && !camera.photoCaptureInProgress
             iconName: "camera-flip"
             onClicked: controls.switchCamera()
         }
@@ -853,6 +860,7 @@
             property real maximumScale: 3.0
             property bool active: false
 
+            enabled: !camera.photoCaptureInProgress
             onPinchStarted: {
                 active = true;
                 initialZoom = zoomControl.value;
@@ -871,6 +879,7 @@
             MouseArea {
                 id: manualFocusMouseArea
                 anchors.fill: parent
+                enabled: !camera.photoCaptureInProgress
                 onClicked: {
                     camera.manualFocus(mouse.x, mouse.y);
                     mouse.accepted = false;
@@ -964,4 +973,54 @@
              }
          }
     }
+
+    Connections {
+        id: permissionErrorMonitor
+        property var currentPermissionsDialog: null
+        target: camera
+        onError: {
+            if (errorCode == Camera.ServiceMissingError) {
+                if (currentPermissionsDialog == null) {
+                    currentPermissionsDialog = PopupUtils.open(noPermissionsDialogComponent);
+                }
+                camera.failedToConnect = true;
+            }
+        }
+        onCameraStateChanged: {
+            if (camera.cameraState != Camera.UnloadedState) {
+                if (currentPermissionsDialog != null) {
+                    PopupUtils.close(currentPermissionsDialog);
+                    currentPermissionsDialog = null;
+                }
+                camera.failedToConnect = false;
+            } else {
+                camera.photoCaptureInProgress = false;
+            }
+        }
+    }
+
+    Component {
+         id: noPermissionsDialogComponent
+         Dialog {
+             id: noPermissionsDialog
+             objectName: "noPermissionsDialog"
+             title: i18n.tr("Cannot access camera")
+             text: i18n.tr("Camera app doesn't have permission to access the camera hardware or another error occurred.\n\nIf granting permission does not resolve this problem, reboot your phone.")
+             Button {
+                 text: i18n.tr("Cancel")
+                 onClicked: {
+                     PopupUtils.close(noPermissionsDialog);
+                     permissionErrorMonitor.currentPermissionsDialog = null;
+                 }
+             }
+             Button {
+                 text: i18n.tr("Edit Permissions")
+                 onClicked: {
+                     Qt.openUrlExternally("settings:///system/security-privacy?service=camera");
+                     PopupUtils.close(noPermissionsDialog);
+                     permissionErrorMonitor.currentPermissionsDialog = null;
+                 }
+             }
+         }
+    }
 }

=== modified file 'ViewFinderOverlayLoader.qml'
--- ViewFinderOverlayLoader.qml	2015-10-22 12:21:14 +0000
+++ ViewFinderOverlayLoader.qml	2016-01-11 17:08:00 +0000
@@ -29,6 +29,10 @@
         loader.item.showFocusRing(x, y);
     }
 
+    function updateResolutionOptions() {
+        loader.item.updateResolutionOptions();
+    }
+
     asynchronous: true
     Component.onCompleted: {
         loader.setSource("ViewFinderOverlay.qml", { "camera": loader.camera });

=== modified file 'ViewFinderView.qml'
--- ViewFinderView.qml	2015-11-17 13:23:26 +0000
+++ ViewFinderView.qml	2016-01-11 17:08:00 +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,11 +34,40 @@
     signal photoTaken(string filePath)
     signal videoShot(string filePath)
 
-    Camera {
+    onInViewChanged: decideCameraState()
+    Connections {
+        target: viewFinderOverlay
+        onStatusChanged: decideCameraState()
+    }
+    Connections {
+        target: Qt.application
+        onActiveChanged: if (Qt.application.active && camera.failedToConnect) decideCameraState()
+    }
+
+    function decideCameraState() {
+        if (viewFinderOverlay.status == Loader.Ready) {
+            if (viewFinderView.inView) {
+                camera.cameraState = Camera.LoadedState;
+                viewFinderOverlay.updateResolutionOptions();
+                camera.cameraState = Camera.ActiveState;
+            } else {
+                camera.cameraState = Camera.LoadedState;
+                viewFinderOverlay.updateResolutionOptions();
+            }
+        } else {
+            if (camera.videoRecorder.recorderState == CameraRecorder.RecordingState) {
+                camera.videoRecorder.stop();
+            }
+            camera.cameraState = Camera.UnloadedState;
+        }
+    }
+
+    property Camera camera: Camera {
         id: camera
         captureMode: Camera.CaptureStillImage
         cameraState: Camera.UnloadedState
         StateSaver.properties: "captureMode"
+        property bool failedToConnect: false
 
         function manualFocus(x, y) {
             viewFinderOverlay.showFocusRing(x, y);
@@ -75,9 +105,20 @@
         property alias currentZoom: camera.digitalZoom
         property alias maximumZoom: camera.maximumDigitalZoom
         property bool switchInProgress: false
-        
+        property bool photoCaptureInProgress: 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: {
+                camera.photoCaptureInProgress = false;
                 console.log("Capture failed for request " + requestId + ": " + message);
             }
             onImageCaptured: {
@@ -95,37 +136,24 @@
                     viewFinderExportConfirmation.confirmExport(path);
                 }
                 viewFinderView.photoTaken(path);
+                camera.photoCaptureInProgress = false;
                 metricPhotos.increment();
                 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);
-                }
-            }
-        }
-    }
-
-    Connections {
-        target: Qt.application
-        onActiveChanged: {
-            if (Qt.application.active) {
-                if (camera.cameraState == Camera.LoadedState) {
-                    camera.cameraState = Camera.ActiveState;
-                }
-            } else if (!application.desktopMode) {
-                if (camera.videoRecorder.recorderState == CameraRecorder.RecordingState) {
-                    camera.videoRecorder.stop();
-                }
-                camera.cameraState = Camera.LoadedState;
+                    if (main.contentExportMode) {
+                        viewFinderExportConfirmation.confirmExport(videoRecorder.actualLocation);
+                    } else if (photoRollHint.necessary) {
+                        photoRollHint.enable();
+                    }
+                }
             }
         }
     }
@@ -146,7 +174,9 @@
                     // 'viewFinder.visible = false' prevents the camera switching
                     viewFinder.width = 1;
                     viewFinder.height = 1;
+                    camera.cameraState = Camera.LoadedState;
                     camera.advanced.activeCameraIndex = (camera.advanced.activeCameraIndex === 0) ? 1 : 0;
+                    decideCameraState();
                     viewFinderSwitcherRotation.angle = 180;
                 }
             }
@@ -157,7 +187,7 @@
                 angle: 180
             }
         }
-        
+
         transform: [
             Scale {
                 id: viewFinderSwitcherScale
@@ -174,11 +204,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}
@@ -207,16 +237,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.
@@ -234,7 +264,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
@@ -242,7 +272,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
@@ -423,5 +453,6 @@
         id: viewFinderExportConfirmation
         anchors.fill: parent
         snapshot: snapshot
+        isVideo: main.transfer.contentType == ContentType.Videos
     }
 }

=== modified file 'ZoomControl.qml'
--- ZoomControl.qml	2015-10-22 12:21:14 +0000
+++ ZoomControl.qml	2016-01-11 17:08:00 +0000
@@ -64,7 +64,7 @@
         }
 
         live: true
-        minimumValue: 1.0 // No zoom => 1.0 zoom factor
+        minimumValue: 0.0 // No zoom => 0.0 zoom factor
         value: minimumValue
     }
 

=== modified file 'camera-app.qml'
--- camera-app.qml	2015-11-20 15:36:00 +0000
+++ camera-app.qml	2016-01-11 17:08:00 +0000
@@ -135,7 +135,7 @@
                 }
             }
         ]
-        interactive: !viewFinderView.touchAcquired && !galleryView.touchAcquired
+        interactive: !viewFinderView.touchAcquired && !galleryView.touchAcquired && !viewFinderView.camera.photoCaptureInProgress
 
         Component.onCompleted: {
             // FIXME: workaround for qtubuntu not returning values depending on the grid unit definition
@@ -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	2016-01-11 17:08:00 +0000
@@ -1,5 +1,6 @@
 {
     "source": [
-        "pictures"
+        "pictures",
+        "videos"
     ]
 }

=== modified file 'tests/autopilot/camera_app/tests/test_zoom.py'
--- tests/autopilot/camera_app/tests/test_zoom.py	2015-11-30 20:18:09 +0000
+++ tests/autopilot/camera_app/tests/test_zoom.py	2016-01-11 17:08:00 +0000
@@ -67,7 +67,8 @@
         ty = y + (h // 2)
 
         self.pointing_device.drag(tx, ty, (tx - zoom_control.width), ty)
-        self.assertThat(zoom_control.value, Eventually(Equals(1.0)))
+        self.assertThat(zoom_control.value,
+                        Eventually(Equals(zoom_control.minimumValue)))
 
     """Tests zoom is reset to minimum on camera switch"""
     def test_zoom_reset_on_camera_change(self):