Diff
Modified: trunk/ChangeLog (205179 => 205180)
--- trunk/ChangeLog 2016-08-30 11:11:38 UTC (rev 205179)
+++ trunk/ChangeLog 2016-08-30 14:19:10 UTC (rev 205180)
@@ -1,3 +1,13 @@
+2016-08-30 Philippe Normand <[email protected]>
+
+ [GStreamer] bump required version to 1.2.3
+ https://bugs.webkit.org/show_bug.cgi?id=159667
+
+ Reviewed by Xabier Rodriguez Calvar.
+
+ * Source/cmake/OptionsEfl.cmake:
+ * Source/cmake/OptionsGTK.cmake:
+
2016-08-29 Per Arne Vollan <[email protected]>
Attempt to fix WinCairo build after r205090.
Modified: trunk/Source/WebCore/ChangeLog (205179 => 205180)
--- trunk/Source/WebCore/ChangeLog 2016-08-30 11:11:38 UTC (rev 205179)
+++ trunk/Source/WebCore/ChangeLog 2016-08-30 14:19:10 UTC (rev 205180)
@@ -1,3 +1,25 @@
+2016-08-30 Philippe Normand <[email protected]>
+
+ [GStreamer] bump required version to 1.2.3
+ https://bugs.webkit.org/show_bug.cgi?id=159667
+
+ Reviewed by Xabier Rodriguez Calvar.
+
+ GStreamer 1.0.3 was released almost 4 years ago. GStreamer 1.2.3
+ being the version shipped in the Ubuntu LTS (14.04) it
+ feels reasonable to bump our requirement. Other major
+ distributions like Debian Jessie and Fedora ship GStreamer 1.4.x
+ already.
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+ (WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin):
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+ (WebCore::MediaPlayerPrivateGStreamerBase::updateTexture): Deleted.
+ * platform/graphics/gstreamer/VideoSinkGStreamer.cpp:
+ (webkitVideoSinkProposeAllocation): Deleted.
+ * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+ (webKitWebSrcQueryWithParent): Deleted.
+
2016-08-29 Alex Christensen <[email protected]>
Fix Windows build after r205161
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (205179 => 205180)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2016-08-30 11:11:38 UTC (rev 205179)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2016-08-30 14:19:10 UTC (rev 205180)
@@ -1943,24 +1943,22 @@
g_signal_connect_swapped(m_pipeline.get(), "video-changed", G_CALLBACK(videoChangedCallback), this);
g_signal_connect_swapped(m_pipeline.get(), "audio-changed", G_CALLBACK(audioChangedCallback), this);
#if ENABLE(VIDEO_TRACK)
- if (webkitGstCheckVersion(1, 1, 2)) {
- g_signal_connect_swapped(m_pipeline.get(), "text-changed", G_CALLBACK(textChangedCallback), this);
+ g_signal_connect_swapped(m_pipeline.get(), "text-changed", G_CALLBACK(textChangedCallback), this);
- GstElement* textCombiner = webkitTextCombinerNew();
- ASSERT(textCombiner);
- g_object_set(m_pipeline.get(), "text-stream-combiner", textCombiner, nullptr);
+ GstElement* textCombiner = webkitTextCombinerNew();
+ ASSERT(textCombiner);
+ g_object_set(m_pipeline.get(), "text-stream-combiner", textCombiner, nullptr);
- m_textAppSink = webkitTextSinkNew();
- ASSERT(m_textAppSink);
+ m_textAppSink = webkitTextSinkNew();
+ ASSERT(m_textAppSink);
- m_textAppSinkPad = adoptGRef(gst_element_get_static_pad(m_textAppSink.get(), "sink"));
- ASSERT(m_textAppSinkPad);
+ m_textAppSinkPad = adoptGRef(gst_element_get_static_pad(m_textAppSink.get(), "sink"));
+ ASSERT(m_textAppSinkPad);
- g_object_set(m_textAppSink.get(), "emit-signals", true, "enable-last-sample", false, "caps", gst_caps_new_empty_simple("text/vtt"), NULL);
- g_signal_connect_swapped(m_textAppSink.get(), "new-sample", G_CALLBACK(newTextSampleCallback), this);
+ g_object_set(m_textAppSink.get(), "emit-signals", true, "enable-last-sample", false, "caps", gst_caps_new_empty_simple("text/vtt"), nullptr);
+ g_signal_connect_swapped(m_textAppSink.get(), "new-sample", G_CALLBACK(newTextSampleCallback), this);
- g_object_set(m_pipeline.get(), "text-sink", m_textAppSink.get(), NULL);
- }
+ g_object_set(m_pipeline.get(), "text-sink", m_textAppSink.get(), nullptr);
#endif
g_object_set(m_pipeline.get(), "video-sink", createVideoSink(), "audio-sink", createAudioSink(), nullptr);
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (205179 => 205180)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2016-08-30 11:11:38 UTC (rev 205179)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2016-08-30 14:19:10 UTC (rev 205180)
@@ -72,7 +72,7 @@
#endif // PLATFORM(X11) && GST_GL_HAVE_PLATFORM_EGL
#endif // USE(GSTREAMER_GL)
-#if GST_CHECK_VERSION(1, 1, 0) && USE(TEXTURE_MAPPER_GL)
+#if USE(TEXTURE_MAPPER_GL)
#include "BitmapTextureGL.h"
#include "BitmapTexturePool.h"
#include "TextureMapperGL.h"
@@ -431,7 +431,6 @@
{
GstBuffer* buffer = gst_sample_get_buffer(m_sample.get());
-#if GST_CHECK_VERSION(1, 1, 0)
GstVideoGLTextureUploadMeta* meta;
if ((meta = gst_buffer_get_video_gl_texture_upload_meta(buffer))) {
if (meta->n_textures == 1) { // BRGx & BGRA formats use only one texture.
@@ -441,7 +440,6 @@
return;
}
}
-#endif
// Right now the TextureMapper only supports chromas with one plane
ASSERT(GST_VIDEO_INFO_N_PLANES(&videoInfo) == 1);
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp (205179 => 205180)
--- trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp 2016-08-30 11:11:38 UTC (rev 205179)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp 2016-08-30 14:19:10 UTC (rev 205180)
@@ -46,13 +46,8 @@
#else
#define GST_CAPS_FORMAT "{ xRGB, ARGB }"
#endif
-#if GST_CHECK_VERSION(1, 1, 0)
-#define GST_FEATURED_CAPS GST_VIDEO_CAPS_MAKE_WITH_FEATURES(GST_CAPS_FEATURE_META_GST_VIDEO_GL_TEXTURE_UPLOAD_META, GST_CAPS_FORMAT) ";"
-#else
-#define GST_FEATURED_CAPS
-#endif
-#define WEBKIT_VIDEO_SINK_PAD_CAPS GST_FEATURED_CAPS GST_VIDEO_CAPS_MAKE(GST_CAPS_FORMAT)
+#define WEBKIT_VIDEO_SINK_PAD_CAPS GST_VIDEO_CAPS_MAKE_WITH_FEATURES(GST_CAPS_FEATURE_META_GST_VIDEO_GL_TEXTURE_UPLOAD_META, GST_CAPS_FORMAT) ";" GST_VIDEO_CAPS_MAKE(GST_CAPS_FORMAT)
static GstStaticPadTemplate s_sinkTemplate = GST_STATIC_PAD_TEMPLATE("sink", GST_PAD_SINK, GST_PAD_ALWAYS, GST_STATIC_CAPS(WEBKIT_VIDEO_SINK_PAD_CAPS));
@@ -348,9 +343,7 @@
gst_query_add_allocation_meta(query, GST_VIDEO_META_API_TYPE, 0);
gst_query_add_allocation_meta(query, GST_VIDEO_CROP_META_API_TYPE, 0);
-#if GST_CHECK_VERSION(1, 1, 0)
gst_query_add_allocation_meta(query, GST_VIDEO_GL_TEXTURE_UPLOAD_META_API_TYPE, 0);
-#endif
return TRUE;
}
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (205179 => 205180)
--- trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2016-08-30 11:11:38 UTC (rev 205179)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2016-08-30 14:19:10 UTC (rev 205180)
@@ -663,7 +663,6 @@
result = TRUE;
break;
}
-#if GST_CHECK_VERSION(1, 2, 0)
case GST_QUERY_SCHEDULING: {
GstSchedulingFlags flags;
int minSize, maxSize, align;
@@ -673,7 +672,6 @@
result = TRUE;
break;
}
-#endif
default: {
GRefPtr<GstPad> target = adoptGRef(gst_ghost_pad_get_target(GST_GHOST_PAD_CAST(pad)));
Modified: trunk/Source/cmake/OptionsEfl.cmake (205179 => 205180)
--- trunk/Source/cmake/OptionsEfl.cmake 2016-08-30 11:11:38 UTC (rev 205179)
+++ trunk/Source/cmake/OptionsEfl.cmake 2016-08-30 14:19:10 UTC (rev 205180)
@@ -231,7 +231,7 @@
add_definitions(-DUSE_WEBAUDIO_GSTREAMER=1)
endif ()
- find_package(GStreamer 1.0.5 REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS})
+ find_package(GStreamer 1.2.3 REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS})
if (PC_GSTREAMER_MPEGTS_FOUND)
add_definitions(-DUSE_GSTREAMER_MPEGTS)
Modified: trunk/Source/cmake/OptionsGTK.cmake (205179 => 205180)
--- trunk/Source/cmake/OptionsGTK.cmake 2016-08-30 11:11:38 UTC (rev 205179)
+++ trunk/Source/cmake/OptionsGTK.cmake 2016-08-30 14:19:10 UTC (rev 205180)
@@ -330,7 +330,7 @@
list(APPEND GSTREAMER_COMPONENTS audio fft)
endif ()
- find_package(GStreamer 1.0.3 REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS})
+ find_package(GStreamer 1.2.3 REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS})
if (ENABLE_WEB_AUDIO)
if (NOT PC_GSTREAMER_AUDIO_FOUND OR NOT PC_GSTREAMER_FFT_FOUND)
