lp:~fboucault/qtubuntu-camera/resolution_fixes

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:qtubuntu-camera/staging at revision 156

Ubuntu Phablet Team: Pending requested 2015-11-25

PS Jenkins bot: Pending (continuous-integration) requested 2015-11-25

Diff: 1164 lines (+303/-287)

28 files modified

.qmake.conf (+5/-0)
aalCamera.pro (+2/-0)
src/aalcameracontrol.cpp (+14/-5)
src/aalcamerafocuscontrol.cpp (+2/-0)
src/aalcameraservice.cpp (+44/-21)
src/aalcameraservice.h (+4/-1)
src/aalimagecapturecontrol.cpp (+0/-123)
src/aalimagecapturecontrol.h (+0/-10)
src/aalimageencodercontrol.cpp (+53/-30)
src/aalimageencodercontrol.h (+2/-2)
src/aalvideodeviceselectorcontrol.cpp (+3/-1)
src/aalvideoencodersettingscontrol.cpp (+11/-1)
src/aalvideorenderercontrol.cpp (+1/-4)
src/aalviewfindersettingscontrol.cpp (+7/-21)
src/aalviewfindersettingscontrol.h (+1/-1)
src/src.pro (+1/-9)
unittests/aalcameracontrol/aalcameraservice.cpp (+15/-0)
unittests/aalcameraexposurecontrol/aalcameraservice.cpp (+15/-0)
unittests/aalcameraflashcontrol/aalcameraservice.cpp (+15/-0)
unittests/aalcamerafocuscontrol/aalcameraservice.cpp (+15/-0)
unittests/aalcamerazoomcontrol/aalcameraservice.cpp (+15/-0)
unittests/aalimagecapturecontrol/aalcameraservice.cpp (+15/-0)
unittests/aalimagecapturecontrol/aalimageencodercontrol.cpp (+4/-8)
unittests/aalimagecapturecontrol/tst_aalimagecapturecontrol.cpp (+0/-44)
unittests/aalvideodeviceselectorcontrol/aalcameraservice.cpp (+15/-5)
unittests/aalvideodeviceselectorcontrol/aalimageencodercontrol.cpp (+2/-1)
unittests/aalviewfindersettingscontrol/aalcameraservice.cpp (+34/-0)
unittests/stubs/aalcameraservice_stub.cpp (+8/-0)

api

Superseded for merging into lp:qtubuntu-camera

PS Jenkins bot: Approve (continuous-integration) on 2015-11-19

Ubuntu Phablet Team: Pending requested 2015-10-14

Diff: 1161 lines (+302/-286)

28 files modified

.qmake.conf (+5/-0)
aalCamera.pro (+2/-0)
src/aalcameracontrol.cpp (+14/-5)
src/aalcamerafocuscontrol.cpp (+2/-0)
src/aalcameraservice.cpp (+43/-20)
src/aalcameraservice.h (+4/-1)
src/aalimagecapturecontrol.cpp (+0/-123)
src/aalimagecapturecontrol.h (+0/-10)
src/aalimageencodercontrol.cpp (+53/-30)
src/aalimageencodercontrol.h (+2/-2)
src/aalvideodeviceselectorcontrol.cpp (+3/-1)
src/aalvideoencodersettingscontrol.cpp (+11/-1)
src/aalvideorenderercontrol.cpp (+1/-4)
src/aalviewfindersettingscontrol.cpp (+7/-21)
src/aalviewfindersettingscontrol.h (+1/-1)
src/src.pro (+1/-9)
unittests/aalcameracontrol/aalcameraservice.cpp (+15/-0)
unittests/aalcameraexposurecontrol/aalcameraservice.cpp (+15/-0)
unittests/aalcameraflashcontrol/aalcameraservice.cpp (+15/-0)
unittests/aalcamerafocuscontrol/aalcameraservice.cpp (+15/-0)
unittests/aalcamerazoomcontrol/aalcameraservice.cpp (+15/-0)
unittests/aalimagecapturecontrol/aalcameraservice.cpp (+15/-0)
unittests/aalimagecapturecontrol/aalimageencodercontrol.cpp (+4/-8)
unittests/aalimagecapturecontrol/tst_aalimagecapturecontrol.cpp (+0/-44)
unittests/aalvideodeviceselectorcontrol/aalcameraservice.cpp (+15/-5)
unittests/aalvideodeviceselectorcontrol/aalimageencodercontrol.cpp (+2/-1)
unittests/aalviewfindersettingscontrol/aalcameraservice.cpp (+34/-0)
unittests/stubs/aalcameraservice_stub.cpp (+8/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

164. By Florian Boucault on 2015-11-25

Merged with staging

163. By Florian Boucault on 2015-11-17

Fix broken viewfinder's aspect ratio when setting its size multiple times quickly in sequence.

162. By Florian Boucault on 2015-11-12

Reverted commit 160 that was breaking front camera.

161. By Florian Boucault on 2015-11-12

Make it easy to crossbuild

160. By Florian Boucault on 2015-11-04

Fixed broken aspect ratio rendering when switching cameras on arale.

159. By Florian Boucault on 2015-11-04

Removed debugging

158. By Florian Boucault on 2015-10-15

Fixed unit tests.

157. By Florian Boucault on 2015-10-15

Make sure shooting aspect ratio is passed on to the viewfinder in video recording mode.

156. By Florian Boucault on 2015-10-15

Factored selectSizeWithAspectRatio into AalCameraService.

155. By Florian Boucault on 2015-10-14

Ensure that thumbnails aspect ratio is always synchronised with image's aspect ratio.