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

GStreamer: fix compilation with version < 0.10.31.

Browse Source 
Qt 5.4 and earlier required GStreamer 0.10.24 as minimum version.
Qt 5.5 added code that requires 0.10.31, this code is now ifdef'd
and we now support again 0.10.24.

Task-number: QTBUG-48353
Change-Id: Ie708a33c0515874b003ce26a3400475075d316ca
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
This commit is contained in:
Yoann Lopes
2015-10-16 14:15:23 +02:00
parent 0cf41ef53f
commit 3d3d2a4967
12 changed files with 147 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/multimedia/gsttools_headers/qgstutils_p.h
View File

@@ -150,6 +150,8 @@ gboolean qt_gst_element_query_position(GstElement *element, GstFormat format, gi
gboolean qt_gst_element_query_duration(GstElement *element, GstFormat format, gint64 *cur);
GstCaps *qt_gst_caps_normalize(GstCaps *caps);
const gchar *qt_gst_element_get_factory_name(GstElement *element);
gboolean qt_gst_caps_can_intersect(const GstCaps * caps1, const GstCaps * caps2);
GList *qt_gst_video_sinks();
QDebug operator <<(QDebug debug, GstCaps *caps);

5
src/multimedia/gsttools_headers/qvideosurfacegstsink_p.h
View File

@@ -157,7 +157,12 @@ private:
static gboolean unlock(GstBaseSink *sink);
#if GST_CHECK_VERSION(0, 10, 25)
static GstFlowReturn show_frame(GstVideoSink *sink, GstBuffer *buffer);
#else
static GstFlowReturn preroll(GstBaseSink *sink, GstBuffer *buffer);
static GstFlowReturn render(GstBaseSink *sink, GstBuffer *buffer);
#endif
private:
QVideoSurfaceGstDelegate *delegate;