Title: [228775] releases/WebKitGTK/webkit-2.20/Source/WebCore
- Revision
- 228775
- Author
- carlo...@webkit.org
- Date
- 2018-02-20 02:41:04 -0800 (Tue, 20 Feb 2018)
Log Message
Merge r228508 - [GStreamer] WebVTT caps changed in GStreamer 1.14
https://bugs.webkit.org/show_bug.cgi?id=182690
Reviewed by Xabier Rodriguez-Calvar.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin): Use
text/vtt caps only for GStreamer versions inferior or equal to
1.12. In 1.13 (current git master) the VTT caps format changed to
application/x-subtitle-vtt.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog (228774 => 228775)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog 2018-02-20 10:41:00 UTC (rev 228774)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog 2018-02-20 10:41:04 UTC (rev 228775)
@@ -1,3 +1,16 @@
+2018-02-15 Philippe Normand <pnorm...@igalia.com>
+
+ [GStreamer] WebVTT caps changed in GStreamer 1.14
+ https://bugs.webkit.org/show_bug.cgi?id=182690
+
+ Reviewed by Xabier Rodriguez-Calvar.
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+ (WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin): Use
+ text/vtt caps only for GStreamer versions inferior or equal to
+ 1.12. In 1.13 (current git master) the VTT caps format changed to
+ application/x-subtitle-vtt.
+
2018-02-15 Zan Dobersek <zdober...@igalia.com>
HarfBuzzFace should not be ref-counted
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (228774 => 228775)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2018-02-20 10:41:00 UTC (rev 228774)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2018-02-20 10:41:04 UTC (rev 228775)
@@ -2166,7 +2166,11 @@
m_textAppSinkPad = adoptGRef(gst_element_get_static_pad(m_textAppSink.get(), "sink"));
ASSERT(m_textAppSinkPad);
- GRefPtr<GstCaps> textCaps = adoptGRef(gst_caps_new_empty_simple("text/vtt"));
+ GRefPtr<GstCaps> textCaps;
+ if (webkitGstCheckVersion(1, 13, 0))
+ textCaps = adoptGRef(gst_caps_new_empty_simple("application/x-subtitle-vtt"));
+ else
+ textCaps = adoptGRef(gst_caps_new_empty_simple("text/vtt"));
g_object_set(m_textAppSink.get(), "emit-signals", TRUE, "enable-last-sample", FALSE, "caps", textCaps.get(), nullptr);
g_signal_connect_swapped(m_textAppSink.get(), "new-sample", G_CALLBACK(newTextSampleCallback), this);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
