diff options
| author | xhwang <xhwang@chromium.org> | 2016-03-26 00:19:38 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-26 07:20:41 +0000 |
| commit | ae2b3a4690087a0160600563edc316118efbdec7 (patch) | |
| tree | da11357ff782a1831008890aa8d0bf017241e797 /media/base/media.h | |
| parent | 885133a46da15cb6f60c0349a2b4a517c4b09971 (diff) | |
| download | chromium_src-ae2b3a4690087a0160600563edc316118efbdec7.zip chromium_src-ae2b3a4690087a0160600563edc316118efbdec7.tar.gz chromium_src-ae2b3a4690087a0160600563edc316118efbdec7.tar.bz2 | |
(reland) media: Enable Unified Media Pipeline for MSE and EME on Android
This relands commit 92d0fffc36695c099005bf05862145a89d918f28. The test
failure is fixed in https://chromiumcodereview.appspot.com/1837673002/.
Original Description:
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.
TBR=dalecurtis@chromium.org,ddorwin@chromium.org,pfeldman@chromium.org,wolenetz@chromium.org
BUG=455905,521731
TEST=Encrypted audio/video plays in default Chrome for Android build
with and without unified media pipeline.
Review URL: https://codereview.chromium.org/1838703002
Cr-Commit-Position: refs/heads/master@{#383450}
Diffstat (limited to 'media/base/media.h')
| -rw-r--r-- | media/base/media.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/media/base/media.h b/media/base/media.h index b6cccc4..ca5a8175 100644 --- a/media/base/media.h +++ b/media/base/media.h @@ -41,12 +41,6 @@ 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 |