New QCameraInfo class.
authorYoann Lopes <yoann.lopes@digia.com>
Wed, 22 Jan 2014 15:18:42 +0000 (16:18 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Fri, 28 Feb 2014 13:10:00 +0000 (14:10 +0100)
commitb28ee24628f77fced393cacc45500be6761e4497
tree811173f8a2caf84e0fa386010283ccfd32c6ad0d
parentd964388b38ec4762e315d86aacb779604bcdca1b
New QCameraInfo class.

The class allows to get the list of available cameras on the system as
well as getting some static information about them such as their unique
ID, display name, physical position and sensor orientation.

This makes QCamera::availableDevices() and QCamera::deviceDescription()
obsolete.

This patch contains the API, documentation and auto-tests but not the
actual implementation by each backend (except for retrieving the default
camera device).

[ChangeLog][QtMultimedia] Added new QCameraInfo class
[ChangeLog][QtMultimedia] QCamera: availableDevices() and
deviceDescription() are deprecated, use QCameraInfo instead

Change-Id: I64fd65729ab26a789468979ed5444ee90bb82cd0
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
54 files changed:
src/multimedia/camera/camera.pri
src/multimedia/camera/qcamera.cpp
src/multimedia/camera/qcamera.h
src/multimedia/camera/qcamera_p.h [new file with mode: 0644]
src/multimedia/camera/qcameraexposure.h
src/multimedia/camera/qcamerafocus.h
src/multimedia/camera/qcameraimageprocessing.h
src/multimedia/camera/qcamerainfo.cpp [new file with mode: 0644]
src/multimedia/camera/qcamerainfo.h [new file with mode: 0644]
src/multimedia/controls/controls.pri
src/multimedia/controls/qcamerainfocontrol.cpp [new file with mode: 0644]
src/multimedia/controls/qcamerainfocontrol.h [new file with mode: 0644]
src/multimedia/doc/snippets/multimedia-snippets/camera.cpp
src/multimedia/doc/src/cameraoverview.qdoc
src/multimedia/qmediaserviceprovider.cpp
src/multimedia/qmediaserviceprovider_p.h
src/multimedia/qmediaserviceproviderplugin.h
src/plugins/android/src/mediacapture/qandroidvideodeviceselectorcontrol.cpp
src/plugins/android/src/mediacapture/qandroidvideodeviceselectorcontrol.h
src/plugins/android/src/qandroidmediaserviceplugin.cpp
src/plugins/android/src/qandroidmediaserviceplugin.h
src/plugins/avfoundation/camera/avfcameraserviceplugin.h
src/plugins/avfoundation/camera/avfcameraserviceplugin.mm
src/plugins/avfoundation/camera/avfvideodevicecontrol.h
src/plugins/avfoundation/camera/avfvideodevicecontrol.mm
src/plugins/directshow/camera/dsvideodevicecontrol.cpp
src/plugins/directshow/dsserviceplugin.cpp
src/plugins/directshow/dsserviceplugin.h
src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp
src/plugins/gstreamer/camerabin/camerabinserviceplugin.h
src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.cpp
src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.h
src/plugins/qnx/bbserviceplugin.cpp
src/plugins/qnx/bbserviceplugin.h
src/plugins/wmf/wmfserviceplugin.cpp
src/plugins/wmf/wmfserviceplugin.h
tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
tests/auto/unit/multimedia.pro
tests/auto/unit/qcamera/tst_qcamera.cpp
tests/auto/unit/qcamerainfo/qcamerainfo.pro [new file with mode: 0644]
tests/auto/unit/qcamerainfo/tst_qcamerainfo.cpp [new file with mode: 0644]
tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.cpp
tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.cpp
tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.json
tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.cpp [new file with mode: 0644]
tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.json [new file with mode: 0644]
tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro [new file with mode: 0644]
tests/auto/unit/qmediaserviceprovider/qmediaserviceprovider.pro
tests/auto/unit/qmediaserviceprovider/tst_qmediaserviceprovider.cpp
tests/auto/unit/qmultimedia_common/mockcamera.pri
tests/auto/unit/qmultimedia_common/mockcamerainfocontrol.h [new file with mode: 0644]
tests/auto/unit/qmultimedia_common/mockcameraservice.h
tests/auto/unit/qmultimedia_common/mockmediaserviceprovider.h
tests/auto/unit/qmultimedia_common/mockvideodeviceselectorcontrol.h [new file with mode: 0644]