camera-app

Merge lp:~fboucault/camera-app/video_quality into lp:camera-app

video_quality
Merge into trunk

Proposed by Florian Boucault on 2014-12-08

Status:	Merged
Approved by:	Bill Filler on 2015-01-08
Approved revision:	445
Merged at revision:	458
Proposed branch:	lp:~fboucault/camera-app/video_quality
Merge into:	lp:camera-app
Diff against target:	531 lines (+281/-19) 9 files modified CameraApp/advancedcamerasettings.cpp (+39/-1) CameraApp/advancedcamerasettings.h (+6/-0) ViewFinderOverlay.qml (+66/-0) debian/changelog (+7/-0) debian/control (+1/-0) po/camera-app.pot (+17/-17) tests/autopilot/camera_app/emulators/main_window.py (+4/-0) tests/autopilot/camera_app/emulators/panel.py (+1/-1) tests/autopilot/camera_app/tests/test_capture.py (+140/-0)
To merge this branch:	bzr merge lp:~fboucault/camera-app/video_quality
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Bill Filler (community)			Approve on 2015-01-08
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-01-08
Arthur Mello (community)		2014-12-08	Approve on 2014-12-08
Review via email: mp+244042@code.launchpad.net

Commit message

New option to select recording resolution in video mode.

lp:~fboucault/camera-app/video_quality updated on 2014-12-08

438. By Florian Boucault on 2014-12-08: Fix naming.

Revision history for this message

Arthur Mello (artmello) wrote on 2014-12-08:

lgtm

review: Approve

lp:~fboucault/camera-app/video_quality updated on 2014-12-10

439. By Florian Boucault on 2014-12-10: Added autopilot tests.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-11:

FAILED: Continuous integration, rev:439
http://jenkins.qa.ubuntu.com/job/camera-app-ci/340/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/36/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/36/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/36/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/53/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/288/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/78/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/294/console

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

review: Needs Fixing (continuous-integration)

lp:~fboucault/camera-app/video_quality updated on 2014-12-11

440. By Florian Boucault on 2014-12-11: Merged from trunk

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-11:

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

review: Needs Fixing (continuous-integration)

lp:~fboucault/camera-app/video_quality updated on 2014-12-15

441. By Florian Boucault on 2014-12-15: Merged from trunk

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-15:

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

review: Needs Fixing (continuous-integration)

lp:~fboucault/camera-app/video_quality updated on 2015-01-07

442. By Florian Boucault on 2015-01-07: Added failing autopilot test
443. By Florian Boucault on 2015-01-07: Set video resolution when switching cameras. Fixes failing AP test.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-01-07:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Bill Filler (bfiller) wrote on 2015-01-07:

working pretty well, only found 2 issues:

1) when recording at 480p with front camera on krillin, the resulting video aspect ratio seems incorrect. The video looks squashed. Using the back camera at this resolution doesn't have the same issue.

2) Not specific to this MR but perhaps we should fix in this MR: the bottom edge should be disabled when recording in progress to ensure no changes are made to the video quality, etc.

lp:~fboucault/camera-app/video_quality updated on 2015-01-07

444. By Florian Boucault on 2015-01-07: Disable bottom edge while recording.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-01-07:

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

review: Needs Fixing (continuous-integration)

lp:~fboucault/camera-app/video_quality updated on 2015-01-08

445. By Florian Boucault on 2015-01-08: Workaround for stretched videos: do not allow recording at 640x480 with the front camera. Ref.: https://bugs.launchpad.net/ubuntu/+source/libhybris/+bug/1408650

Revision history for this message

Florian Boucault (fboucault) wrote on 2015-01-08:

> working pretty well, only found 2 issues:
>
> 1) when recording at 480p with front camera on krillin, the resulting video
> aspect ratio seems incorrect. The video looks squashed. Using the back camera
> at this resolution doesn't have the same issue.
>

Workarounded in this MR. Bug reported: https://bugs.launchpad.net/ubuntu/+source/libhybris/+bug/1408650

> 2) Not specific to this MR but perhaps we should fix in this MR: the bottom
> edge should be disabled when recording in progress to ensure no changes are
> made to the video quality, etc.

Fixed in this MR.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-01-08:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Bill Filler (bfiller) wrote on 2015-01-08:

approved

review: Approve

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:

Florian Boucault

Ubuntu Phablet Team

deaunapaul

 === modified file 'CameraApp/advancedcamerasettings.cpp'
 --- CameraApp/advancedcamerasettings.cpp	2014-12-03 19:33:49 +0000
 +++ CameraApp/advancedcamerasettings.cpp	2015-01-08 13:44:43 +0000
@@ -39,7 +39,8 @@
      m_viewFinderControl(0),
      m_cameraFlashControl(0),
      m_cameraExposureControl(0),
--    m_imageEncoderControl(0)
++    m_imageEncoderControl(0),
++    m_videoEncoderControl(0)
+ {
+ }
@@ -164,6 +165,17 @@
      return imageEncoderControl;
+ }
++QVideoEncoderSettingsControl* AdvancedCameraSettings::videoEncoderControlFromCamera(QCamera *camera) const
++{
++    QMediaControl *control = mediaControlFromCamera(camera, QVideoEncoderSettingsControl_iid);
++    QVideoEncoderSettingsControl *videoEncoderControl = qobject_cast<QVideoEncoderSettingsControl*>(control);
++
++    if (videoEncoderControl == 0) {
++        qWarning() << "No video encoder settings control support";
++    }
++
++    return videoEncoderControl;
++}
  QObject* AdvancedCameraSettings::camera() const
+ {
@@ -221,12 +233,14 @@
+     }
      m_imageEncoderControl = imageEncoderControlFromCamera(m_camera);
++    m_videoEncoderControl = videoEncoderControlFromCamera(m_camera);
      Q_EMIT resolutionChanged();
      Q_EMIT hasFlashChanged();
      Q_EMIT hasHdrChanged();
      Q_EMIT hdrEnabledChanged();
      Q_EMIT encodingQualityChanged();
++    Q_EMIT videoSupportedResolutionsChanged();
+ }
  void AdvancedCameraSettings::onCameraStateChanged()
@@ -246,6 +260,7 @@
          Q_EMIT activeCameraIndexChanged();
          Q_EMIT resolutionChanged();
          Q_EMIT hasFlashChanged();
++        Q_EMIT videoSupportedResolutionsChanged();
+     }
+ }
@@ -261,6 +276,29 @@
      return QSize();
+ }
++QStringList AdvancedCameraSettings::videoSupportedResolutions() const
++{
++    if (m_videoEncoderControl) {
++        QList<QSize> sizes = m_videoEncoderControl->supportedResolutions(
++                                            m_videoEncoderControl->videoSettings());
++        QStringList sizesAsStrings;
++        Q_FOREACH(QSize size, sizes) {
++            // Workaround for bug https://bugs.launchpad.net/ubuntu/+source/libhybris/+bug/1408650
++            // When using the front camera on krillin, using resolution 640x480 does
++            // not work properly and results in stretched videos. Remove it from
++            // the list of supported resolutions.
++            if (activeCameraIndex() == 1 && size.width() == 640 && size.height() == 480) {
++                continue;
++            }
++            sizesAsStrings.append(QString("%1x%2").arg(size.width()).arg(size.height()));
++        }
++        return sizesAsStrings;
++    } else {
++        return QStringList();
++    }
++}
++
++
  bool AdvancedCameraSettings::hasFlash() const
+ {
      if (m_cameraFlashControl) {
 === modified file 'CameraApp/advancedcamerasettings.h'
 --- CameraApp/advancedcamerasettings.h	2014-12-03 19:33:49 +0000
 +++ CameraApp/advancedcamerasettings.h	2015-01-08 13:44:43 +0000
@@ -28,6 +28,7 @@
  #include <QtMultimedia/QCameraExposureControl>
  #include <QtMultimedia/QMediaControl>
  #include <QtMultimedia/QImageEncoderControl>
++#include <QtMultimedia/QVideoEncoderSettingsControl>
  class QCameraControl;
  class QCameraFlashControl;
@@ -39,6 +40,7 @@
      Q_PROPERTY (int activeCameraIndex READ activeCameraIndex WRITE setActiveCameraIndex
                  NOTIFY activeCameraIndexChanged)
      Q_PROPERTY (QSize resolution READ resolution NOTIFY resolutionChanged)
++    Q_PROPERTY (QStringList videoSupportedResolutions READ videoSupportedResolutions NOTIFY videoSupportedResolutionsChanged)
      Q_PROPERTY (bool hasFlash READ hasFlash NOTIFY hasFlashChanged)
      Q_PROPERTY (bool hdrEnabled READ hdrEnabled WRITE setHdrEnabled NOTIFY hdrEnabledChanged)
      Q_PROPERTY (bool hasHdr READ hasHdr NOTIFY hasHdrChanged)
@@ -51,6 +53,7 @@
      void setCamera(QObject* camera);
      void setActiveCameraIndex(int index);
      QSize resolution() const;
++    QStringList videoSupportedResolutions() const;
      bool hasFlash() const;
      bool hasHdr() const;
      bool hdrEnabled() const;
@@ -67,6 +70,7 @@
      void hasHdrChanged();
      void hdrEnabledChanged();
      void encodingQualityChanged();
++    void videoSupportedResolutionsChanged();
  private Q_SLOTS:
      void onCameraStateChanged();
@@ -81,6 +85,7 @@
      QCamera* cameraFromCameraObject(QObject* cameraObject) const;
      QMediaControl* mediaControlFromCamera(QCamera *camera, const char* iid) const;
      QImageEncoderControl* imageEncoderControlFromCamera(QCamera *camera) const;
++    QVideoEncoderSettingsControl* videoEncoderControlFromCamera(QCamera *camera) const;
      QObject* m_cameraObject;
      QCamera* m_camera;
@@ -91,6 +96,7 @@
      QCameraFlashControl* m_cameraFlashControl;
      QCameraExposureControl* m_cameraExposureControl;
      QImageEncoderControl* m_imageEncoderControl;
++    QVideoEncoderSettingsControl* m_videoEncoderControl;
  };
  #endif // ADVANCEDCAMERASETTINGS_H
 === modified file 'ViewFinderOverlay.qml'
 --- ViewFinderOverlay.qml	2014-12-11 12:24:25 +0000
 +++ ViewFinderOverlay.qml	2015-01-08 13:44:43 +0000
@@ -47,6 +47,7 @@
          property int encodingQuality: 2 // QMultimedia.NormalQuality
          property bool gridEnabled: false
          property bool preferRemovableStorage: false
++        property string videoResolution: "1920x1080"
+     }
      Binding {
@@ -75,6 +76,57 @@
          value: settings.encodingQuality
+     }
++    Binding {
++        target: camera.videoRecorder
++        property: "resolution"
++        value: settings.videoResolution
++    }
++
++    function resolutionToLabel(resolution) {
++        // takes in a resolution string (e.g. "1920x1080") and returns a nicer
++        // form of it for display in the UI: "1080p"
++        return resolution.split("x").pop() + "p";
++    }
++
++    function updateVideoResolutionOptions() {
++        // Clear and refill videoResolutionOptionsModel with available resolutions
++        // Try to only display well known resolutions: 1080p, 720p and 480p
++        videoResolutionOptionsModel.clear();
++        var supported = camera.advanced.videoSupportedResolutions;
++        var wellKnown = ["1920x1080", "1280x720", "640x480"];
++        for (var i=0; i<supported.length; i++) {
++            var resolution = supported[i];
++            if (wellKnown.indexOf(resolution) !== -1) {
++                var option = {"icon": "",
++                              "label": resolutionToLabel(resolution),
++                              "value": resolution};
++                videoResolutionOptionsModel.insert(0, option);
++            }
++        }
++
++        // If resolution setting chosen is not supported select the highest available resolution
++        if (supported.indexOf(settings.videoResolution) == -1) {
++            settings.videoResolution = supported[supported.length - 1];
++        }
++    }
++
++    Component.onCompleted: {
++        updateVideoResolutionOptions();
++    }
++
++    Connections {
++        target: camera.advanced
++        onVideoSupportedResolutionsChanged: updateVideoResolutionOptions();
++    }
++
++    Connections {
++        target: camera.advanced
++        onActiveCameraIndexChanged: {
++            updateVideoResolutionOptions();
++            camera.videoRecorder.resolution = settings.videoResolution;
++        }
++    }
++
      Connections {
          target: camera.imageCapture
          onReadyChanged: {
@@ -111,6 +163,8 @@
+         }
          height: optionsOverlayLoader.height
          onOpenedChanged: optionsOverlayLoader.item.closeValueSelector()
++        enabled: camera.videoRecorder.recorderState == CameraRecorder.StoppedState
++        opacity: enabled ? 1.0 : 0.3
          Item {
              /* Use the 'trigger' feature of Panel so that tapping on the Panel
@@ -319,6 +373,18 @@
                      label: QT_TR_NOOP("Save internally")
                      value: false
+                 }
++            },
++            ListModel {
++                id: videoResolutionOptionsModel
++
++                property string settingsProperty: "videoResolution"
++                property string icon: ""
++                property string label: "HD"
++                property bool isToggle: false
++                property int selectedIndex: bottomEdge.indexForValue(videoResolutionOptionsModel, settings.videoResolution)
++                property bool available: true
++                property bool visible: camera.captureMode == Camera.CaptureVideo
++                property bool showInIndicators: false
+             }
+         ]
 === modified file 'debian/changelog'
 --- debian/changelog	2014-12-11 16:24:50 +0000
 +++ debian/changelog	2015-01-08 13:44:43 +0000
@@ -30,6 +30,13 @@
   -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Tue, 09 Dec 2014 21:48:24 +0000
++camera-app (3.0.0+15.04.20141205-0ubuntu2) UNRELEASED; urgency=medium
++
++  [ Florian Boucault ]
++  * Add dependency on python3-mediainfodll to camera-app-autopilot
++
++ -- Florian Boucault <florian.boucault@canonical.com>  Wed, 10 Dec 2014 15:16:28 -0200
++
  camera-app (3.0.0+15.04.20141205-0ubuntu1) vivid; urgency=low
    [ Ubuntu daily release ]
 === modified file 'debian/control'
 --- debian/control	2014-12-03 18:18:05 +0000
 +++ debian/control	2015-01-08 13:44:43 +0000
@@ -58,5 +58,6 @@
           ${shlibs:Depends},
           python3-autopilot,
           python3-wand,
++         python3-mediainfodll,
  Description: Test package for the camera app
   Autopilot tests for the camera-app package
 === modified file 'po/camera-app.pot'
 --- po/camera-app.pot	2014-12-11 12:24:25 +0000
 +++ po/camera-app.pot	2015-01-08 13:44:43 +0000
@@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: camera-app\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2014-12-11 10:23-0200\n"
++"POT-Creation-Date: 2014-12-15 08:50-0200\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -49,55 +49,55 @@
  msgid "Share"
  msgstr ""
--#: ../ViewFinderOverlay.qml:141 ../ViewFinderOverlay.qml:164
--#: ../ViewFinderOverlay.qml:192 ../ViewFinderOverlay.qml:215
--#: ../ViewFinderOverlay.qml:292
++#: ../ViewFinderOverlay.qml:185 ../ViewFinderOverlay.qml:208
++#: ../ViewFinderOverlay.qml:236 ../ViewFinderOverlay.qml:259
++#: ../ViewFinderOverlay.qml:336
  msgid "On"
  msgstr ""
--#: ../ViewFinderOverlay.qml:146 ../ViewFinderOverlay.qml:174
--#: ../ViewFinderOverlay.qml:197 ../ViewFinderOverlay.qml:220
--#: ../ViewFinderOverlay.qml:239 ../ViewFinderOverlay.qml:297
++#: ../ViewFinderOverlay.qml:190 ../ViewFinderOverlay.qml:218
++#: ../ViewFinderOverlay.qml:241 ../ViewFinderOverlay.qml:264
++#: ../ViewFinderOverlay.qml:283 ../ViewFinderOverlay.qml:341
  msgid "Off"
  msgstr ""
--#: ../ViewFinderOverlay.qml:169
++#: ../ViewFinderOverlay.qml:213
  msgid "Auto"
  msgstr ""
--#: ../ViewFinderOverlay.qml:206
++#: ../ViewFinderOverlay.qml:250
  msgid "HDR"
  msgstr ""
--#: ../ViewFinderOverlay.qml:244
++#: ../ViewFinderOverlay.qml:288
  msgid "5 seconds"
  msgstr ""
--#: ../ViewFinderOverlay.qml:249
++#: ../ViewFinderOverlay.qml:293
  msgid "15 seconds"
  msgstr ""
--#: ../ViewFinderOverlay.qml:266
++#: ../ViewFinderOverlay.qml:310
  msgid "Fine Quality"
  msgstr ""
--#: ../ViewFinderOverlay.qml:270
++#: ../ViewFinderOverlay.qml:314
  msgid "Normal Quality"
  msgstr ""
--#: ../ViewFinderOverlay.qml:274
++#: ../ViewFinderOverlay.qml:318
  msgid "Basic Quality"
  msgstr ""
--#: ../ViewFinderOverlay.qml:306
++#: ../ViewFinderOverlay.qml:350
  msgid "SD"
  msgstr ""
--#: ../ViewFinderOverlay.qml:314
++#: ../ViewFinderOverlay.qml:358
  msgid "Save to SD Card"
  msgstr ""
--#: ../ViewFinderOverlay.qml:319
++#: ../ViewFinderOverlay.qml:363
  msgid "Save internally"
  msgstr ""
 === modified file 'tests/autopilot/camera_app/emulators/main_window.py'
 --- tests/autopilot/camera_app/emulators/main_window.py	2014-12-08 12:04:21 +0000
 +++ tests/autopilot/camera_app/emulators/main_window.py	2015-01-08 13:44:43 +0000
@@ -77,6 +77,10 @@
          """Returns the grid lines toggle button of the camera"""
          return self.get_option_button("gridEnabled")
++    def get_video_resolution_button(self):
++        """Returns the video resolution button of the camera"""
++        return self.get_option_button("videoResolution")
++
      def get_stop_watch(self):
          """Returns the stop watch when using the record button of the camera"""
          return self.app.wait_select_single("StopWatch")
 === modified file 'tests/autopilot/camera_app/emulators/panel.py'
 --- tests/autopilot/camera_app/emulators/panel.py	2014-06-26 11:49:31 +0000
 +++ tests/autopilot/camera_app/emulators/panel.py	2015-01-08 13:44:43 +0000
@@ -51,7 +51,7 @@
      def _drag_to_close(self):
          x, y, _, _ = self.globalRect
--        line_x = x + self.width * 0.50
++        line_x = x
          start_y = y
          stop_y = y + self.height - 1
 === modified file 'tests/autopilot/camera_app/tests/test_capture.py'
 --- tests/autopilot/camera_app/tests/test_capture.py	2014-12-03 18:18:05 +0000
 +++ tests/autopilot/camera_app/tests/test_capture.py	2015-01-08 13:44:43 +0000
@@ -11,6 +11,7 @@
  from autopilot.platform import model
  from testtools.matchers import Equals, NotEquals
  from wand.image import Image
++from MediaInfoDLL3 import MediaInfo, Stream
  from camera_app.tests import CameraAppTestCase
@@ -253,3 +254,142 @@
          self.pointing_device.click()
          bottom_edge.close()
++
++    """Test recording videos at a set resolution and switching cameras"""
++    def test_video_resolution_setting_switching_cameras(self):
++        # switch to video recording and empty video folder
++        self.switch_to_video_recording()
++        self.delete_all_videos()
++
++        # select the first resolution for the current camera
++        resolutions = self.get_available_video_resolutions()
++        initial_resolution = resolutions[0]
++        self.set_video_resolution(initial_resolution)
++
++        # switch cameras and select the last resolution for the current camera
++        self.switch_cameras()
++        resolutions = self.get_available_video_resolutions()
++        expected_resolution = resolutions[-1]
++        self.assertThat(expected_resolution, NotEquals(initial_resolution))
++        self.set_video_resolution(expected_resolution)
++
++        # switch back to the initial camera and record a video
++        self.switch_cameras()
++        self.record_video(2)
++        video_file = self.get_first_video()
++        height = self.read_video_height(video_file)
++        expected_height = self.height_from_resolution_label(expected_resolution)
++        self.assertThat(height, Equals(expected_height))
++
++    def switch_cameras(self):
++        # Swap cameras and wait for camera to settle
++        shoot_button = self.main_window.get_exposure_button()
++        swap_camera_button = self.main_window.get_swap_camera_button()
++        self.pointing_device.move_to_object(swap_camera_button)
++        self.pointing_device.click()
++        self.assertThat(shoot_button.enabled, Eventually(Equals(True)))
++
++    """Test recording videos at various resolutions"""
++    def test_video_resolution_setting(self):
++        self.switch_to_video_recording()
++        resolutions = self.get_available_video_resolutions()
++
++        for resolution_label in resolutions:
++            self.delete_all_videos()
++            self.set_video_resolution(resolution_label)
++            self.record_video(2)
++            video_file = self.get_first_video()
++            height = self.read_video_height(video_file)
++            expected_height = self.height_from_resolution_label(resolution_label)
++            self.assertThat(height, Equals(expected_height))
++            self.dismiss_first_photo_hint()
++
++    def switch_to_video_recording(self):
++        record_control = self.main_window.get_record_control()
++        # Wait for the camera overlay to be loaded
++        self.assertThat(record_control.enabled, Eventually(Equals(True)))
++        self.assertThat(record_control.width, Eventually(NotEquals(0)))
++        self.assertThat(record_control.height, Eventually(NotEquals(0)))
++
++        self.pointing_device.move_to_object(record_control)
++        self.pointing_device.click()
++
++    def get_available_video_resolutions(self):
++        # open bottom edge
++        bottom_edge = self.main_window.get_bottom_edge()
++        bottom_edge.open()
++
++        # open video resolution option value selector showing the possible values
++        video_resolution_button = self.main_window.get_video_resolution_button()
++        self.pointing_device.move_to_object(video_resolution_button)
++        self.pointing_device.click()
++        option_value_selector = self.main_window.get_option_value_selector()
++        self.assertThat(option_value_selector.visible, Eventually(Equals(True)))
++        optionButtons = option_value_selector.select_many("OptionValueButton")
++        resolutions = [button.label for button in optionButtons]
++
++        bottom_edge.close()
++        return resolutions
++
++    def delete_all_videos(self):
++        video_files = os.listdir(self.videos_dir)
++        for f in video_files:
++            os.remove(os.path.join(self.videos_dir, f))
++
++    def set_video_resolution(self, resolution_label="720p"):
++        # open bottom edge
++        bottom_edge = self.main_window.get_bottom_edge()
++        bottom_edge.open()
++
++        # open video resolution option value selector showing the possible values
++        video_resolution_button = self.main_window.get_video_resolution_button()
++        self.pointing_device.move_to_object(video_resolution_button)
++        self.pointing_device.click()
++        option_value_selector = self.main_window.get_option_value_selector()
++        self.assertThat(option_value_selector.visible, Eventually(Equals(True)))
++
++        # tap on chosen video resolution option
++        option = self.main_window.get_option_value_button(resolution_label)
++        self.pointing_device.move_to_object(option)
++        self.pointing_device.click()
++
++        bottom_edge.close()
++
++    def record_video(self, duration):
++        exposure_button = self.main_window.get_exposure_button()
++
++        # Click the exposure button to start recording
++        self.pointing_device.move_to_object(exposure_button)
++        self.assertThat(exposure_button.enabled, Eventually(Equals(True)))
++        self.assertThat(exposure_button.width, Eventually(NotEquals(0)))
++        self.assertThat(exposure_button.height, Eventually(NotEquals(0)))
++        self.pointing_device.click()
++
++        # Record video for duration seconds
++        time.sleep(duration)
++        self.pointing_device.click()
++
++        stop_watch = self.main_window.get_stop_watch()
++        self.assertThat(stop_watch.opacity, Eventually(Equals(0.0)))
++
++    def get_first_video(self, timeout=10):
++        videos = []
++        for i in range(0, timeout):
++            videos = os.listdir(self.videos_dir)
++            if len(videos) != 0:
++                break
++            time.sleep(1)
++
++        video_file = os.path.join(self.videos_dir, videos[0])
++        return video_file
++
++    def read_video_height(self, video_file):
++        MI = MediaInfo()
++        MI.Open(video_file)
++        height = MI.Get(Stream.Video, 0, "Height")
++        MI.Close()
++        return height
++
++    def height_from_resolution_label(self, resolution_label):
++        # remove last character from label (always 'p')
++        return resolution_label[:-1]

camera-app

Merge lp:~fboucault/camera-app/video_quality into lp:camera-app

Commit message

Description of the change

Preview Diff

Subscribers