Skip to content

Commit

Permalink
[MSE][Mac] Disable AVFoundation when enabling the MockMediaPlayerMedi…
Browse files Browse the repository at this point in the history
…aSource.

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):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@160263 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
jer.noble@apple.com committed Dec 7, 2013
1 parent 221d0ad commit 29318b0
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 0 deletions.
15 changes: 15 additions & 0 deletions Source/WebCore/ChangeLog
@@ -1,3 +1,18 @@
2013-12-05 Jer Noble <jer.noble@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 <antti@apple.com>

Use NeverDestroyed instead of DEFINE_STATIC_LOCAL
Expand Down
3 changes: 3 additions & 0 deletions Source/WebCore/testing/Internals.cpp
Expand Up @@ -2260,6 +2260,9 @@ bool Internals::isPluginUnavailabilityIndicatorObscured(Element* element, Except
#if ENABLE(MEDIA_SOURCE)
void Internals::initializeMockMediaSource()
{
#if USE(AVFOUNDATION)
WebCore::Settings::setAVFoundationEnabled(false);
#endif
MediaPlayerFactorySupport::callRegisterMediaEngine(MockMediaPlayerMediaSource::registerMediaEngine);
}
#endif
Expand Down

0 comments on commit 29318b0

Please sign in to comment.