review.tizen.org Git - platform/upstream/qtmultimedia.git/commit

projects / platform / upstream / qtmultimedia.git / commit

author	Yoann Lopes <yoann.lopes@digia.com>
	Mon, 25 Mar 2013 17:11:27 +0000 (18:11 +0100)
committer	The Qt Project <gerrit-noreply@qt-project.org>
	Thu, 12 Sep 2013 10:56:57 +0000 (12:56 +0200)
commit	0a7882f6b308296ff9d44d891d3bdfed91679ce2
tree	8a1e1575158d8213773fcf4e692a160bf4b301cd	tree \| snapshot
parent	99fff6941ba6b1929c1bd8d46dc8776a6cbf11c6	commit \| diff

Android: added camera support.

This patch includes all camera features: viewport, settings, image
capture, and video recording.
It also adds support for QAudioRecorder.

Change-Id: Ib962177cc8de4bac03f42a2bc0f534e03464bbfc
Reviewed-by: Christian Stromme <christian.stromme@digia.com>

86 files changed:

src/multimedia/multimedia.pro		diff \| blob \| history
src/plugins/android/android.pro		diff \| blob \| history
src/plugins/android/jar/jar.pri		diff \| blob \| history
src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtCamera.java	[new file with mode: 0644]	blob
src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtMediaRecorder.java	[new file with mode: 0644]	blob
src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtMultimediaUtils.java	[new file with mode: 0644]	blob
src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtSurfaceTexture.java		diff \| blob \| history
src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtSurfaceTextureHolder.java		diff \| blob \| history
src/plugins/android/mediaplayer/mediaplayer.json	[deleted file]	blob \| history
src/plugins/android/mediaplayer/mediaplayer.pro	[deleted file]	blob \| history
src/plugins/android/src/android_mediaservice.json	[new file with mode: 0644]	blob
src/plugins/android/src/common/common.pri	[new file with mode: 0644]	blob
src/plugins/android/src/common/qandroidmultimediautils.cpp	[new file with mode: 0644]	blob
src/plugins/android/src/common/qandroidmultimediautils.h	[new file with mode: 0644]	blob
src/plugins/android/src/common/qandroidvideooutput.h	[moved from src/plugins/android/mediaplayer/qandroidvideooutput.h with 97% similarity]	diff \| blob \| history
src/plugins/android/src/common/qandroidvideorendercontrol.cpp	[moved from src/plugins/android/mediaplayer/qandroidvideorendercontrol.cpp with 96% similarity]	diff \| blob \| history
src/plugins/android/src/common/qandroidvideorendercontrol.h	[moved from src/plugins/android/mediaplayer/qandroidvideorendercontrol.h with 97% similarity]	diff \| blob \| history
src/plugins/android/src/mediacapture/mediacapture.pri	[new file with mode: 0644]	blob
src/plugins/android/src/mediacapture/qandroidaudioencodersettingscontrol.cpp	[new file with mode: 0644]	blob
src/plugins/android/src/mediacapture/qandroidaudioencodersettingscontrol.h	[new file with mode: 0644]	blob
src/plugins/android/src/mediacapture/qandroidaudioinputselectorcontrol.cpp	[new file with mode: 0644]	blob
src/plugins/android/src/mediacapture/qandroidaudioinputselectorcontrol.h	[new file with mode: 0644]	blob
src/plugins/android/src/mediacapture/qandroidcameracapturebufferformatcontrol.cpp	[new file with mode: 0644]	blob
src/plugins/android/src/mediacapture/qandroidcameracapturebufferformatcontrol.h	[new file with mode: 0644]	blob
src/plugins/android/src/mediacapture/qandroidcameracapturedestinationcontrol.cpp	[new file with mode: 0644]	blob
src/plugins/android/src/mediacapture/qandroidcameracapturedestinationcontrol.h	[new file with mode: 0644]	blob
src/plugins/android/src/mediacapture/qandroidcameracontrol.cpp	[new file with mode: 0644]	blob
src/plugins/android/src/mediacapture/qandroidcameracontrol.h	[new file with mode: 0644]	blob
src/plugins/android/src/mediacapture/qandroidcameraexposurecontrol.cpp	[new file with mode: 0644]	blob
src/plugins/android/src/mediacapture/qandroidcameraexposurecontrol.h	[new file with mode: 0644]	blob
src/plugins/android/src/mediacapture/qandroidcameraflashcontrol.cpp	[new file with mode: 0644]	blob
src/plugins/android/src/mediacapture/qandroidcameraflashcontrol.h	[new file with mode: 0644]	blob
src/plugins/android/src/mediacapture/qandroidcamerafocuscontrol.cpp	[new file with mode: 0644]	blob
src/plugins/android/src/mediacapture/qandroidcamerafocuscontrol.h	[new file with mode: 0644]	blob
src/plugins/android/src/mediacapture/qandroidcameraimagecapturecontrol.cpp	[new file with mode: 0644]	blob
src/plugins/android/src/mediacapture/qandroidcameraimagecapturecontrol.h	[new file with mode: 0644]	blob
src/plugins/android/src/mediacapture/qandroidcameraimageprocessingcontrol.cpp	[new file with mode: 0644]	blob
src/plugins/android/src/mediacapture/qandroidcameraimageprocessingcontrol.h	[new file with mode: 0644]	blob
src/plugins/android/src/mediacapture/qandroidcameralockscontrol.cpp	[new file with mode: 0644]	blob
src/plugins/android/src/mediacapture/qandroidcameralockscontrol.h	[new file with mode: 0644]	blob
src/plugins/android/src/mediacapture/qandroidcamerasession.cpp	[new file with mode: 0644]	blob
src/plugins/android/src/mediacapture/qandroidcamerasession.h	[new file with mode: 0644]	blob
src/plugins/android/src/mediacapture/qandroidcamerazoomcontrol.cpp	[new file with mode: 0644]	blob
src/plugins/android/src/mediacapture/qandroidcamerazoomcontrol.h	[new file with mode: 0644]	blob
src/plugins/android/src/mediacapture/qandroidcaptureservice.cpp	[new file with mode: 0644]	blob
src/plugins/android/src/mediacapture/qandroidcaptureservice.h	[new file with mode: 0644]	blob
src/plugins/android/src/mediacapture/qandroidcapturesession.cpp	[new file with mode: 0644]	blob
src/plugins/android/src/mediacapture/qandroidcapturesession.h	[new file with mode: 0644]	blob
src/plugins/android/src/mediacapture/qandroidimageencodercontrol.cpp	[new file with mode: 0644]	blob
src/plugins/android/src/mediacapture/qandroidimageencodercontrol.h	[new file with mode: 0644]	blob
src/plugins/android/src/mediacapture/qandroidmediacontainercontrol.cpp	[new file with mode: 0644]	blob
src/plugins/android/src/mediacapture/qandroidmediacontainercontrol.h	[new file with mode: 0644]	blob
src/plugins/android/src/mediacapture/qandroidmediarecordercontrol.cpp	[new file with mode: 0644]	blob
src/plugins/android/src/mediacapture/qandroidmediarecordercontrol.h	[new file with mode: 0644]	blob
src/plugins/android/src/mediacapture/qandroidmediastoragelocation.cpp	[new file with mode: 0644]	blob
src/plugins/android/src/mediacapture/qandroidmediastoragelocation.h	[new file with mode: 0644]	blob
src/plugins/android/src/mediacapture/qandroidvideodeviceselectorcontrol.cpp	[new file with mode: 0644]	blob
src/plugins/android/src/mediacapture/qandroidvideodeviceselectorcontrol.h	[new file with mode: 0644]	blob
src/plugins/android/src/mediacapture/qandroidvideoencodersettingscontrol.cpp	[new file with mode: 0644]	blob
src/plugins/android/src/mediacapture/qandroidvideoencodersettingscontrol.h	[new file with mode: 0644]	blob
src/plugins/android/src/mediaplayer/mediaplayer.pri	[new file with mode: 0644]	blob
src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp	[moved from src/plugins/android/mediaplayer/qandroidmediaplayercontrol.cpp with 99% similarity]	diff \| blob \| history
src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.h	[moved from src/plugins/android/mediaplayer/qandroidmediaplayercontrol.h with 100% similarity]	blob \| history
src/plugins/android/src/mediaplayer/qandroidmediaservice.cpp	[moved from src/plugins/android/mediaplayer/qandroidmediaservice.cpp with 100% similarity]	blob \| history
src/plugins/android/src/mediaplayer/qandroidmediaservice.h	[moved from src/plugins/android/mediaplayer/qandroidmediaservice.h with 100% similarity]	blob \| history
src/plugins/android/src/mediaplayer/qandroidmetadatareadercontrol.cpp	[moved from src/plugins/android/mediaplayer/qandroidmetadatareadercontrol.cpp with 100% similarity]	blob \| history
src/plugins/android/src/mediaplayer/qandroidmetadatareadercontrol.h	[moved from src/plugins/android/mediaplayer/qandroidmetadatareadercontrol.h with 100% similarity]	blob \| history
src/plugins/android/src/qandroidmediaserviceplugin.cpp	[moved from src/plugins/android/mediaplayer/qandroidmediaserviceplugin.cpp with 66% similarity]	diff \| blob \| history
src/plugins/android/src/qandroidmediaserviceplugin.h	[moved from src/plugins/android/mediaplayer/qandroidmediaserviceplugin.h with 89% similarity]	diff \| blob \| history
src/plugins/android/src/src.pro	[new file with mode: 0644]	blob
src/plugins/android/src/wrappers/jcamera.cpp	[new file with mode: 0644]	blob
src/plugins/android/src/wrappers/jcamera.h	[new file with mode: 0644]	blob
src/plugins/android/src/wrappers/jmediametadataretriever.cpp	[moved from src/plugins/android/wrappers/jmediametadataretriever.cpp with 100% similarity]	blob \| history
src/plugins/android/src/wrappers/jmediametadataretriever.h	[moved from src/plugins/android/wrappers/jmediametadataretriever.h with 100% similarity]	blob \| history
src/plugins/android/src/wrappers/jmediaplayer.cpp	[moved from src/plugins/android/wrappers/jmediaplayer.cpp with 100% similarity]	blob \| history
src/plugins/android/src/wrappers/jmediaplayer.h	[moved from src/plugins/android/wrappers/jmediaplayer.h with 100% similarity]	blob \| history
src/plugins/android/src/wrappers/jmediarecorder.cpp	[new file with mode: 0644]	blob
src/plugins/android/src/wrappers/jmediarecorder.h	[new file with mode: 0644]	blob
src/plugins/android/src/wrappers/jmultimediautils.cpp	[new file with mode: 0644]	blob
src/plugins/android/src/wrappers/jmultimediautils.h	[new file with mode: 0644]	blob
src/plugins/android/src/wrappers/jsurfacetexture.cpp	[moved from src/plugins/android/wrappers/jsurfacetexture.cpp with 94% similarity]	diff \| blob \| history
src/plugins/android/src/wrappers/jsurfacetexture.h	[moved from src/plugins/android/wrappers/jsurfacetexture.h with 98% similarity]	diff \| blob \| history
src/plugins/android/src/wrappers/jsurfacetextureholder.cpp	[moved from src/plugins/android/wrappers/jsurfacetextureholder.cpp with 100% similarity]	blob \| history
src/plugins/android/src/wrappers/jsurfacetextureholder.h	[moved from src/plugins/android/wrappers/jsurfacetextureholder.h with 100% similarity]	blob \| history
src/plugins/android/src/wrappers/wrappers.pri	[moved from src/plugins/android/wrappers/wrappers.pri with 52% similarity]	diff \| blob \| history
src/plugins/plugins.pro		diff \| blob \| history

Domain: UI Framework / Qt;

RSS Atom