diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2021-02-09 12:55:32 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-02-12 15:38:47 +0000 |
| commit | 187419edb2c087063afc5931134d36692f4b39a4 (patch) | |
| tree | 88d9117e2c6475f8c32d83b2ee09f27b2dba60a9 /src/multimedia/platform/darwin/mediaplayer/avfmediaplayerservice.mm | |
| parent | 3c59ba2b3ce96f578b2d677ecc1fbf7da0b2e27f (diff) | |
Rework the metadata handling
Get rid of metadata reader and writer controls. Instead use
a simple cross platform value class to store meta data.
The backend can then convert to and from whatever the native
API expects.
Change-Id: I7cf84bfbe8eef2a88615a52ba5afeec50a0652c8
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/multimedia/platform/darwin/mediaplayer/avfmediaplayerservice.mm')
| -rw-r--r-- | src/multimedia/platform/darwin/mediaplayer/avfmediaplayerservice.mm | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/src/multimedia/platform/darwin/mediaplayer/avfmediaplayerservice.mm b/src/multimedia/platform/darwin/mediaplayer/avfmediaplayerservice.mm index b300c4c1a..32cc5fd27 100644 --- a/src/multimedia/platform/darwin/mediaplayer/avfmediaplayerservice.mm +++ b/src/multimedia/platform/darwin/mediaplayer/avfmediaplayerservice.mm @@ -40,7 +40,6 @@ #include "avfmediaplayerservice_p.h" #include "avfmediaplayersession_p.h" #include "avfmediaplayercontrol_p.h" -#include "avfmediaplayermetadatacontrol_p.h" #include "avfvideooutput_p.h" #if QT_CONFIG(opengl) #include "avfvideorenderercontrol_p.h" @@ -56,9 +55,6 @@ AVFMediaPlayerService::AVFMediaPlayerService() m_session = new AVFMediaPlayerSession(this); m_control = new AVFMediaPlayerControl(this); m_control->setSession(m_session); - m_playerMetaDataControl = new AVFMediaPlayerMetaDataControl(m_session, this); - - connect(m_control, SIGNAL(mediaChanged(QMediaContent)), m_playerMetaDataControl, SLOT(updateTags())); } AVFMediaPlayerService::~AVFMediaPlayerService() @@ -78,9 +74,6 @@ QObject *AVFMediaPlayerService::requestControl(const char *name) if (qstrcmp(name, QMediaPlayerControl_iid) == 0) return m_control; - if (qstrcmp(name, QMetaDataReaderControl_iid) == 0) - return m_playerMetaDataControl; - #if QT_CONFIG(opengl) if (qstrcmp(name, QVideoRendererControl_iid) == 0) { if (!m_videoOutput) @@ -124,11 +117,6 @@ QMediaPlayerControl *AVFMediaPlayerService::player() return m_control; } -QMetaDataReaderControl *AVFMediaPlayerService::dataReader() -{ - return m_playerMetaDataControl; -} - QVideoRendererControl *AVFMediaPlayerService::createVideoRenderer() { if (m_videoOutput) @@ -152,20 +140,3 @@ QVideoWindowControl *AVFMediaPlayerService::createVideoWindow() m_session->setVideoOutput(control); return control; } - -#if 0 -void listSupportedMimeTypes() -{ - //Populate m_supportedMimeTypes with mimetypes AVAsset supports - NSArray *mimeTypes = [AVURLAsset audiovisualMIMETypes]; - for (NSString *mimeType in mimeTypes) - { - m_supportedMimeTypes.append(QString::fromUtf8([mimeType UTF8String])); - } -#ifdef QT_DEBUG_AVF - qDebug() << "AVFMediaPlayerServicePlugin::buildSupportedTypes"; - qDebug() << "Supported Types: " << m_supportedMimeTypes; -#endif - -} -#endif |