qtubuntu-camera

Merge lp://staging/~uriboni/qtubuntu-camera/cameras-info into lp://staging/qtubuntu-camera/staging

  1. cameras-info
  2. Merge into staging
Proposed by Ugo Riboni
Status: Merged
Approved by: Florian Boucault
Approved revision: 188
Merged at revision: 181
Proposed branch: lp://staging/~uriboni/qtubuntu-camera/cameras-info
Merge into: lp://staging/qtubuntu-camera/staging
Diff against target: 586 lines (+328/-34)
13 files modified
src/aalcamerainfocontrol.cpp (+33/-0)
src/aalcamerainfocontrol.h (+32/-0)
src/aalcameraservice.cpp (+17/-12)
src/aalcameraservice.h (+3/-0)
src/aalcameraserviceplugin.cpp (+71/-5)
src/aalcameraserviceplugin.h (+5/-1)
src/aalvideodeviceselectorcontrol.cpp (+4/-14)
src/src.pro (+2/-0)
unittests/aalvideodeviceselectorcontrol/aalvideodeviceselectorcontrol.pro (+6/-2)
unittests/aalvideodeviceselectorcontrol/tst_aalvideodeviceselectorcontrol.cpp (+5/-0)
unittests/stubs/qcamerainfo_stub.cpp (+81/-0)
unittests/stubs/qcamerainfodata.cpp (+30/-0)
unittests/stubs/qcamerainfodata.h (+39/-0)
To merge this branch: bzr merge lp://staging/~uriboni/qtubuntu-camera/cameras-info
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Florian Boucault (community) Needs Fixing
Review via email: mp+286283@code.staging.launchpad.net

Commit message

Implement qtmultimedia APIs to query the system for available cameras, their orientation and facing and replace some hardcoded logic to calls to these APIs.

Description of the change

Implement qtmultimedia APIs to query the system for available cameras, their orientation and facing and replace some hardcoded logic to calls to these APIs.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:183
http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-ci/19/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-amd64-ci/18/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-armhf-ci/19/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-i386-ci/18/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-camera-staging-ci/19/rebuild

review: Needs Fixing (continuous-integration)
lp://staging/~uriboni/qtubuntu-camera/cameras-info updated
184. By Ugo Riboni

Fix unit tests

185. By Ugo Riboni

Add useful info the human readable device description

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

PASSED: Continuous integration, rev:185
http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-ci/20/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-amd64-ci/19
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-amd64-ci/19/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-armhf-ci/20/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-i386-ci/19
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-i386-ci/19/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-camera-staging-ci/20/rebuild

review: Approve (continuous-integration)
lp://staging/~uriboni/qtubuntu-camera/cameras-info updated
186. By Ugo Riboni

Remove debug

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

PASSED: Continuous integration, rev:186
http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-ci/21/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-amd64-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-amd64-ci/20/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-armhf-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-armhf-ci/21/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-i386-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-i386-ci/20/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-camera-staging-ci/21/rebuild

review: Approve (continuous-integration)
Revision history for this message
Florian Boucault (fboucault) wrote :

src/aalcameraservice.cpp
control returned by android_camera_connect_by_id() is not kept

review: Needs Fixing
Revision history for this message
Florian Boucault (fboucault) wrote :

src/aalcameraserviceplugin.cpp
    return (result != 0) ? QCamera::UnspecifiedPosition :
                           (facing == BACK_FACING_CAMERA_TYPE ? QCamera::BackFace :
                                                                QCamera::FrontFace);

how about using some if blocks to help readability?

review: Needs Fixing
Revision history for this message
Florian Boucault (fboucault) wrote :

src/aalcameraserviceplugin.cpp

    if (!ok) return 0;
[...]
    if (!ok) return QCamera::UnspecifiedPosition;

syntax rule is to always use {} for any block, even for 1 liners

review: Needs Fixing
lp://staging/~uriboni/qtubuntu-camera/cameras-info updated
187. By Ugo Riboni

Save the AndroidControl in case there is only one camera.Style fixes

188. By Ugo Riboni

Style fixes

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

PASSED: Continuous integration, rev:188
http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-ci/22/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-amd64-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-amd64-ci/21/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-armhf-ci/22
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-armhf-ci/22/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-i386-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-i386-ci/21/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-camera-staging-ci/22/rebuild

review: Approve (continuous-integration)
Revision history for this message
Michael Terry (mterry) wrote :

I tested this branch and got crashes with the code samples from bug 1514253 or bug 1514250.

Ran like so: "qmlscene test.qml --desktop_file_hint=dialer-app.desktop"

#0 0xb30193a8 in ?? () from /lib/arm-linux-gnueabihf/libcrypto.so.1.0.0
#1 0xb3016ec4 in OPENSSL_cpuid_setup ()
   from /lib/arm-linux-gnueabihf/libcrypto.so.1.0.0
#2 0xb6fe280c in ?? () from /lib/ld-linux-armhf.so.3
#3 0x000243b0 in ?? ()
Backtrace stopped: previous frame identical to this frame (corrupt stack?)

Revision history for this message
Michael Terry (mterry) wrote :

Oh, and this was the phone:

current build number: 267
device name: mako
channel: ubuntu-touch/rc-proposed/bq-aquaris.en
last update: 2016-03-19 11:53:04
version version: 267
version ubuntu: 20160318
version device: 20160315
version custom: 20160201-5-vivid

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