<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[201283] releases/WebKitGTK/webkit-2.12/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/201283">201283</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-05-23 06:37:27 -0700 (Mon, 23 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/201163">r201163</a> - [GStreamer] unrelated codecs required to play videos
https://bugs.webkit.org/show_bug.cgi?id=135972
Reviewed by Michael Catanzaro.
Instead of hard-coding the list of supported mime-types, check the
decoder and demuxer GStreamer elements available and dynamically
build the list of mime-types accordingly. This patch also removes
support for under-used and exotic mime-types.
Based on a patch by Mario Sanchez Prada.
No new tests, existing media tests cover this change.
* platform/graphics/gstreamer/GStreamerUtilities.cpp:
(WebCore::gstRegistryHasElementForMediaType): New function
checking the elements registered in the factories have a sink pad
matching the caps specified as second argument of the function.
* platform/graphics/gstreamer/GStreamerUtilities.h:
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::mimeTypeSet): Hard-coded list of mime-types replaced by
runtime-built list of mime-types that can be supported by the
GStreamer decoders and demuxers available on the host machine.
(WebCore::MediaPlayerPrivateGStreamer::getSupportedTypes):
mimeTypeCache renamed to mimeTypeSet.
(WebCore::MediaPlayerPrivateGStreamer::supportsType): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreplatformgraphicsgstreamerGStreamerUtilitiescpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreplatformgraphicsgstreamerGStreamerUtilitiesh">releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.h</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit212SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (201282 => 201283)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-05-23 13:34:20 UTC (rev 201282)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-05-23 13:37:27 UTC (rev 201283)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2016-05-19 Philippe Normand <pnormand@igalia.com>
+
+ [GStreamer] unrelated codecs required to play videos
+ https://bugs.webkit.org/show_bug.cgi?id=135972
+
+ Reviewed by Michael Catanzaro.
+
+ Instead of hard-coding the list of supported mime-types, check the
+ decoder and demuxer GStreamer elements available and dynamically
+ build the list of mime-types accordingly. This patch also removes
+ support for under-used and exotic mime-types.
+
+ Based on a patch by Mario Sanchez Prada.
+
+ No new tests, existing media tests cover this change.
+
+ * platform/graphics/gstreamer/GStreamerUtilities.cpp:
+ (WebCore::gstRegistryHasElementForMediaType): New function
+ checking the elements registered in the factories have a sink pad
+ matching the caps specified as second argument of the function.
+ * platform/graphics/gstreamer/GStreamerUtilities.h:
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+ (WebCore::mimeTypeSet): Hard-coded list of mime-types replaced by
+ runtime-built list of mime-types that can be supported by the
+ GStreamer decoders and demuxers available on the host machine.
+ (WebCore::MediaPlayerPrivateGStreamer::getSupportedTypes):
+ mimeTypeCache renamed to mimeTypeSet.
+ (WebCore::MediaPlayerPrivateGStreamer::supportsType): Ditto.
+
</ins><span class="cx"> 2016-05-18 Philippe Normand <pnormand@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GStreamer] webaudio crash on ARM platforms
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoreplatformgraphicsgstreamerGStreamerUtilitiescpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp (201282 => 201283)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp 2016-05-23 13:34:20 UTC (rev 201282)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp 2016-05-23 13:37:27 UTC (rev 201283)
</span><span class="lines">@@ -22,6 +22,7 @@
</span><span class="cx"> #if USE(GSTREAMER)
</span><span class="cx"> #include "GStreamerUtilities.h"
</span><span class="cx">
</span><ins>+#include "GRefPtrGStreamer.h"
</ins><span class="cx"> #include "IntSize.h"
</span><span class="cx">
</span><span class="cx"> #include <gst/audio/audio-info.h>
</span><span class="lines">@@ -185,6 +186,16 @@
</span><span class="cx"> return GST_TIMEVAL_TO_TIME(timeValue);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool gstRegistryHasElementForMediaType(GList* elementFactories, const char* capsString)
+{
+ GRefPtr<GstCaps> caps = adoptGRef(gst_caps_from_string(capsString));
+ GList* candidates = gst_element_factory_list_filter(elementFactories, caps.get(), GST_PAD_SINK, false);
+ bool result = candidates;
+
+ gst_plugin_feature_list_free(candidates);
+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+}
+
</ins><span class="cx"> #endif // USE(GSTREAMER)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoreplatformgraphicsgstreamerGStreamerUtilitiesh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.h (201282 => 201283)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.h 2016-05-23 13:34:20 UTC (rev 201282)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.h 2016-05-23 13:37:27 UTC (rev 201283)
</span><span class="lines">@@ -76,5 +76,5 @@
</span><span class="cx"> bool initializeGStreamer();
</span><span class="cx"> unsigned getGstPlayFlag(const char* nick);
</span><span class="cx"> GstClockTime toGstClockTime(float time);
</span><del>-
</del><ins>+bool gstRegistryHasElementForMediaType(GList* elementFactories, const char* capsString);
</ins><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (201282 => 201283)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2016-05-23 13:34:20 UTC (rev 201282)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2016-05-23 13:37:27 UTC (rev 201283)
</span><span class="lines">@@ -1660,113 +1660,137 @@
</span><span class="cx"> m_readyTimerHandler.stop();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// FIXME: In what sense is this a "cache"?
-static HashSet<String, ASCIICaseInsensitiveHash>& mimeTypeCache()
</del><ins>+static HashSet<String, ASCIICaseInsensitiveHash>& mimeTypeSet()
</ins><span class="cx"> {
</span><del>- static NeverDestroyed<HashSet<String, ASCIICaseInsensitiveHash>> cache = []() {
</del><ins>+ static NeverDestroyed<HashSet<String, ASCIICaseInsensitiveHash>> mimeTypes = []()
+ {
</ins><span class="cx"> initializeGStreamerAndRegisterWebKitElements();
</span><span class="cx"> HashSet<String, ASCIICaseInsensitiveHash> set;
</span><del>- const char* mimeTypes[] = {
- "application/ogg",
- "application/vnd.apple.mpegurl",
- "application/vnd.rn-realmedia",
- "application/x-3gp",
- "application/x-pn-realaudio",
- "application/x-mpegurl",
- "audio/3gpp",
- "audio/aac",
- "audio/flac",
- "audio/iLBC-sh",
- "audio/midi",
- "audio/mobile-xmf",
- "audio/mp1",
- "audio/mp2",
- "audio/mp3",
- "audio/mp4",
- "audio/mpeg",
- "audio/ogg",
- "audio/opus",
- "audio/qcelp",
- "audio/riff-midi",
- "audio/speex",
- "audio/wav",
- "audio/webm",
- "audio/x-ac3",
- "audio/x-aiff",
- "audio/x-amr-nb-sh",
- "audio/x-amr-wb-sh",
- "audio/x-au",
- "audio/x-ay",
- "audio/x-celt",
- "audio/x-dts",
- "audio/x-flac",
- "audio/x-gbs",
- "audio/x-gsm",
- "audio/x-gym",
- "audio/x-imelody",
- "audio/x-ircam",
- "audio/x-kss",
- "audio/x-m4a",
- "audio/x-mod",
- "audio/x-mp3",
- "audio/x-mpeg",
- "audio/x-musepack",
- "audio/x-nist",
- "audio/x-nsf",
- "audio/x-paris",
- "audio/x-sap",
- "audio/x-sbc",
- "audio/x-sds",
- "audio/x-shorten",
- "audio/x-sid",
- "audio/x-spc",
- "audio/x-speex",
- "audio/x-svx",
- "audio/x-ttafile",
- "audio/x-vgm",
- "audio/x-voc",
- "audio/x-vorbis+ogg",
- "audio/x-w64",
- "audio/x-wav",
- "audio/x-wavpack",
- "audio/x-wavpack-correction",
- "video/3gpp",
- "video/flv",
- "video/mj2",
- "video/mp2t",
- "video/mp4",
- "video/mpeg",
- "video/mpegts",
- "video/ogg",
- "video/quicktime",
- "video/vivo",
- "video/webm",
- "video/x-cdxa",
- "video/x-dirac",
- "video/x-dv",
- "video/x-fli",
- "video/x-flv",
- "video/x-h263",
- "video/x-ivf",
- "video/x-m4v",
- "video/x-matroska",
- "video/x-mng",
- "video/x-ms-asf",
- "video/x-msvideo",
- "video/x-mve",
- "video/x-nuv",
- "video/x-vcd"
</del><ins>+
+ GList* audioDecoderFactories = gst_element_factory_list_get_elements(GST_ELEMENT_FACTORY_TYPE_DECODER | GST_ELEMENT_FACTORY_TYPE_MEDIA_AUDIO, GST_RANK_MARGINAL);
+ GList* videoDecoderFactories = gst_element_factory_list_get_elements(GST_ELEMENT_FACTORY_TYPE_DECODER | GST_ELEMENT_FACTORY_TYPE_MEDIA_VIDEO, GST_RANK_MARGINAL);
+ GList* demuxerFactories = gst_element_factory_list_get_elements(GST_ELEMENT_FACTORY_TYPE_DEMUXER, GST_RANK_MARGINAL);
+
+ enum ElementType {
+ AudioDecoder = 0,
+ VideoDecoder,
+ Demuxer
</ins><span class="cx"> };
</span><del>- for (auto& type : mimeTypes)
- set.add(type);
</del><ins>+ struct GstCapsWebKitMapping {
+ ElementType elementType;
+ const char* capsString;
+ Vector<AtomicString> webkitMimeTypes;
+ };
+
+ Vector<GstCapsWebKitMapping> mapping = {
+ {AudioDecoder, "audio/midi", {"audio/midi", "audio/riff-midi"}},
+ {AudioDecoder, "audio/x-sbc", { }},
+ {AudioDecoder, "audio/x-sid", { }},
+ {AudioDecoder, "audio/x-flac", {"audio/x-flac", "audio/flac"}},
+ {AudioDecoder, "audio/x-wav", {"audio/x-wav", "audio/wav"}},
+ {AudioDecoder, "audio/x-wavpack", {"audio/x-wavpack"}},
+ {AudioDecoder, "audio/x-speex", {"audio/speex", "audio/x-speex"}},
+ {AudioDecoder, "audio/x-ac3", { }},
+ {AudioDecoder, "audio/x-eac3", {"audio/x-ac3"}},
+ {AudioDecoder, "audio/x-dts", { }},
+ {VideoDecoder, "video/x-h264, profile=(string)high", {"video/mp4", "video/x-m4v"}},
+ {VideoDecoder, "video/x-msvideocodec", {"video/x-msvideo"}},
+ {VideoDecoder, "video/x-h263", { }},
+ {VideoDecoder, "video/mpegts", { }},
+ {VideoDecoder, "video/mpeg, mpegversion=(int){1,2}, systemstream=(boolean)false", {"video/mpeg"}},
+ {VideoDecoder, "video/x-dirac", { }},
+ {VideoDecoder, "video/x-flash-video", {"video/flv", "video/x-flv"}},
+ {Demuxer, "video/quicktime", { }},
+ {Demuxer, "video/quicktime, variant=(string)3gpp", {"video/3gpp"}},
+ {Demuxer, "application/x-3gp", { }},
+ {Demuxer, "video/x-ms-asf", { }},
+ {Demuxer, "audio/x-aiff", { }},
+ {Demuxer, "application/x-pn-realaudio", { }},
+ {Demuxer, "application/vnd.rn-realmedia", { }},
+ {Demuxer, "audio/x-wav", {"audio/x-wav", "audio/wav"}},
+ {Demuxer, "application/x-hls", {"application/vnd.apple.mpegurl", "application/x-mpegurl"}}
+ };
+
+ for (auto& current : mapping) {
+ GList* factories = demuxerFactories;
+ if (current.elementType == AudioDecoder)
+ factories = audioDecoderFactories;
+ else if (current.elementType == VideoDecoder)
+ factories = videoDecoderFactories;
+
+ if (gstRegistryHasElementForMediaType(factories, current.capsString)) {
+ if (!current.webkitMimeTypes.isEmpty()) {
+ for (const auto& mimeType : current.webkitMimeTypes)
+ set.add(mimeType);
+ } else
+ set.add(AtomicString(current.capsString));
+ }
+ }
+
+ bool opusSupported = false;
+ if (gstRegistryHasElementForMediaType(audioDecoderFactories, "audio/x-opus")) {
+ opusSupported = true;
+ set.add(AtomicString("audio/opus"));
+ }
+
+ bool vorbisSupported = false;
+ if (gstRegistryHasElementForMediaType(demuxerFactories, "application/ogg")) {
+ set.add(AtomicString("application/ogg"));
+
+ vorbisSupported = gstRegistryHasElementForMediaType(audioDecoderFactories, "audio/x-vorbis");
+ if (vorbisSupported) {
+ set.add(AtomicString("audio/ogg"));
+ set.add(AtomicString("audio/x-vorbis+ogg"));
+ }
+
+ if (gstRegistryHasElementForMediaType(videoDecoderFactories, "video/x-theora"))
+ set.add(AtomicString("video/ogg"));
+ }
+
+ bool audioMpegSupported = false;
+ if (gstRegistryHasElementForMediaType(audioDecoderFactories, "audio/mpeg, mpegversion=(int)1, layer=(int)[1, 3]")) {
+ audioMpegSupported = true;
+ set.add(AtomicString("audio/mp1"));
+ set.add(AtomicString("audio/mp3"));
+ set.add(AtomicString("audio/x-mp3"));
+ }
+
+ if (gstRegistryHasElementForMediaType(audioDecoderFactories, "audio/mpeg, mpegversion=(int){2, 4}")) {
+ audioMpegSupported = true;
+ set.add(AtomicString("audio/aac"));
+ set.add(AtomicString("audio/mp2"));
+ set.add(AtomicString("audio/mp4"));
+ set.add(AtomicString("audio/x-m4a"));
+ }
+
+ if (audioMpegSupported) {
+ set.add(AtomicString("audio/mpeg"));
+ set.add(AtomicString("audio/x-mpeg"));
+ }
+
+ if (gstRegistryHasElementForMediaType(demuxerFactories, "video/x-matroska")) {
+ set.add(AtomicString("video/x-matroska"));
+
+ if (gstRegistryHasElementForMediaType(videoDecoderFactories, "video/x-vp8")
+ || gstRegistryHasElementForMediaType(videoDecoderFactories, "video/x-vp9")
+ || gstRegistryHasElementForMediaType(videoDecoderFactories, "video/x-vp10"))
+ set.add(AtomicString("video/webm"));
+
+ if (vorbisSupported || opusSupported)
+ set.add(AtomicString("audio/webm"));
+ }
+
+ gst_plugin_feature_list_free(audioDecoderFactories);
+ gst_plugin_feature_list_free(videoDecoderFactories);
+ gst_plugin_feature_list_free(demuxerFactories);
</ins><span class="cx"> return set;
</span><span class="cx"> }();
</span><del>- return cache;
</del><ins>+ return mimeTypes;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateGStreamer::getSupportedTypes(HashSet<String, ASCIICaseInsensitiveHash>& types)
</span><span class="cx"> {
</span><del>- types = mimeTypeCache();
</del><ins>+ types = mimeTypeSet();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MediaPlayer::SupportsType MediaPlayerPrivateGStreamer::supportsType(const MediaEngineSupportParameters& parameters)
</span><span class="lines">@@ -1775,7 +1799,7 @@
</span><span class="cx"> return MediaPlayer::IsNotSupported;
</span><span class="cx">
</span><span class="cx"> // spec says we should not return "probably" if the codecs string is empty
</span><del>- if (mimeTypeCache().contains(parameters.type))
</del><ins>+ if (mimeTypeSet().contains(parameters.type))
</ins><span class="cx"> return parameters.codecs.isEmpty() ? MediaPlayer::MayBeSupported : MediaPlayer::IsSupported;
</span><span class="cx"> return MediaPlayer::IsNotSupported;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>