Title: [160263] trunk/Source/WebCore
- Revision
- 160263
- Author
- jer.no...@apple.com
- Date
- 2013-12-06 17:01:45 -0800 (Fri, 06 Dec 2013)
Log Message
[MSE][Mac] Disable AVFoundation when enabling the MockMediaPlayerMediaSource.
https://bugs.webkit.org/show_bug.cgi?id=125338
Reviewed by Darin Adler.
The MediaSource API has some assumptions which break if more than one installed
media engine supports MediaSources at the same time. So when enabling the mock
media source engine in DRT or WKTR, disable AVFoundation so that only the mock
engine will support media source loading.
* testing/Internals.cpp:
(WebCore::Internals::initializeMockMediaSource):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (160262 => 160263)
--- trunk/Source/WebCore/ChangeLog 2013-12-07 00:57:59 UTC (rev 160262)
+++ trunk/Source/WebCore/ChangeLog 2013-12-07 01:01:45 UTC (rev 160263)
@@ -1,3 +1,18 @@
+2013-12-05 Jer Noble <jer.no...@apple.com>
+
+ [MSE][Mac] Disable AVFoundation when enabling the MockMediaPlayerMediaSource.
+ https://bugs.webkit.org/show_bug.cgi?id=125338
+
+ Reviewed by Darin Adler.
+
+ The MediaSource API has some assumptions which break if more than one installed
+ media engine supports MediaSources at the same time. So when enabling the mock
+ media source engine in DRT or WKTR, disable AVFoundation so that only the mock
+ engine will support media source loading.
+
+ * testing/Internals.cpp:
+ (WebCore::Internals::initializeMockMediaSource):
+
2013-12-06 Antti Koivisto <an...@apple.com>
Use NeverDestroyed instead of DEFINE_STATIC_LOCAL
Modified: trunk/Source/WebCore/testing/Internals.cpp (160262 => 160263)
--- trunk/Source/WebCore/testing/Internals.cpp 2013-12-07 00:57:59 UTC (rev 160262)
+++ trunk/Source/WebCore/testing/Internals.cpp 2013-12-07 01:01:45 UTC (rev 160263)
@@ -2260,6 +2260,9 @@
#if ENABLE(MEDIA_SOURCE)
void Internals::initializeMockMediaSource()
{
+#if USE(AVFOUNDATION)
+ WebCore::Settings::setAVFoundationEnabled(false);
+#endif
MediaPlayerFactorySupport::callRegisterMediaEngine(MockMediaPlayerMediaSource::registerMediaEngine);
}
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
