camera-app

Merge lp://qastaging/~fboucault/camera-app/jpeg_quality into lp://qastaging/camera-app

  1. jpeg_quality
  2. Merge into trunk
Proposed by Florian Boucault
Status: Merged
Approved by: Bill Filler
Approved revision: 433
Merged at revision: 432
Proposed branch: lp://qastaging/~fboucault/camera-app/jpeg_quality
Merge into: lp://qastaging/camera-app
Diff against target: 601 lines (+229/-59)
8 files modified
CameraApp/advancedcamerasettings.cpp (+35/-1)
CameraApp/advancedcamerasettings.h (+8/-1)
OptionButton.qml (+1/-1)
ViewFinderOverlay.qml (+38/-1)
debian/control (+1/-0)
po/camera-app.pot (+59/-48)
tests/autopilot/camera_app/emulators/main_window.py (+4/-0)
tests/autopilot/camera_app/tests/test_capture.py (+83/-7)
To merge this branch: bzr merge lp://qastaging/~fboucault/camera-app/jpeg_quality
Reviewer Review Type Date Requested Status
Bill Filler (community) Approve
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+242648@code.qastaging.launchpad.net

Commit message

Added option to select encoding quality for photo capture (JPEG encoding quality).

To post a comment you must log in.
Revision history for this message
Florian Boucault (fboucault) wrote :

Depends on changes in qtubuntu-camera and libhybris:
https://code.launchpad.net/~fboucault/qtubuntu-camera/jpeg_quality/+merge/242649
https://code-review.phablet.ubuntu.com/#/c/349/

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:427
http://jenkins.qa.ubuntu.com/job/camera-app-ci/314/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/10
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/10/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/22
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/218
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/665
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/42
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16164
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/191
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/222
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/222/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
lp://qastaging/~fboucault/camera-app/jpeg_quality updated
428. By Florian Boucault

Merged bottom edge UI fixes from lp:~fboucault/camera-app/sdcard

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:428
http://jenkins.qa.ubuntu.com/job/camera-app-ci/318/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/14
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/14/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/14
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/26
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/227
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/669
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/46
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16214
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/199
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/231
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/231/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
lp://qastaging/~fboucault/camera-app/jpeg_quality updated
429. By Florian Boucault

Do not show quality in bottom edge indicators.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:429
http://jenkins.qa.ubuntu.com/job/camera-app-ci/323/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/19
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/19/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/32
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/247
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/52
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/219
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/252
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/252/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
lp://qastaging/~fboucault/camera-app/jpeg_quality updated
430. By Florian Boucault

Use icon instead of Q

431. By Florian Boucault

Better labels

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:431
http://jenkins.qa.ubuntu.com/job/camera-app-ci/326/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/22
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/22/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/22
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/38
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/259
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/680
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/58
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16354
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/224
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/264
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/264/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
lp://qastaging/~fboucault/camera-app/jpeg_quality updated
432. By Florian Boucault

Added autopilot tests.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:432
http://jenkins.qa.ubuntu.com/job/camera-app-ci/338/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/34
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/34/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/34
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/51
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/283
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/694
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/71
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16476
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/244
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/289
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/289/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
lp://qastaging/~fboucault/camera-app/jpeg_quality updated
433. By Florian Boucault

Fixed enum/int QML conflict

Revision history for this message
Bill Filler (bfiller) wrote :

tested, happroved

review: Approve
lp://qastaging/~fboucault/camera-app/jpeg_quality updated
434. By Florian Boucault

Merged from trunk

435. By Florian Boucault

Fixed previous merge.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches