diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-02-27 11:12:46 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-02-27 18:28:08 +0100 |
commit | 4d4a34c5d29ef7b730eb9da87b39f91352ef66fa (patch) | |
tree | 8df0894830a43956bbf1c629dc3938f3f41ca10a /recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch | |
parent | fa521467249da68e89c762a178550c8109bccae3 (diff) | |
download | meta-qt5-4d4a34c5d29ef7b730eb9da87b39f91352ef66fa.tar.gz |
recipes: Refresh patches to match git recipes
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch')
-rw-r--r-- | recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch b/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch index 8c6c4fa8..f66e864f 100644 --- a/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch +++ b/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 4af76880d63e8d392eb8add8b8999e3f5031675a Mon Sep 17 00:00:00 2001 | 1 | From 6a570205a17663e6adce9e5613eb7694fe2874dc Mon Sep 17 00:00:00 2001 |
2 | From: Yoann Lopes <yoann.lopes@digia.com> | 2 | From: Yoann Lopes <yoann.lopes@digia.com> |
3 | Date: Thu, 31 Oct 2013 15:06:30 +0100 | 3 | Date: Thu, 31 Oct 2013 15:06:30 +0100 |
4 | Subject: [PATCH 1/2] Initial porting effort to GStreamer 1.0. | 4 | Subject: [PATCH] Initial porting effort to GStreamer 1.0. |
5 | 5 | ||
6 | Imported from git@github.com:jhodapp/qtmultimedia.git | 6 | Imported from git@github.com:jhodapp/qtmultimedia.git |
7 | 7 | ||
@@ -38,7 +38,7 @@ Conflicts: | |||
38 | src/gsttools/qgstreamervideowindow.cpp | 79 +++++++- | 38 | src/gsttools/qgstreamervideowindow.cpp | 79 +++++++- |
39 | src/gsttools/qgstutils.cpp | 27 ++- | 39 | src/gsttools/qgstutils.cpp | 27 ++- |
40 | src/gsttools/qgstvideobuffer.cpp | 18 +- | 40 | src/gsttools/qgstvideobuffer.cpp | 18 +- |
41 | src/gsttools/qvideosurfacegstsink.cpp | 138 +++++++++++++- | 41 | src/gsttools/qvideosurfacegstsink.cpp | 136 +++++++++++++- |
42 | src/multimedia/gsttools_headers/qgstappsrc_p.h | 3 + | 42 | src/multimedia/gsttools_headers/qgstappsrc_p.h | 3 + |
43 | .../qgstreameraudioprobecontrol_p.h | 5 +- | 43 | .../qgstreameraudioprobecontrol_p.h | 5 +- |
44 | .../qgstreamervideoprobecontrol_p.h | 4 + | 44 | .../qgstreamervideoprobecontrol_p.h | 4 + |
@@ -58,7 +58,7 @@ Conflicts: | |||
58 | .../mediaplayer/qgstreamerplayerserviceplugin.cpp | 27 ++- | 58 | .../mediaplayer/qgstreamerplayerserviceplugin.cpp | 27 ++- |
59 | .../mediaplayer/qgstreamerplayersession.cpp | 154 ++++++++++++++-- | 59 | .../mediaplayer/qgstreamerplayersession.cpp | 154 ++++++++++++++-- |
60 | .../mediaplayer/qgstreamerplayersession.h | 9 + | 60 | .../mediaplayer/qgstreamerplayersession.h | 9 + |
61 | 36 files changed, 872 insertions(+), 130 deletions(-) | 61 | 36 files changed, 871 insertions(+), 129 deletions(-) |
62 | 62 | ||
63 | diff --git a/config.tests/gstreamer/gstreamer.pro b/config.tests/gstreamer/gstreamer.pro | 63 | diff --git a/config.tests/gstreamer/gstreamer.pro b/config.tests/gstreamer/gstreamer.pro |
64 | index 02a7e34..6b9843a 100644 | 64 | index 02a7e34..6b9843a 100644 |
@@ -1032,7 +1032,7 @@ index a373dcc..587b010 100644 | |||
1032 | 1032 | ||
1033 | if (caps) { | 1033 | if (caps) { |
1034 | diff --git a/src/gsttools/qgstutils.cpp b/src/gsttools/qgstutils.cpp | 1034 | diff --git a/src/gsttools/qgstutils.cpp b/src/gsttools/qgstutils.cpp |
1035 | index 556fc03..5ea2c59 100644 | 1035 | index 1281d3f..fe3fba0 100644 |
1036 | --- a/src/gsttools/qgstutils.cpp | 1036 | --- a/src/gsttools/qgstutils.cpp |
1037 | +++ b/src/gsttools/qgstutils.cpp | 1037 | +++ b/src/gsttools/qgstutils.cpp |
1038 | @@ -89,8 +89,13 @@ static void addTagToMap(const GstTagList *list, | 1038 | @@ -89,8 +89,13 @@ static void addTagToMap(const GstTagList *list, |
@@ -1083,7 +1083,7 @@ index 556fc03..5ea2c59 100644 | |||
1083 | 1083 | ||
1084 | /*! | 1084 | /*! |
1085 | Builds GstCaps for an audio format. | 1085 | Builds GstCaps for an audio format. |
1086 | @@ -579,7 +602,7 @@ QByteArray QGstUtils::cameraDriver(const QString &device, GstElementFactory *fac | 1086 | @@ -581,7 +604,7 @@ QByteArray QGstUtils::cameraDriver(const QString &device, GstElementFactory *fac |
1087 | 1087 | ||
1088 | void qt_gst_object_ref_sink(gpointer object) | 1088 | void qt_gst_object_ref_sink(gpointer object) |
1089 | { | 1089 | { |
@@ -1134,7 +1134,7 @@ index 18702ec..93f22f5 100644 | |||
1134 | } | 1134 | } |
1135 | 1135 | ||
1136 | diff --git a/src/gsttools/qvideosurfacegstsink.cpp b/src/gsttools/qvideosurfacegstsink.cpp | 1136 | diff --git a/src/gsttools/qvideosurfacegstsink.cpp b/src/gsttools/qvideosurfacegstsink.cpp |
1137 | index f3e2d88..a964e82 100644 | 1137 | index f3e2d88..94aaee7 100644 |
1138 | --- a/src/gsttools/qvideosurfacegstsink.cpp | 1138 | --- a/src/gsttools/qvideosurfacegstsink.cpp |
1139 | +++ b/src/gsttools/qvideosurfacegstsink.cpp | 1139 | +++ b/src/gsttools/qvideosurfacegstsink.cpp |
1140 | @@ -43,7 +43,11 @@ | 1140 | @@ -43,7 +43,11 @@ |
@@ -1317,11 +1317,10 @@ index f3e2d88..a964e82 100644 | |||
1317 | "framerate", GST_TYPE_FRACTION_RANGE, 0, 1, INT_MAX, 1, | 1317 | "framerate", GST_TYPE_FRACTION_RANGE, 0, 1, INT_MAX, 1, |
1318 | "width" , GST_TYPE_INT_RANGE, 1, INT_MAX, | 1318 | "width" , GST_TYPE_INT_RANGE, 1, INT_MAX, |
1319 | "height" , GST_TYPE_INT_RANGE, 1, INT_MAX, | 1319 | "height" , GST_TYPE_INT_RANGE, 1, INT_MAX, |
1320 | - "format" , GST_TYPE_FOURCC, qt_yuvColorLookup[index].fourcc, | ||
1321 | +#if GST_CHECK_VERSION(1,0,0) | 1320 | +#if GST_CHECK_VERSION(1,0,0) |
1322 | + "format" , G_TYPE_STRING, gst_video_format_to_string(qt_yuvColorLookup[index].vfmt), | 1321 | + "format" , G_TYPE_STRING, gst_video_format_to_string(qt_yuvColorLookup[index].vfmt), |
1323 | +#else | 1322 | +#else |
1324 | + "format" , GST_TYPE_FOURCC, qt_yuvColorLookup[index].fourcc, | 1323 | "format" , GST_TYPE_FOURCC, qt_yuvColorLookup[index].fourcc, |
1325 | +#endif | 1324 | +#endif |
1326 | NULL)); | 1325 | NULL)); |
1327 | continue; | 1326 | continue; |
@@ -1689,10 +1688,10 @@ index f944a60..72d1cf1 100644 | |||
1689 | if (m_duration != duration) { | 1688 | if (m_duration != duration) { |
1690 | m_duration = duration; | 1689 | m_duration = duration; |
1691 | diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.cpp b/src/plugins/gstreamer/camerabin/camerabinsession.cpp | 1690 | diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.cpp b/src/plugins/gstreamer/camerabin/camerabinsession.cpp |
1692 | index a4038c5..9d1fdfa 100644 | 1691 | index 1ed663b..e0c6b50 100644 |
1693 | --- a/src/plugins/gstreamer/camerabin/camerabinsession.cpp | 1692 | --- a/src/plugins/gstreamer/camerabin/camerabinsession.cpp |
1694 | +++ b/src/plugins/gstreamer/camerabin/camerabinsession.cpp | 1693 | +++ b/src/plugins/gstreamer/camerabin/camerabinsession.cpp |
1695 | @@ -760,7 +760,11 @@ qint64 CameraBinSession::duration() const | 1694 | @@ -796,7 +796,11 @@ qint64 CameraBinSession::duration() const |
1696 | if (fileSink) { | 1695 | if (fileSink) { |
1697 | GstFormat format = GST_FORMAT_TIME; | 1696 | GstFormat format = GST_FORMAT_TIME; |
1698 | gint64 duration = 0; | 1697 | gint64 duration = 0; |
@@ -1704,7 +1703,7 @@ index a4038c5..9d1fdfa 100644 | |||
1704 | gst_object_unref(GST_OBJECT(fileSink)); | 1703 | gst_object_unref(GST_OBJECT(fileSink)); |
1705 | if (ret) | 1704 | if (ret) |
1706 | return duration / 1000000; | 1705 | return duration / 1000000; |
1707 | @@ -797,8 +801,13 @@ void CameraBinSession::setMetaData(const QMap<QByteArray, QVariant> &data) | 1706 | @@ -833,8 +837,13 @@ void CameraBinSession::setMetaData(const QMap<QByteArray, QVariant> &data) |
1708 | 1707 | ||
1709 | if (m_camerabin) { | 1708 | if (m_camerabin) { |
1710 | GstIterator *elements = gst_bin_iterate_all_by_interface(GST_BIN(m_camerabin), GST_TYPE_TAG_SETTER); | 1709 | GstIterator *elements = gst_bin_iterate_all_by_interface(GST_BIN(m_camerabin), GST_TYPE_TAG_SETTER); |
@@ -1718,7 +1717,7 @@ index a4038c5..9d1fdfa 100644 | |||
1718 | gst_tag_setter_reset_tags(GST_TAG_SETTER(element)); | 1717 | gst_tag_setter_reset_tags(GST_TAG_SETTER(element)); |
1719 | 1718 | ||
1720 | QMapIterator<QByteArray, QVariant> it(data); | 1719 | QMapIterator<QByteArray, QVariant> it(data); |
1721 | @@ -859,7 +868,11 @@ bool CameraBinSession::processSyncMessage(const QGstreamerMessage &message) | 1720 | @@ -895,7 +904,11 @@ bool CameraBinSession::processSyncMessage(const QGstreamerMessage &message) |
1722 | 1721 | ||
1723 | if (gm && GST_MESSAGE_TYPE(gm) == GST_MESSAGE_ELEMENT) { | 1722 | if (gm && GST_MESSAGE_TYPE(gm) == GST_MESSAGE_ELEMENT) { |
1724 | if (m_captureMode == QCamera::CaptureStillImage && | 1723 | if (m_captureMode == QCamera::CaptureStillImage && |
@@ -1730,7 +1729,7 @@ index a4038c5..9d1fdfa 100644 | |||
1730 | st = gst_message_get_structure(gm); | 1729 | st = gst_message_get_structure(gm); |
1731 | 1730 | ||
1732 | if (gst_structure_has_field_typed(st, "buffer", GST_TYPE_BUFFER)) { | 1731 | if (gst_structure_has_field_typed(st, "buffer", GST_TYPE_BUFFER)) { |
1733 | @@ -869,7 +882,11 @@ bool CameraBinSession::processSyncMessage(const QGstreamerMessage &message) | 1732 | @@ -905,7 +918,11 @@ bool CameraBinSession::processSyncMessage(const QGstreamerMessage &message) |
1734 | 1733 | ||
1735 | QImage img; | 1734 | QImage img; |
1736 | 1735 | ||
@@ -1742,7 +1741,7 @@ index a4038c5..9d1fdfa 100644 | |||
1742 | if (caps) { | 1741 | if (caps) { |
1743 | GstStructure *structure = gst_caps_get_structure(caps, 0); | 1742 | GstStructure *structure = gst_caps_get_structure(caps, 0); |
1744 | gint width = 0; | 1743 | gint width = 0; |
1745 | @@ -1142,7 +1159,11 @@ QList< QPair<int,int> > CameraBinSession::supportedFrameRates(const QSize &frame | 1744 | @@ -1178,7 +1195,11 @@ QList< QPair<int,int> > CameraBinSession::supportedFrameRates(const QSize &frame |
1746 | gst_structure_remove_all_fields(structure); | 1745 | gst_structure_remove_all_fields(structure); |
1747 | gst_structure_set_value(structure, "framerate", &rate); | 1746 | gst_structure_set_value(structure, "framerate", &rate); |
1748 | } | 1747 | } |
@@ -1754,7 +1753,7 @@ index a4038c5..9d1fdfa 100644 | |||
1754 | 1753 | ||
1755 | 1754 | ||
1756 | for (uint i=0; i<gst_caps_get_size(caps); i++) { | 1755 | for (uint i=0; i<gst_caps_get_size(caps); i++) { |
1757 | @@ -1262,7 +1283,11 @@ QList<QSize> CameraBinSession::supportedResolutions(QPair<int,int> rate, | 1756 | @@ -1298,7 +1319,11 @@ QList<QSize> CameraBinSession::supportedResolutions(QPair<int,int> rate, |
1758 | gst_structure_set_value(structure, "width", &w); | 1757 | gst_structure_set_value(structure, "width", &w); |
1759 | gst_structure_set_value(structure, "height", &h); | 1758 | gst_structure_set_value(structure, "height", &h); |
1760 | } | 1759 | } |
@@ -2365,5 +2364,5 @@ index f2e760a..50bda3d 100644 | |||
2365 | 2364 | ||
2366 | QT_END_NAMESPACE | 2365 | QT_END_NAMESPACE |
2367 | -- | 2366 | -- |
2368 | 2.1.3 | 2367 | 2.3.1 |
2369 | 2368 | ||