- Revision
- 149111
- Author
- [email protected]
- Date
- 2013-04-25 07:52:27 -0700 (Thu, 25 Apr 2013)
Log Message
[GStreamer] Add audio/speex MIME type as supported
https://bugs.webkit.org/show_bug.cgi?id=115032
Patch by Adrian Perez de Castro <[email protected]> on 2013-04-25
Reviewed by Philippe Normand.
Source/WebCore:
GStreamer has support for the Speex codec (http://www.speex.org).
Speex streams may be embedded in a Ogg container, or standalone.
The case of the Ogg container is already covered by the "*/ogg"
MIME types declared as supported by the GStreamer media playing
code, but for standalone streams to work, "audio/speex" has to
be added.
With this, and the needed GStreamer plugin installed, the GTK+
launcher is able to correctly play Speex streams served with
"Content-type: audio/speex".
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
LayoutTests:
Speex (http://www.speex.org) streams can be embedded into Ogg
Ogg containers, so add a check for it in the test case.
* media/media-can-play-ogg-expected.txt:
* media/media-can-play-ogg.html:
* platform/blackberry/media/media-can-play-ogg-expected.txt:
* platform/mac/media/media-can-play-ogg-expected.txt:
* platform/qt-linux/media/media-can-play-ogg-expected.txt:
* platform/win/media/media-can-play-ogg-expected.txt:
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (149110 => 149111)
--- trunk/LayoutTests/ChangeLog 2013-04-25 14:33:54 UTC (rev 149110)
+++ trunk/LayoutTests/ChangeLog 2013-04-25 14:52:27 UTC (rev 149111)
@@ -1,3 +1,20 @@
+2013-04-25 Adrian Perez de Castro <[email protected]>
+
+ [GStreamer] Add audio/speex MIME type as supported
+ https://bugs.webkit.org/show_bug.cgi?id=115032
+
+ Reviewed by Philippe Normand.
+
+ Speex (http://www.speex.org) streams can be embedded into Ogg
+ Ogg containers, so add a check for it in the test case.
+
+ * media/media-can-play-ogg-expected.txt:
+ * media/media-can-play-ogg.html:
+ * platform/blackberry/media/media-can-play-ogg-expected.txt:
+ * platform/mac/media/media-can-play-ogg-expected.txt:
+ * platform/qt-linux/media/media-can-play-ogg-expected.txt:
+ * platform/win/media/media-can-play-ogg-expected.txt:
+
2013-04-25 Andreas Kling <[email protected]>
CSS parser: Add error recovery while parsing @-webkit-keyframes key values.
Modified: trunk/LayoutTests/media/media-can-play-ogg-expected.txt (149110 => 149111)
--- trunk/LayoutTests/media/media-can-play-ogg-expected.txt 2013-04-25 14:33:54 UTC (rev 149110)
+++ trunk/LayoutTests/media/media-can-play-ogg-expected.txt 2013-04-25 14:52:27 UTC (rev 149111)
@@ -5,7 +5,8 @@
EXPECTED (video.canPlayType('audio/ogg') == 'maybe') OK
EXPECTED (video.canPlayType('video/ogg') == 'maybe') OK
EXPECTED (video.canPlayType('audio/ogg; codecs=vorbis') == 'probably') OK
-EXPECTED (video.canPlayType('audio/ogg; codecs=opus') == 'probably'), OBSERVED '' FAIL
+EXPECTED (video.canPlayType('audio/ogg; codecs=opus') == 'probably') OK
+EXPECTED (video.canPlayType('audio/ogg; codecs=speex') == 'probably') OK
EXPECTED (video.canPlayType('video/ogg; codecs=theora') == 'probably') OK
EXPECTED (video.canPlayType('video/ogg; codecs=theora,vorbis') == 'probably') OK
END OF TEST
Modified: trunk/LayoutTests/media/media-can-play-ogg.html (149110 => 149111)
--- trunk/LayoutTests/media/media-can-play-ogg.html 2013-04-25 14:33:54 UTC (rev 149110)
+++ trunk/LayoutTests/media/media-can-play-ogg.html 2013-04-25 14:52:27 UTC (rev 149111)
@@ -11,6 +11,7 @@
testExpected("video.canPlayType('audio/ogg; codecs=vorbis')", "probably");
testExpected("video.canPlayType('audio/ogg; codecs=opus')", "probably");
+ testExpected("video.canPlayType('audio/ogg; codecs=speex')", "probably");
testExpected("video.canPlayType('video/ogg; codecs=theora')", "probably");
testExpected("video.canPlayType('video/ogg; codecs=theora,vorbis')", "probably");
Modified: trunk/LayoutTests/platform/blackberry/media/media-can-play-ogg-expected.txt (149110 => 149111)
--- trunk/LayoutTests/platform/blackberry/media/media-can-play-ogg-expected.txt 2013-04-25 14:33:54 UTC (rev 149110)
+++ trunk/LayoutTests/platform/blackberry/media/media-can-play-ogg-expected.txt 2013-04-25 14:52:27 UTC (rev 149111)
@@ -6,6 +6,7 @@
EXPECTED (video.canPlayType('video/ogg') == 'maybe') OK
EXPECTED (video.canPlayType('audio/ogg; codecs=vorbis') == 'probably') OK
EXPECTED (video.canPlayType('audio/ogg; codecs=opus') == 'probably'), OBSERVED '' FAIL
+EXPECTED (video.canPlayType('audio/ogg; codecs=speex') == 'probably'), OBSERVED '' FAIL
EXPECTED (video.canPlayType('video/ogg; codecs=theora') == 'probably') OK
EXPECTED (video.canPlayType('video/ogg; codecs=theora,vorbis') == 'probably') OK
END OF TEST
Copied: trunk/LayoutTests/platform/mac/media/media-can-play-ogg-expected.txt (from rev 149110, trunk/LayoutTests/platform/qt-linux/media/media-can-play-ogg-expected.txt) (0 => 149111)
--- trunk/LayoutTests/platform/mac/media/media-can-play-ogg-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/media/media-can-play-ogg-expected.txt 2013-04-25 14:52:27 UTC (rev 149111)
@@ -0,0 +1,13 @@
+Test HTMLMediaElement canPlayType() method for ogg media containers.
+
+These tests may be expected to fail if the WebKit port does not support the format.
+
+EXPECTED (video.canPlayType('audio/ogg') == 'maybe') OK
+EXPECTED (video.canPlayType('video/ogg') == 'maybe') OK
+EXPECTED (video.canPlayType('audio/ogg; codecs=vorbis') == 'probably') OK
+EXPECTED (video.canPlayType('audio/ogg; codecs=opus') == 'probably'), OBSERVED '' FAIL
+EXPECTED (video.canPlayType('audio/ogg; codecs=speex') == 'probably'), OBSERVED '' FAIL
+EXPECTED (video.canPlayType('video/ogg; codecs=theora') == 'probably') OK
+EXPECTED (video.canPlayType('video/ogg; codecs=theora,vorbis') == 'probably') OK
+END OF TEST
+
Modified: trunk/LayoutTests/platform/qt-linux/media/media-can-play-ogg-expected.txt (149110 => 149111)
--- trunk/LayoutTests/platform/qt-linux/media/media-can-play-ogg-expected.txt 2013-04-25 14:33:54 UTC (rev 149110)
+++ trunk/LayoutTests/platform/qt-linux/media/media-can-play-ogg-expected.txt 2013-04-25 14:52:27 UTC (rev 149111)
@@ -6,6 +6,7 @@
EXPECTED (video.canPlayType('video/ogg') == 'maybe') OK
EXPECTED (video.canPlayType('audio/ogg; codecs=vorbis') == 'probably') OK
EXPECTED (video.canPlayType('audio/ogg; codecs=opus') == 'probably'), OBSERVED '' FAIL
+EXPECTED (video.canPlayType('audio/ogg; codecs=speex') == 'probably') OK
EXPECTED (video.canPlayType('video/ogg; codecs=theora') == 'probably') OK
EXPECTED (video.canPlayType('video/ogg; codecs=theora,vorbis') == 'probably') OK
END OF TEST
Modified: trunk/LayoutTests/platform/win/media/media-can-play-ogg-expected.txt (149110 => 149111)
--- trunk/LayoutTests/platform/win/media/media-can-play-ogg-expected.txt 2013-04-25 14:33:54 UTC (rev 149110)
+++ trunk/LayoutTests/platform/win/media/media-can-play-ogg-expected.txt 2013-04-25 14:52:27 UTC (rev 149111)
@@ -6,6 +6,7 @@
EXPECTED (video.canPlayType('video/ogg') == 'maybe') OK
EXPECTED (video.canPlayType('audio/ogg; codecs=vorbis') == 'probably') OK
EXPECTED (video.canPlayType('audio/ogg; codecs=opus') == 'probably'), OBSERVED '' FAIL
+EXPECTED (video.canPlayType('audio/ogg; codecs=speex') == 'probably'), OBSERVED '' FAIL
EXPECTED (video.canPlayType('video/ogg; codecs=theora') == 'probably') OK
EXPECTED (video.canPlayType('video/ogg; codecs=theora,vorbis') == 'probably') OK
END OF TEST
Modified: trunk/Source/WebCore/ChangeLog (149110 => 149111)
--- trunk/Source/WebCore/ChangeLog 2013-04-25 14:33:54 UTC (rev 149110)
+++ trunk/Source/WebCore/ChangeLog 2013-04-25 14:52:27 UTC (rev 149111)
@@ -1,3 +1,23 @@
+2013-04-25 Adrian Perez de Castro <[email protected]>
+
+ [GStreamer] Add audio/speex MIME type as supported
+ https://bugs.webkit.org/show_bug.cgi?id=115032
+
+ Reviewed by Philippe Normand.
+
+ GStreamer has support for the Speex codec (http://www.speex.org).
+ Speex streams may be embedded in a Ogg container, or standalone.
+ The case of the Ogg container is already covered by the "*/ogg"
+ MIME types declared as supported by the GStreamer media playing
+ code, but for standalone streams to work, "audio/speex" has to
+ be added.
+
+ With this, and the needed GStreamer plugin installed, the GTK+
+ launcher is able to correctly play Speex streams served with
+ "Content-type: audio/speex".
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+
2013-04-25 Andreas Kling <[email protected]>
Add FINAL decorators to the InlineBox class hierarchy.
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (149110 => 149111)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2013-04-25 14:33:54 UTC (rev 149110)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2013-04-25 14:52:27 UTC (rev 149111)
@@ -1435,6 +1435,7 @@
"audio/opus",
"audio/qcelp",
"audio/riff-midi",
+ "audio/speex",
"audio/wav",
"audio/webm",
"audio/x-ac3",
