diff options
| author | dfalcantara <dfalcantara@chromium.org> | 2016-03-25 16:45:45 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-25 23:46:59 +0000 |
| commit | e0eeb14423a840cfaec05a0218897c3bf35a4548 (patch) | |
| tree | 91a48d6a5354b0b4519eb53fb70f4482d5d4bd2b /media/base/media.h | |
| parent | d1c68aa675d8d5586e2cda7df1ad56d5e4129e59 (diff) | |
| download | chromium_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 'media/base/media.h')
| -rw-r--r-- | media/base/media.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/media/base/media.h b/media/base/media.h index ca5a8175..b6cccc4 100644 --- a/media/base/media.h +++ b/media/base/media.h @@ -41,6 +41,12 @@ MEDIA_EXPORT bool PlatformHasVp9Support(); // unified media pipeline is supported everywhere. http://crbug.com/580626. MEDIA_EXPORT bool IsUnifiedMediaPipelineEnabled(); +// Similar to IsUnifiedMediaPipelineEnabled() but will also return true if +// MediaCodec is not available (allowing the unified pipeline to take over for +// cases where existing pipeline has no support). As above, codecs requiring +// platform support may not be available. +MEDIA_EXPORT bool IsUnifiedMediaPipelineEnabledForMse(); + // Returns whether the platform decoders are available for use. // This includes decoders being available on the platform and accessible, such // as via the GPU process. Should only be used for actual decoders |