slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed metadata keys type from enum to QString.

Browse Source 
This allows to combine metaData and extendedMetaData
and simplify metadata handling on both backend and application sides.

Change-Id: I136eedc86c215be3485db101c43069ca7c82101b
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
This commit is contained in:
Dmytro Poplavskiy
2012-01-16 16:40:47 +10:00
committed by Qt by Nokia
parent 382ba7d4f4
commit 8ff5b88b27
54 changed files with 736 additions and 1050 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp
View File

@@ -124,26 +124,26 @@ gboolean CameraBinImageCapture::metadataEventProbe(GstPad *pad, GstEvent *event,
qDebug() << "Capture event probe" << extendedTags;
#endif
QMap<QtMultimedia::MetaData, QVariant> tags;
tags[QtMultimedia::ISOSpeedRatings] = extendedTags.value("capturing-iso-speed");
tags[QtMultimedia::DigitalZoomRatio] = extendedTags.value("capturing-digital-zoom-ratio");
tags[QtMultimedia::ExposureTime] = extendedTags.value("capturing-shutter-speed");
tags[QtMultimedia::WhiteBalance] = extendedTags.value("capturing-white-balance");
tags[QtMultimedia::Flash] = extendedTags.value("capturing-flash-fired");
tags[QtMultimedia::FocalLengthIn35mmFilm] = extendedTags.value("capturing-focal-length");
tags[QtMultimedia::MeteringMode] = extendedTags.value("capturing-metering-mode");
tags[QtMultimedia::ExposureMode] = extendedTags.value("capturing-exposure-mode");
tags[QtMultimedia::FNumber] = extendedTags.value("capturing-focal-ratio");
tags[QtMultimedia::ExposureMode] = extendedTags.value("capturing-exposure-mode");
QVariantMap tags;
tags[QtMultimedia::MetaData::ISOSpeedRatings] = extendedTags.value("capturing-iso-speed");
tags[QtMultimedia::MetaData::DigitalZoomRatio] = extendedTags.value("capturing-digital-zoom-ratio");
tags[QtMultimedia::MetaData::ExposureTime] = extendedTags.value("capturing-shutter-speed");
tags[QtMultimedia::MetaData::WhiteBalance] = extendedTags.value("capturing-white-balance");
tags[QtMultimedia::MetaData::Flash] = extendedTags.value("capturing-flash-fired");
tags[QtMultimedia::MetaData::FocalLengthIn35mmFilm] = extendedTags.value("capturing-focal-length");
tags[QtMultimedia::MetaData::MeteringMode] = extendedTags.value("capturing-metering-mode");
tags[QtMultimedia::MetaData::ExposureMode] = extendedTags.value("capturing-exposure-mode");
tags[QtMultimedia::MetaData::FNumber] = extendedTags.value("capturing-focal-ratio");
tags[QtMultimedia::MetaData::ExposureMode] = extendedTags.value("capturing-exposure-mode");
QMapIterator<QtMultimedia::MetaData, QVariant> i(tags);
QMapIterator<QString, QVariant> i(tags);
while (i.hasNext()) {
i.next();
if (i.value().isValid()) {
QMetaObject::invokeMethod(self, "imageMetadataAvailable",
Qt::QueuedConnection,
Q_ARG(int, self->m_requestId),
Q_ARG(QtMultimedia::MetaData, i.key()),
Q_ARG(QString, i.key()),
Q_ARG(QVariant, i.value()));
}
}

127
src/plugins/gstreamer/camerabin/camerabinmetadata.cpp
View File

@@ -46,77 +46,77 @@
struct QGstreamerMetaDataKeyLookup
{
QtMultimedia::MetaData key;
QString key;
const char *token;
};
static const QGstreamerMetaDataKeyLookup qt_gstreamerMetaDataKeys[] =
{
{ QtMultimedia::Title, GST_TAG_TITLE },
//{ QtMultimedia::SubTitle, 0 },
//{ QtMultimedia::Author, 0 },
{ QtMultimedia::Comment, GST_TAG_COMMENT },
{ QtMultimedia::Description, GST_TAG_DESCRIPTION },
//{ QtMultimedia::Category, 0 },
{ QtMultimedia::Genre, GST_TAG_GENRE },
//{ QtMultimedia::Year, 0 },
//{ QtMultimedia::UserRating, 0 },
{ QtMultimedia::MetaData::Title, GST_TAG_TITLE },
//{ QtMultimedia::MetaData::SubTitle, 0 },
//{ QtMultimedia::MetaData::Author, 0 },
{ QtMultimedia::MetaData::Comment, GST_TAG_COMMENT },
{ QtMultimedia::MetaData::Description, GST_TAG_DESCRIPTION },
//{ QtMultimedia::MetaData::Category, 0 },
{ QtMultimedia::MetaData::Genre, GST_TAG_GENRE },
//{ QtMultimedia::MetaData::Year, 0 },
//{ QtMultimedia::MetaData::UserRating, 0 },
{ QtMultimedia::Language, GST_TAG_LANGUAGE_CODE },
{ QtMultimedia::MetaData::Language, GST_TAG_LANGUAGE_CODE },
{ QtMultimedia::Publisher, GST_TAG_ORGANIZATION },
{ QtMultimedia::Copyright, GST_TAG_COPYRIGHT },
//{ QtMultimedia::ParentalRating, 0 },
//{ QtMultimedia::RatingOrganization, 0 },
{ QtMultimedia::MetaData::Publisher, GST_TAG_ORGANIZATION },
{ QtMultimedia::MetaData::Copyright, GST_TAG_COPYRIGHT },
//{ QtMultimedia::MetaData::ParentalRating, 0 },
//{ QtMultimedia::MetaData::RatingOrganisation, 0 },
// Media
//{ QtMultimedia::Size, 0 },
//{ QtMultimedia::MediaType, 0 },
{ QtMultimedia::Duration, GST_TAG_DURATION },
//{ QtMultimedia::MetaData::Size, 0 },
//{ QtMultimedia::MetaData::MediaType, 0 },
{ QtMultimedia::MetaData::Duration, GST_TAG_DURATION },
// Audio
{ QtMultimedia::AudioBitRate, GST_TAG_BITRATE },
{ QtMultimedia::AudioCodec, GST_TAG_AUDIO_CODEC },
//{ QtMultimedia::ChannelCount, 0 },
//{ QtMultimedia::SampleRate, 0 },
{ QtMultimedia::MetaData::AudioBitRate, GST_TAG_BITRATE },
{ QtMultimedia::MetaData::AudioCodec, GST_TAG_AUDIO_CODEC },
//{ QtMultimedia::MetaData::ChannelCount, 0 },
//{ QtMultimedia::MetaData::SampleRate, 0 },
// Music
{ QtMultimedia::AlbumTitle, GST_TAG_ALBUM },
{ QtMultimedia::AlbumArtist, GST_TAG_ARTIST},
{ QtMultimedia::ContributingArtist, GST_TAG_PERFORMER },
{ QtMultimedia::MetaData::AlbumTitle, GST_TAG_ALBUM },
{ QtMultimedia::MetaData::AlbumArtist, GST_TAG_ARTIST},
{ QtMultimedia::MetaData::ContributingArtist, GST_TAG_PERFORMER },
#if (GST_VERSION_MAJOR >= 0) && (GST_VERSION_MINOR >= 10) && (GST_VERSION_MICRO >= 19)
{ QtMultimedia::Composer, GST_TAG_COMPOSER },
{ QtMultimedia::MetaData::Composer, GST_TAG_COMPOSER },
#endif
//{ QtMultimedia::Conductor, 0 },
//{ QtMultimedia::Lyrics, 0 },
//{ QtMultimedia::Mood, 0 },
{ QtMultimedia::TrackNumber, GST_TAG_TRACK_NUMBER },
//{ QtMultimedia::MetaData::Conductor, 0 },
//{ QtMultimedia::MetaData::Lyrics, 0 },
//{ QtMultimedia::MetaData::Mood, 0 },
{ QtMultimedia::MetaData::TrackNumber, GST_TAG_TRACK_NUMBER },
//{ QtMultimedia::CoverArtUrlSmall, 0 },
//{ QtMultimedia::CoverArtUrlLarge, 0 },
//{ QtMultimedia::MetaData::CoverArtUrlSmall, 0 },
//{ QtMultimedia::MetaData::CoverArtUrlLarge, 0 },
// Image/Video
//{ QtMultimedia::Resolution, 0 },
//{ QtMultimedia::PixelAspectRatio, 0 },
//{ QtMultimedia::MetaData::Resolution, 0 },
//{ QtMultimedia::MetaData::PixelAspectRatio, 0 },
// Video
//{ QtMultimedia::VideoFrameRate, 0 },
//{ QtMultimedia::VideoBitRate, 0 },
{ QtMultimedia::VideoCodec, GST_TAG_VIDEO_CODEC },
//{ QtMultimedia::MetaData::VideoFrameRate, 0 },
//{ QtMultimedia::MetaData::VideoBitRate, 0 },
{ QtMultimedia::MetaData::VideoCodec, GST_TAG_VIDEO_CODEC },
//{ QtMultimedia::PosterUrl, 0 },
//{ QtMultimedia::MetaData::PosterUrl, 0 },
// Movie
//{ QtMultimedia::ChapterNumber, 0 },
//{ QtMultimedia::Director, 0 },
{ QtMultimedia::LeadPerformer, GST_TAG_PERFORMER },
//{ QtMultimedia::Writer, 0 },
//{ QtMultimedia::MetaData::ChapterNumber, 0 },
//{ QtMultimedia::MetaData::Director, 0 },
{ QtMultimedia::MetaData::LeadPerformer, GST_TAG_PERFORMER },
//{ QtMultimedia::MetaData::Writer, 0 },
// Photos
//{ QtMultimedia::CameraManufacturer, 0 },
//{ QtMultimedia::CameraModel, 0 },
//{ QtMultimedia::Event, 0 },
//{ QtMultimedia::Subject, 0 }
//{ QtMultimedia::MetaData::CameraManufacturer, 0 },
//{ QtMultimedia::MetaData::CameraModel, 0 },
//{ QtMultimedia::MetaData::Event, 0 },
//{ QtMultimedia::MetaData::Subject, 0 }
};
CameraBinMetaData::CameraBinMetaData(QObject *parent)
@@ -124,7 +124,7 @@ CameraBinMetaData::CameraBinMetaData(QObject *parent)
{
}
QVariant CameraBinMetaData::metaData(QtMultimedia::MetaData key) const
QVariant CameraBinMetaData::metaData(const QString &key) const
{
static const int count = sizeof(qt_gstreamerMetaDataKeys) / sizeof(QGstreamerMetaDataKeyLookup);
@@ -138,7 +138,7 @@ QVariant CameraBinMetaData::metaData(QtMultimedia::MetaData key) const
return QVariant();
}
void CameraBinMetaData::setMetaData(QtMultimedia::MetaData key, const QVariant &value)
void CameraBinMetaData::setMetaData(const QString &key, const QVariant &value)
{
static const int count = sizeof(qt_gstreamerMetaDataKeys) / sizeof(QGstreamerMetaDataKeyLookup);
@@ -156,9 +156,9 @@ void CameraBinMetaData::setMetaData(QtMultimedia::MetaData key, const QVariant &
}
}
QList<QtMultimedia::MetaData> CameraBinMetaData::availableMetaData() const
QStringList CameraBinMetaData::availableMetaData() const
{
static QMap<QByteArray, QtMultimedia::MetaData> keysMap;
static QMap<QByteArray, QString> keysMap;
if (keysMap.isEmpty()) {
const int count = sizeof(qt_gstreamerMetaDataKeys) / sizeof(QGstreamerMetaDataKeyLookup);
for (int i = 0; i < count; ++i) {
@@ -166,33 +166,12 @@ QList<QtMultimedia::MetaData> CameraBinMetaData::availableMetaData() const
}
}
QList<QtMultimedia::MetaData> res;
QStringList res;
foreach (const QByteArray &key, m_values.keys()) {
QtMultimedia::MetaData tag = keysMap.value(key, QtMultimedia::MetaData(-1));
if (tag != -1)
QString tag = keysMap.value(key);
if (!tag.isEmpty())
res.append(tag);
}
return res;
}
QVariant CameraBinMetaData::extendedMetaData(QString const &name) const
{
return m_values.value(name.toLatin1());
}
void CameraBinMetaData::setExtendedMetaData(QString const &name, QVariant const &value)
{
m_values.insert(name.toLatin1(), value);
emit QMetaDataWriterControl::metaDataChanged();
emit metaDataChanged(m_values);
}
QStringList CameraBinMetaData::availableExtendedMetaData() const
{
QStringList res;
foreach (const QByteArray &key, m_values.keys())
res.append(QString(key));
return res;
}

10
src/plugins/gstreamer/camerabin/camerabinmetadata.h
View File

@@ -57,13 +57,9 @@ public:
bool isMetaDataAvailable() const { return true; }
bool isWritable() const { return true; }
QVariant metaData(QtMultimedia::MetaData key) const;
void setMetaData(QtMultimedia::MetaData key, const QVariant &value);
QList<QtMultimedia::MetaData> availableMetaData() const;
QVariant extendedMetaData(QString const &name) const;
void setExtendedMetaData(QString const &name, QVariant const &value);
QStringList availableExtendedMetaData() const;
QVariant metaData(const QString &key) const;
void setMetaData(const QString &key, const QVariant &value);
QStringList availableMetaData() const;
Q_SIGNALS:
void metaDataChanged(const QMap<QByteArray, QVariant>&);

127
src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp
View File

@@ -46,77 +46,77 @@
struct QGstreamerMetaDataKeyLookup
{
QtMultimedia::MetaData key;
QString key;
const char *token;
};
static const QGstreamerMetaDataKeyLookup qt_gstreamerMetaDataKeys[] =
{
{ QtMultimedia::Title, GST_TAG_TITLE },
//{ QtMultimedia::SubTitle, 0 },
//{ QtMultimedia::Author, 0 },
{ QtMultimedia::Comment, GST_TAG_COMMENT },
{ QtMultimedia::Description, GST_TAG_DESCRIPTION },
//{ QtMultimedia::Category, 0 },
{ QtMultimedia::Genre, GST_TAG_GENRE },
//{ QtMultimedia::Year, 0 },
//{ QtMultimedia::UserRating, 0 },
{ QtMultimedia::MetaData::Title, GST_TAG_TITLE },
//{ QtMultimedia::MetaData::SubTitle, 0 },
//{ QtMultimedia::MetaData::Author, 0 },
{ QtMultimedia::MetaData::Comment, GST_TAG_COMMENT },
{ QtMultimedia::MetaData::Description, GST_TAG_DESCRIPTION },
//{ QtMultimedia::MetaData::Category, 0 },
{ QtMultimedia::MetaData::Genre, GST_TAG_GENRE },
//{ QtMultimedia::MetaData::Year, 0 },
//{ QtMultimedia::MetaData::UserRating, 0 },
{ QtMultimedia::Language, GST_TAG_LANGUAGE_CODE },
{ QtMultimedia::MetaData::Language, GST_TAG_LANGUAGE_CODE },
{ QtMultimedia::Publisher, GST_TAG_ORGANIZATION },
{ QtMultimedia::Copyright, GST_TAG_COPYRIGHT },
//{ QtMultimedia::ParentalRating, 0 },
//{ QtMultimedia::RatingOrganization, 0 },
{ QtMultimedia::MetaData::Publisher, GST_TAG_ORGANIZATION },
{ QtMultimedia::MetaData::Copyright, GST_TAG_COPYRIGHT },
//{ QtMultimedia::MetaData::ParentalRating, 0 },
//{ QtMultimedia::MetaData::RatingOrganisation, 0 },
// Media
//{ QtMultimedia::Size, 0 },
//{ QtMultimedia::MediaType, 0 },
{ QtMultimedia::Duration, GST_TAG_DURATION },
//{ QtMultimedia::MetaData::Size, 0 },
//{ QtMultimedia::MetaData::MediaType, 0 },
{ QtMultimedia::MetaData::Duration, GST_TAG_DURATION },
// Audio
{ QtMultimedia::AudioBitRate, GST_TAG_BITRATE },
{ QtMultimedia::AudioCodec, GST_TAG_AUDIO_CODEC },
//{ QtMultimedia::ChannelCount, 0 },
//{ QtMultimedia::SampleRate, 0 },
{ QtMultimedia::MetaData::AudioBitRate, GST_TAG_BITRATE },
{ QtMultimedia::MetaData::AudioCodec, GST_TAG_AUDIO_CODEC },
//{ QtMultimedia::MetaData::ChannelCount, 0 },
//{ QtMultimedia::MetaData::SampleRate, 0 },
// Music
{ QtMultimedia::AlbumTitle, GST_TAG_ALBUM },
{ QtMultimedia::AlbumArtist, GST_TAG_ARTIST},
{ QtMultimedia::ContributingArtist, GST_TAG_PERFORMER },
{ QtMultimedia::MetaData::AlbumTitle, GST_TAG_ALBUM },
{ QtMultimedia::MetaData::AlbumArtist, GST_TAG_ARTIST},
{ QtMultimedia::MetaData::ContributingArtist, GST_TAG_PERFORMER },
#if (GST_VERSION_MAJOR >= 0) && (GST_VERSION_MINOR >= 10) && (GST_VERSION_MICRO >= 19)
{ QtMultimedia::Composer, GST_TAG_COMPOSER },
{ QtMultimedia::MetaData::Composer, GST_TAG_COMPOSER },
#endif
//{ QtMultimedia::Conductor, 0 },
//{ QtMultimedia::Lyrics, 0 },
//{ QtMultimedia::Mood, 0 },
{ QtMultimedia::TrackNumber, GST_TAG_TRACK_NUMBER },
//{ QtMultimedia::MetaData::Conductor, 0 },
//{ QtMultimedia::MetaData::Lyrics, 0 },
//{ QtMultimedia::MetaData::Mood, 0 },
{ QtMultimedia::MetaData::TrackNumber, GST_TAG_TRACK_NUMBER },
//{ QtMultimedia::CoverArtUrlSmall, 0 },
//{ QtMultimedia::CoverArtUrlLarge, 0 },
//{ QtMultimedia::MetaData::CoverArtUrlSmall, 0 },
//{ QtMultimedia::MetaData::CoverArtUrlLarge, 0 },
// Image/Video
//{ QtMultimedia::Resolution, 0 },
//{ QtMultimedia::PixelAspectRatio, 0 },
//{ QtMultimedia::MetaData::Resolution, 0 },
//{ QtMultimedia::MetaData::PixelAspectRatio, 0 },
// Video
//{ QtMultimedia::VideoFrameRate, 0 },
//{ QtMultimedia::VideoBitRate, 0 },
{ QtMultimedia::VideoCodec, GST_TAG_VIDEO_CODEC },
//{ QtMultimedia::MetaData::VideoFrameRate, 0 },
//{ QtMultimedia::MetaData::VideoBitRate, 0 },
{ QtMultimedia::MetaData::VideoCodec, GST_TAG_VIDEO_CODEC },
//{ QtMultimedia::PosterUrl, 0 },
//{ QtMultimedia::MetaData::PosterUrl, 0 },
// Movie
//{ QtMultimedia::ChapterNumber, 0 },
//{ QtMultimedia::Director, 0 },
{ QtMultimedia::LeadPerformer, GST_TAG_PERFORMER },
//{ QtMultimedia::Writer, 0 },
//{ QtMultimedia::MetaData::ChapterNumber, 0 },
//{ QtMultimedia::MetaData::Director, 0 },
{ QtMultimedia::MetaData::LeadPerformer, GST_TAG_PERFORMER },
//{ QtMultimedia::MetaData::Writer, 0 },
// Photos
//{ QtMultimedia::CameraManufacturer, 0 },
//{ QtMultimedia::CameraModel, 0 },
//{ QtMultimedia::Event, 0 },
//{ QtMultimedia::Subject, 0 }
//{ QtMultimedia::MetaData::CameraManufacturer, 0 },
//{ QtMultimedia::MetaData::CameraModel, 0 },
//{ QtMultimedia::MetaData::Event, 0 },
//{ QtMultimedia::MetaData::Subject, 0 }
};
QGstreamerCaptureMetaDataControl::QGstreamerCaptureMetaDataControl(QObject *parent)
@@ -124,7 +124,7 @@ QGstreamerCaptureMetaDataControl::QGstreamerCaptureMetaDataControl(QObject *pare
{
}
QVariant QGstreamerCaptureMetaDataControl::metaData(QtMultimedia::MetaData key) const
QVariant QGstreamerCaptureMetaDataControl::metaData(const QString &key) const
{
static const int count = sizeof(qt_gstreamerMetaDataKeys) / sizeof(QGstreamerMetaDataKeyLookup);
@@ -138,7 +138,7 @@ QVariant QGstreamerCaptureMetaDataControl::metaData(QtMultimedia::MetaData key)
return QVariant();
}
void QGstreamerCaptureMetaDataControl::setMetaData(QtMultimedia::MetaData key, const QVariant &value)
void QGstreamerCaptureMetaDataControl::setMetaData(const QString &key, const QVariant &value)
{
static const int count = sizeof(qt_gstreamerMetaDataKeys) / sizeof(QGstreamerMetaDataKeyLookup);
@@ -156,9 +156,9 @@ void QGstreamerCaptureMetaDataControl::setMetaData(QtMultimedia::MetaData key, c
}
}
QList<QtMultimedia::MetaData> QGstreamerCaptureMetaDataControl::availableMetaData() const
QStringList QGstreamerCaptureMetaDataControl::availableMetaData() const
{
static QMap<QByteArray, QtMultimedia::MetaData> keysMap;
static QMap<QByteArray, QString> keysMap;
if (keysMap.isEmpty()) {
const int count = sizeof(qt_gstreamerMetaDataKeys) / sizeof(QGstreamerMetaDataKeyLookup);
for (int i = 0; i < count; ++i) {
@@ -166,33 +166,12 @@ QList<QtMultimedia::MetaData> QGstreamerCaptureMetaDataControl::availableMetaDat
}
}
QList<QtMultimedia::MetaData> res;
QStringList res;
foreach (const QByteArray &key, m_values.keys()) {
QtMultimedia::MetaData tag = keysMap.value(key, QtMultimedia::MetaData(-1));
if (tag != -1)
QString tag = keysMap.value(key);
if (!tag.isEmpty())
res.append(tag);
}
return res;
}
QVariant QGstreamerCaptureMetaDataControl::extendedMetaData(QString const &name) const
{
return m_values.value(name.toLatin1());
}
void QGstreamerCaptureMetaDataControl::setExtendedMetaData(QString const &name, QVariant const &value)
{
m_values.insert(name.toLatin1(), value);
emit QMetaDataWriterControl::metaDataChanged();
emit metaDataChanged(m_values);
}
QStringList QGstreamerCaptureMetaDataControl::availableExtendedMetaData() const
{
QStringList res;
foreach (const QByteArray &key, m_values.keys())
res.append(QString(key));
return res;
}

10
src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.h
View File

@@ -57,13 +57,9 @@ public:
bool isMetaDataAvailable() const { return true; }
bool isWritable() const { return true; }
QVariant metaData(QtMultimedia::MetaData key) const;
void setMetaData(QtMultimedia::MetaData key, const QVariant &value);
QList<QtMultimedia::MetaData> availableMetaData() const;
QVariant extendedMetaData(QString const &name) const;
void setExtendedMetaData(QString const &name, QVariant const &value);
QStringList availableExtendedMetaData() const;
QVariant metaData(const QString &key) const;
void setMetaData(const QString &key, const QVariant &value);
QStringList availableMetaData() const;
Q_SIGNALS:
void metaDataChanged(const QMap<QByteArray, QVariant>&);

118
src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
View File

@@ -49,77 +49,77 @@ QT_BEGIN_NAMESPACE
struct QGstreamerMetaDataKeyLookup
{
QtMultimedia::MetaData key;
QString key;
const char *token;
};
static const QGstreamerMetaDataKeyLookup qt_gstreamerMetaDataKeys[] =
{
{ QtMultimedia::Title, GST_TAG_TITLE },
//{ QtMultimedia::SubTitle, 0 },
//{ QtMultimedia::Author, 0 },
{ QtMultimedia::Comment, GST_TAG_COMMENT },
{ QtMultimedia::Description, GST_TAG_DESCRIPTION },
//{ QtMultimedia::Category, 0 },
{ QtMultimedia::Genre, GST_TAG_GENRE },
{ QtMultimedia::Year, "year" },
//{ QtMultimedia::UserRating, 0 },
{ QtMultimedia::MetaData::Title, GST_TAG_TITLE },
//{ QtMultimedia::MetaData::SubTitle, 0 },
//{ QtMultimedia::MetaData::Author, 0 },
{ QtMultimedia::MetaData::Comment, GST_TAG_COMMENT },
{ QtMultimedia::MetaData::Description, GST_TAG_DESCRIPTION },
//{ QtMultimedia::MetaData::Category, 0 },
{ QtMultimedia::MetaData::Genre, GST_TAG_GENRE },
{ QtMultimedia::MetaData::Year, "year" },
//{ QtMultimedia::MetaData::UserRating, 0 },
{ QtMultimedia::Language, GST_TAG_LANGUAGE_CODE },
{ QtMultimedia::MetaData::Language, GST_TAG_LANGUAGE_CODE },
{ QtMultimedia::Publisher, GST_TAG_ORGANIZATION },
{ QtMultimedia::Copyright, GST_TAG_COPYRIGHT },
//{ QtMultimedia::ParentalRating, 0 },
//{ QtMultimedia::RatingOrganization, 0 },
{ QtMultimedia::MetaData::Publisher, GST_TAG_ORGANIZATION },
{ QtMultimedia::MetaData::Copyright, GST_TAG_COPYRIGHT },
//{ QtMultimedia::MetaData::ParentalRating, 0 },
//{ QtMultimedia::MetaData::RatingOrganisation, 0 },
// Media
//{ QtMultimedia::Size, 0 },
//{ QtMultimedia::MediaType, 0 },
{ QtMultimedia::Duration, GST_TAG_DURATION },
//{ QtMultimedia::MetaData::Size, 0 },
//{ QtMultimedia::MetaData::MediaType, 0 },
{ QtMultimedia::MetaData::Duration, GST_TAG_DURATION },
// Audio
{ QtMultimedia::AudioBitRate, GST_TAG_BITRATE },
{ QtMultimedia::AudioCodec, GST_TAG_AUDIO_CODEC },
//{ QtMultimedia::ChannelCount, 0 },
//{ QtMultimedia::SampleRate, 0 },
{ QtMultimedia::MetaData::AudioBitRate, GST_TAG_BITRATE },
{ QtMultimedia::MetaData::AudioCodec, GST_TAG_AUDIO_CODEC },
//{ QtMultimedia::MetaData::ChannelCount, 0 },
//{ QtMultimedia::MetaData::SampleRate, 0 },
// Music
{ QtMultimedia::AlbumTitle, GST_TAG_ALBUM },
{ QtMultimedia::AlbumArtist, GST_TAG_ARTIST},
{ QtMultimedia::ContributingArtist, GST_TAG_PERFORMER },
{ QtMultimedia::MetaData::AlbumTitle, GST_TAG_ALBUM },
{ QtMultimedia::MetaData::AlbumArtist, GST_TAG_ARTIST},
{ QtMultimedia::MetaData::ContributingArtist, GST_TAG_PERFORMER },
#if (GST_VERSION_MAJOR >= 0) && (GST_VERSION_MINOR >= 10) && (GST_VERSION_MICRO >= 19)
{ QtMultimedia::Composer, GST_TAG_COMPOSER },
{ QtMultimedia::MetaData::Composer, GST_TAG_COMPOSER },
#endif
//{ QtMultimedia::Conductor, 0 },
//{ QtMultimedia::Lyrics, 0 },
//{ QtMultimedia::Mood, 0 },
{ QtMultimedia::TrackNumber, GST_TAG_TRACK_NUMBER },
//{ QtMultimedia::MetaData::Conductor, 0 },
//{ QtMultimedia::MetaData::Lyrics, 0 },
//{ QtMultimedia::MetaData::Mood, 0 },
{ QtMultimedia::MetaData::TrackNumber, GST_TAG_TRACK_NUMBER },
//{ QtMultimedia::CoverArtUrlSmall, 0 },
//{ QtMultimedia::CoverArtUrlLarge, 0 },
//{ QtMultimedia::MetaData::CoverArtUrlSmall, 0 },
//{ QtMultimedia::MetaData::CoverArtUrlLarge, 0 },
// Image/Video
{ QtMultimedia::Resolution, "resolution" },
{ QtMultimedia::PixelAspectRatio, "pixel-aspect-ratio" },
{ QtMultimedia::MetaData::Resolution, "resolution" },
{ QtMultimedia::MetaData::PixelAspectRatio, "pixel-aspect-ratio" },
// Video
//{ QtMultimedia::VideoFrameRate, 0 },
//{ QtMultimedia::VideoBitRate, 0 },
{ QtMultimedia::VideoCodec, GST_TAG_VIDEO_CODEC },
//{ QtMultimedia::MetaData::VideoFrameRate, 0 },
//{ QtMultimedia::MetaData::VideoBitRate, 0 },
{ QtMultimedia::MetaData::VideoCodec, GST_TAG_VIDEO_CODEC },
//{ QtMultimedia::PosterUrl, 0 },
//{ QtMultimedia::MetaData::PosterUrl, 0 },
// Movie
//{ QtMultimedia::ChapterNumber, 0 },
//{ QtMultimedia::Director, 0 },
{ QtMultimedia::LeadPerformer, GST_TAG_PERFORMER },
//{ QtMultimedia::Writer, 0 },
//{ QtMultimedia::MetaData::ChapterNumber, 0 },
//{ QtMultimedia::MetaData::Director, 0 },
{ QtMultimedia::MetaData::LeadPerformer, GST_TAG_PERFORMER },
//{ QtMultimedia::MetaData::Writer, 0 },
// Photos
//{ QtMultimedia::CameraManufacturer, 0 },
//{ QtMultimedia::CameraModel, 0 },
//{ QtMultimedia::Event, 0 },
//{ QtMultimedia::Subject, 0 }
//{ QtMultimedia::MetaData::CameraManufacturer, 0 },
//{ QtMultimedia::MetaData::CameraModel, 0 },
//{ QtMultimedia::MetaData::Event, 0 },
//{ QtMultimedia::MetaData::Subject, 0 }
};
QGstreamerMetaDataProvider::QGstreamerMetaDataProvider(QGstreamerPlayerSession *session, QObject *parent)
@@ -142,7 +142,7 @@ bool QGstreamerMetaDataProvider::isWritable() const
return false;
}
QVariant QGstreamerMetaDataProvider::metaData(QtMultimedia::MetaData key) const
QVariant QGstreamerMetaDataProvider::metaData(const QString &key) const
{
static const int count = sizeof(qt_gstreamerMetaDataKeys) / sizeof(QGstreamerMetaDataKeyLookup);
@@ -154,9 +154,9 @@ QVariant QGstreamerMetaDataProvider::metaData(QtMultimedia::MetaData key) const
return QVariant();
}
QList<QtMultimedia::MetaData> QGstreamerMetaDataProvider::availableMetaData() const
QStringList QGstreamerMetaDataProvider::availableMetaData() const
{
static QMap<QByteArray, QtMultimedia::MetaData> keysMap;
static QMap<QByteArray, QString> keysMap;
if (keysMap.isEmpty()) {
const int count = sizeof(qt_gstreamerMetaDataKeys) / sizeof(QGstreamerMetaDataKeyLookup);
for (int i = 0; i < count; ++i) {
@@ -164,30 +164,16 @@ QList<QtMultimedia::MetaData> QGstreamerMetaDataProvider::availableMetaData() co
}
}
QList<QtMultimedia::MetaData> res;
QStringList res;
foreach (const QByteArray &key, m_session->tags().keys()) {
QtMultimedia::MetaData tag = keysMap.value(key, QtMultimedia::MetaData(-1));
if (tag != -1)
QString tag = keysMap.value(key);
if (!tag.isEmpty())
res.append(tag);
}
return res;
}
QVariant QGstreamerMetaDataProvider::extendedMetaData(const QString &key) const
{
return m_session->tags().value(key.toLatin1());
}
QStringList QGstreamerMetaDataProvider::availableExtendedMetaData() const
{
QStringList res;
foreach (const QByteArray &key, m_session->tags().keys())
res.append(QString(key));
return res;
}
void QGstreamerMetaDataProvider::updateTags()
{
emit metaDataChanged();

7
src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.h
View File

@@ -58,11 +58,8 @@ public:
bool isMetaDataAvailable() const;
bool isWritable() const;
QVariant metaData(QtMultimedia::MetaData key) const;
QList<QtMultimedia::MetaData> availableMetaData() const;
QVariant extendedMetaData(const QString &key) const ;
QStringList availableExtendedMetaData() const;
QVariant metaData(const QString &key) const;
QStringList availableMetaData() const;
private slots:
void updateTags();

8
src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp
View File

@@ -1221,7 +1221,7 @@ void QGstreamerPlayerSession::getStreamsInfo()
for (int i=0; i<m_streamTypes.count(); i++) {
QMediaStreamsControl::StreamType streamType = m_streamTypes[i];
QMap<QtMultimedia::MetaData, QVariant> streamProperties;
QMap<QString, QVariant> streamProperties;
int streamIndex = i - m_playbin2StreamOffset[streamType];
@@ -1243,7 +1243,7 @@ void QGstreamerPlayerSession::getStreamsInfo()
if (tags && gst_is_tag_list(tags)) {
gchar *languageCode = 0;
if (gst_tag_list_get_string(tags, GST_TAG_LANGUAGE_CODE, &languageCode))
streamProperties[QtMultimedia::Language] = QString::fromUtf8(languageCode);
streamProperties[QtMultimedia::MetaData::Language] = QString::fromUtf8(languageCode);
//qDebug() << "language for setream" << i << QString::fromUtf8(languageCode);
g_free (languageCode);
@@ -1303,8 +1303,8 @@ void QGstreamerPlayerSession::getStreamsInfo()
break;
}
QMap<QtMultimedia::MetaData, QVariant> streamProperties;
streamProperties[QtMultimedia::Language] = QString::fromUtf8(languageCode);
QMap<QString, QVariant> streamProperties;
streamProperties[QtMultimedia::MetaData::Language] = QString::fromUtf8(languageCode);
m_streamProperties.append(streamProperties);
m_streamTypes.append(streamType);

4
src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.h
View File

@@ -103,7 +103,7 @@ public:
QMediaTimeRange availablePlaybackRanges() const;
QMap<QByteArray ,QVariant> tags() const { return m_tags; }
QMap<QtMultimedia::MetaData,QVariant> streamProperties(int streamNumber) const { return m_streamProperties[streamNumber]; }
QMap<QString,QVariant> streamProperties(int streamNumber) const { return m_streamProperties[streamNumber]; }
int streamCount() const { return m_streamProperties.count(); }
QMediaStreamsControl::StreamType streamType(int streamNumber) { return m_streamTypes.value(streamNumber, QMediaStreamsControl::UnknownStream); }
@@ -195,7 +195,7 @@ private:
#endif
QMap<QByteArray, QVariant> m_tags;
QList< QMap<QtMultimedia::MetaData,QVariant> > m_streamProperties;
QList< QMap<QString,QVariant> > m_streamProperties;
QList<QMediaStreamsControl::StreamType> m_streamTypes;
QMap<QMediaStreamsControl::StreamType, int> m_playbin2StreamOffset;

2
src/plugins/gstreamer/mediaplayer/qgstreamerstreamscontrol.cpp
View File

@@ -62,7 +62,7 @@ QMediaStreamsControl::StreamType QGstreamerStreamsControl::streamType(int stream
return m_session->streamType(streamNumber);
}
QVariant QGstreamerStreamsControl::metaData(int streamNumber, QtMultimedia::MetaData key)
QVariant QGstreamerStreamsControl::metaData(int streamNumber, const QString &key)
{
return m_session->streamProperties(streamNumber).value(key);
}

2
src/plugins/gstreamer/mediaplayer/qgstreamerstreamscontrol.h
View File

@@ -58,7 +58,7 @@ public:
virtual int streamCount();
virtual StreamType streamType(int streamNumber);
virtual QVariant metaData(int streamNumber, QtMultimedia::MetaData key);
virtual QVariant metaData(int streamNumber, const QString &key);
virtual bool isActive(int streamNumber);
virtual void setActive(int streamNumber, bool state);