Title: [214341] trunk/Source/WebCore
- Revision
- 214341
- Author
- [email protected]
- Date
- 2017-03-24 05:50:53 -0700 (Fri, 24 Mar 2017)
Log Message
[GStreamer] MediaPlayerPrivateGStreamerOwr shouldn't be the default engine
https://bugs.webkit.org/show_bug.cgi?id=170049
Reviewed by Žan Doberšek.
This is causing several media tests to fail after r214338. When trying to load something like this:
http://127.0.0.1:8000/media/resources/serve-video.php?name=../../../../media/content/silence.wav&type=audio/wav&content-length=no&icy-data=""
since r214338, the content type is known and inferred from the extension in this case, what ends up calling
nextMediaEngine() in MediaPlayer::loadWithNextMediaEngine. That returns the first registered media engine, that
is Owr that doesn't know how to load that and fails.
Fixes: http/tests/media/media-play-stream-chunked-icy.html
http/tests/media/media-seeking-no-ranges-server.html
http/tests/media/video-auth.html
http/tests/media/video-play-stall-before-meta-data.html
http/tests/security/contentSecurityPolicy/audio-redirect-allowed.html
http/tests/security/contentSecurityPolicy/audio-redirect-allowed2.html
http/tests/security/contentSecurityPolicy/audio-redirect-blocked.html
http/tests/security/contentSecurityPolicy/video-redirect-allowed.html
http/tests/security/contentSecurityPolicy/video-redirect-allowed2.html
http/tests/security/contentSecurityPolicy/video-redirect-blocked.html
* platform/graphics/MediaPlayer.cpp:
(WebCore::buildMediaEnginesVector):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (214340 => 214341)
--- trunk/Source/WebCore/ChangeLog 2017-03-24 12:01:45 UTC (rev 214340)
+++ trunk/Source/WebCore/ChangeLog 2017-03-24 12:50:53 UTC (rev 214341)
@@ -1,3 +1,32 @@
+2017-03-24 Carlos Garcia Campos <[email protected]>
+
+ [GStreamer] MediaPlayerPrivateGStreamerOwr shouldn't be the default engine
+ https://bugs.webkit.org/show_bug.cgi?id=170049
+
+ Reviewed by Žan Doberšek.
+
+ This is causing several media tests to fail after r214338. When trying to load something like this:
+
+ http://127.0.0.1:8000/media/resources/serve-video.php?name=../../../../media/content/silence.wav&type=audio/wav&content-length=no&icy-data=""
+
+ since r214338, the content type is known and inferred from the extension in this case, what ends up calling
+ nextMediaEngine() in MediaPlayer::loadWithNextMediaEngine. That returns the first registered media engine, that
+ is Owr that doesn't know how to load that and fails.
+
+ Fixes: http/tests/media/media-play-stream-chunked-icy.html
+ http/tests/media/media-seeking-no-ranges-server.html
+ http/tests/media/video-auth.html
+ http/tests/media/video-play-stall-before-meta-data.html
+ http/tests/security/contentSecurityPolicy/audio-redirect-allowed.html
+ http/tests/security/contentSecurityPolicy/audio-redirect-allowed2.html
+ http/tests/security/contentSecurityPolicy/audio-redirect-blocked.html
+ http/tests/security/contentSecurityPolicy/video-redirect-allowed.html
+ http/tests/security/contentSecurityPolicy/video-redirect-allowed2.html
+ http/tests/security/contentSecurityPolicy/video-redirect-blocked.html
+
+ * platform/graphics/MediaPlayer.cpp:
+ (WebCore::buildMediaEnginesVector):
+
2017-03-24 Per Arne Vollan <[email protected]>
Text stroke is sometimes clipped on video captions.
Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (214340 => 214341)
--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2017-03-24 12:01:45 UTC (rev 214340)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2017-03-24 12:50:53 UTC (rev 214341)
@@ -229,12 +229,6 @@
MediaPlayerPrivateQTKit::registerMediaEngine(addMediaEngine);
#endif
-
-#if ENABLE(MEDIA_STREAM) && USE(GSTREAMER) && USE(OPENWEBRTC)
- if (Settings::isGStreamerEnabled())
- MediaPlayerPrivateGStreamerOwr::registerMediaEngine(addMediaEngine);
-#endif
-
#if defined(PlatformMediaEngineClassName)
#if USE(GSTREAMER)
if (Settings::isGStreamerEnabled())
@@ -242,6 +236,11 @@
PlatformMediaEngineClassName::registerMediaEngine(addMediaEngine);
#endif
+#if ENABLE(MEDIA_STREAM) && USE(GSTREAMER) && USE(OPENWEBRTC)
+ if (Settings::isGStreamerEnabled())
+ MediaPlayerPrivateGStreamerOwr::registerMediaEngine(addMediaEngine);
+#endif
+
#if ENABLE(VIDEO) && USE(GSTREAMER) && ENABLE(MEDIA_SOURCE) && ENABLE(VIDEO_TRACK)
if (Settings::isGStreamerEnabled())
MediaPlayerPrivateGStreamerMSE::registerMediaEngine(addMediaEngine);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
