summaryrefslogtreecommitdiffstats
path: root/src/multimedia/CMakeLists.txt
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2021-01-31 17:01:22 +0100
committerLars Knoll <lars.knoll@qt.io>2021-02-09 14:34:23 +0000
commitd9fcf2ab6ac24cdba9a9ff3f0e32a39938216cee (patch)
treecdf45c74632539fcdafbd99384e99c213d12e78b /src/multimedia/CMakeLists.txt
parentab4dc309ef0ab36c0dcf18b2e96614e1e10d311c (diff)
New API for handling media formats and codecs
Implement a new API for handling media formats and codecs. The API gives better control to discover supported file formats and codecs for encoding and decoding. QMediaRecorder will be moved over to use the new API in a subsequent commit. Android only has stubs implemented currently, as I can't test anything beyond simple compilation. Change-Id: Iff5f044f87c97f83d9151b10d7a78709822e077a Reviewed-by: Doris Verria <doris.verria@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/multimedia/CMakeLists.txt')
-rw-r--r--src/multimedia/CMakeLists.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/multimedia/CMakeLists.txt b/src/multimedia/CMakeLists.txt
index 78685717f..2e408425c 100644
--- a/src/multimedia/CMakeLists.txt
+++ b/src/multimedia/CMakeLists.txt
@@ -51,11 +51,13 @@ qt_internal_add_module(Multimedia
platform/qmediaplatformdevicemanager.cpp platform/qmediaplatformdevicemanager_p.h
platform/qmediaplatformintegration.cpp platform/qmediaplatformintegration_p.h
platform/qmediaplatformplayerinterface.cpp platform/qmediaplatformplayerinterface_p.h
+ platform/qmediaplatformformatinfo.cpp platform/qmediaplatformformatinfo_p.h
playback/qmediaplayer.cpp playback/qmediaplayer.h
playback/qmediaplaylist.cpp playback/qmediaplaylist.h playback/qmediaplaylist_p.h
playback/qplaylistfileparser.cpp playback/qplaylistfileparser_p.h
qmediadevicemanager.cpp qmediadevicemanager.h
qmediaenumdebug.h
+ qmediaformat.cpp qmediaformat.h
qmediametadata.cpp qmediametadata.h
qmediapluginloader.cpp qmediapluginloader_p.h
qmediaservice.cpp qmediaservice.h qmediaservice_p.h
@@ -222,6 +224,7 @@ qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_gstreamer
platform/gstreamer/mediaplayer/qgstreamerplayerservice.cpp platform/gstreamer/mediaplayer/qgstreamerplayerservice_p.h
platform/gstreamer/mediaplayer/qgstreamerstreamscontrol.cpp platform/gstreamer/mediaplayer/qgstreamerstreamscontrol_p.h
platform/gstreamer/qgstreamerdevicemanager.cpp platform/gstreamer/qgstreamerdevicemanager_p.h
+ platform/gstreamer/qgstreamerformatsinfo.cpp platform/gstreamer/qgstreamerformatsinfo_p.h
platform/gstreamer/qgstreamerintegration.cpp platform/gstreamer/qgstreamerintegration_p.h
DEFINES
GLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26
@@ -367,6 +370,7 @@ qt_internal_extend_target(Multimedia CONDITION ANDROID
platform/android/mediaplayer/qandroidmediaservice.cpp platform/android/mediaplayer/qandroidmediaservice_p.h
platform/android/mediaplayer/qandroidmetadatareadercontrol.cpp platform/android/mediaplayer/qandroidmetadatareadercontrol_p.h
platform/android/qandroiddevicemanager.cpp platform/android/qandroiddevicemanager_p.h
+ platform/android/qandroidformatsinfo.cpp platform/android/qandroidformatsinfo_p.h
platform/android/qandroidintegration.cpp platform/android/qandroidintegration_p.h
platform/android/wrappers/jni/androidcamera.cpp platform/android/wrappers/jni/androidcamera_p.h
platform/android/wrappers/jni/androidmediametadataretriever.cpp platform/android/wrappers/jni/androidmediametadataretriever_p.h
@@ -415,6 +419,7 @@ qt_internal_extend_target(Multimedia CONDITION APPLE AND NOT WATCHOS
platform/darwin/mediaplayer/avfvideooutput.mm platform/darwin/mediaplayer/avfvideooutput_p.h
platform/darwin/mediaplayer/avfvideowindowcontrol.mm platform/darwin/mediaplayer/avfvideowindowcontrol_p.h
platform/darwin/qdarwindevicemanager.mm platform/darwin/qdarwindevicemanager_p.h
+ platform/darwin/qdarwinformatsinfo.mm platform/darwin/qdarwinformatsinfo_p.h
platform/darwin/qdarwinintegration.cpp platform/darwin/qdarwinintegration_p.h
PUBLIC_LIBRARIES
${FWAudioToolbox}