diff options
author | Martin Kelly <mkelly@xevo.com> | 2017-04-25 13:13:57 -0700 |
---|---|---|
committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2017-05-16 05:07:51 +0000 |
commit | d2eb5b67218f440806f32afa75a751b8c8d218c9 (patch) | |
tree | 05a2b2cc7cae12ea9b8b8ad3026a5b92a7b4eba8 /recipes-qt/qt5/qtmultimedia/0001-GStreamer-support-cover-art.patch | |
parent | 0eea4306164f6a6d4567a9857c58fdc59c29a383 (diff) |
qt: enable upgrade to 5.8
Drop patches and bbappends that no longer apply. I audited these to
verify that they already exist upstream, and I believe we are OK.
Change-Id: I83f8334539d5542c7632b45e230d53915fdf18bf
Depends-On: I024b757d16e5891382f4286dadee3315163a79d5
Signed-off-by: Martin Kelly <mkelly@xevo.com>
Diffstat (limited to 'recipes-qt/qt5/qtmultimedia/0001-GStreamer-support-cover-art.patch')
-rw-r--r-- | recipes-qt/qt5/qtmultimedia/0001-GStreamer-support-cover-art.patch | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/recipes-qt/qt5/qtmultimedia/0001-GStreamer-support-cover-art.patch b/recipes-qt/qt5/qtmultimedia/0001-GStreamer-support-cover-art.patch deleted file mode 100644 index 8e6449052..000000000 --- a/recipes-qt/qt5/qtmultimedia/0001-GStreamer-support-cover-art.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 9bdc7c84eea0ff66c937d5f62ffed249321c3c35 Mon Sep 17 00:00:00 2001 -From: Tasuku Suzuki <tasuku.suzuki@qt.io> -Date: Sun, 24 Jul 2016 00:23:36 +0900 -Subject: [PATCH] GStreamer: support cover art - -Change-Id: I05987f578a40c23dc2eb6f3e6a7f76d11f704214 -Reviewed-by: Yoann Lopes <yoann.lopes@qt.io> ---- - src/gsttools/qgstutils.cpp | 16 ++++++++++++++++ - .../gstreamer/mediaplayer/qgstreamermetadataprovider.cpp | 1 + - 2 files changed, 17 insertions(+) - -diff --git a/src/gsttools/qgstutils.cpp b/src/gsttools/qgstutils.cpp -index 831ba96..a2b3507 100644 ---- a/src/gsttools/qgstutils.cpp -+++ b/src/gsttools/qgstutils.cpp -@@ -141,6 +141,22 @@ static void addTagToMap(const GstTagList *list, - } - if (!map->contains("year") && year > 0) - map->insert("year", year); -+ } else if (G_VALUE_TYPE(&val) == GST_TYPE_SAMPLE) { -+ GstSample *sample = (GstSample *)g_value_get_boxed(&val); -+ GstCaps* caps = gst_sample_get_caps(sample); -+ if (caps && !gst_caps_is_empty(caps)) { -+ GstStructure *structure = gst_caps_get_structure(caps, 0); -+ const gchar *name = gst_structure_get_name(structure); -+ if (QByteArray(name).startsWith("image/")) { -+ GstBuffer *buffer = gst_sample_get_buffer(sample); -+ if (buffer) { -+ GstMapInfo info; -+ gst_buffer_map(buffer, &info, GST_MAP_READ); -+ map->insert(QByteArray(tag), QImage::fromData(info.data, info.size, name)); -+ gst_buffer_unmap(buffer, &info); -+ } -+ } -+ } - #endif - } else if (G_VALUE_TYPE(&val) == GST_TYPE_FRACTION) { - int nom = gst_value_get_fraction_numerator(&val); -diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp -index 074f8ad..01103d6 100644 ---- a/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp -+++ b/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp -@@ -93,6 +93,7 @@ static const QGstreamerMetaDataKeyLookup *qt_gstreamerMetaDataKeys() - - //metadataKeys->insert(0, QMediaMetaData::CoverArtUrlSmall); - //metadataKeys->insert(0, QMediaMetaData::CoverArtUrlLarge); -+ metadataKeys->insert(GST_TAG_PREVIEW_IMAGE, QMediaMetaData::CoverArtImage); - - // Image/Video - metadataKeys->insert("resolution", QMediaMetaData::Resolution); --- -2.7.4 - |