summaryrefslogtreecommitdiffstats
path: root/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp
diff options
context:
space:
mode:
authordfalcantara <dfalcantara@chromium.org>2016-03-25 16:45:45 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-25 23:46:59 +0000
commite0eeb14423a840cfaec05a0218897c3bf35a4548 (patch)
tree91a48d6a5354b0b4519eb53fb70f4482d5d4bd2b /third_party/WebKit/Source/core/html/HTMLMediaElement.cpp
parentd1c68aa675d8d5586e2cda7df1ad56d5e4129e59 (diff)
downloadchromium_src-e0eeb14423a840cfaec05a0218897c3bf35a4548.zip
chromium_src-e0eeb14423a840cfaec05a0218897c3bf35a4548.tar.gz
chromium_src-e0eeb14423a840cfaec05a0218897c3bf35a4548.tar.bz2
Revert of media: Enable Unified Media Pipeline for MSE and EME on Android (patchset #3 id:40001 of https://chromiumcodereview.appspot.com/1825763002/ )
Reason for revert: Android tests on many bots started failing right after this; these are the most obvious: https://build.chromium.org/p/chromium.android/builders/Lollipop%20Phone%20Tester/builds/3714 * RenderFrameImplTest.LoFiNotUpdatedOnSubframeCommits * RenderViewImplTest.OnSetAccessibilityMode I reverted locally multiple times to make sure, but RenderFrameImplTest.LoFiNotUpdatedOnSubframeCommits only starts failing when this CL is committed, AFAICT. Original issue's description: > media: Enable Unified Media Pipeline for MSE and EME on Android > > Enables Mojo Media on Android to support EME in the unified media > pipeline. This introduces MojoCdm, MojoAudioDecoder and encrytped > stream support in AndroidVideoDecodeAccelerator. > > This CL also enables MSE in the unified media pipeline. The fallback > logic for MSE (IsUnifiedMediaPipelineEnabledForMse()) is removed. > > Also partially reverts f92f4e5c849c028db73fbe06912685a77b978ee4 which > added "LoadType" in createMediaPlayer() to implement the fallback > logic for MSE. > > BUG=455905,521731 > TEST=Encrypted audio/video plays in default Chrome for Android build > with and without unified media pipeline. > > Committed: https://crrev.com/92d0fffc36695c099005bf05862145a89d918f28 > Cr-Commit-Position: refs/heads/master@{#383331} TBR=dalecurtis@chromium.org,ddorwin@chromium.org,timav@chromium.org,wolenetz@chromium.org,pfeldman@chromium.org,xhwang@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=455905,521731 Review URL: https://codereview.chromium.org/1840563002 Cr-Commit-Position: refs/heads/master@{#383409}
Diffstat (limited to 'third_party/WebKit/Source/core/html/HTMLMediaElement.cpp')
-rw-r--r--third_party/WebKit/Source/core/html/HTMLMediaElement.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp b/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp
index 6dcd96d..4d4e353 100644
--- a/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp
@@ -1057,7 +1057,7 @@ void HTMLMediaElement::startPlayerLoad()
}
KURL kurl(ParsedURLString, requestURL);
- m_webMediaPlayer = frame->loader().client()->createWebMediaPlayer(*this, kurl, this);
+ m_webMediaPlayer = frame->loader().client()->createWebMediaPlayer(*this, loadType(), kurl, this);
if (!m_webMediaPlayer) {
mediaLoadingFailed(WebMediaPlayer::NetworkStateFormatError);
return;