diff options
| author | qinmin <qinmin@chromium.org> | 2015-12-06 10:56:13 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-06 18:57:19 +0000 |
| commit | 5d52e0f8e63a294179df028a0dabc76a042cf9ec (patch) | |
| tree | 3dc77dffcfb06283efe6bf54b78754e9931c474e /media/media.gyp | |
| parent | b6adea99ac09da288ebfa137466727c306bfb9fa (diff) | |
| download | chromium_src-5d52e0f8e63a294179df028a0dabc76a042cf9ec.zip chromium_src-5d52e0f8e63a294179df028a0dabc76a042cf9ec.tar.gz chromium_src-5d52e0f8e63a294179df028a0dabc76a042cf9ec.tar.bz2 | |
Refactor MediaCodecBridge to add support for NDK APIs
Currently MediaCodecBridge is implemented with android MediaCodec SDK API.
On android-21, MediaCodec NDK APIs have been added.
This CL makes MediaCodecBridge a common ancestor inherited by the
SDK and NDK implementation.
Some common java functions are moved to MediaCodecUtil.java.
The original native MediaCodecBridge class is renamed to
SdkMediaCodecBridge.
The NdkMediaCodecBridge is still WIP.
BUG=560451
Review URL: https://codereview.chromium.org/1472943002
Cr-Commit-Position: refs/heads/master@{#363374}
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/media/media.gyp b/media/media.gyp index e463802..4b25ca1 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -1182,12 +1182,12 @@ ], 'sources': [ 'base/android/access_unit_queue_unittest.cc', - 'base/android/media_codec_bridge_unittest.cc', 'base/android/media_codec_decoder_unittest.cc', 'base/android/media_codec_player_unittest.cc', 'base/android/media_drm_bridge_unittest.cc', 'base/android/media_player_bridge_unittest.cc', 'base/android/media_source_player_unittest.cc', + 'base/android/sdk_media_codec_bridge_unittest.cc', 'base/android/test_data_factory.cc', 'base/android/test_data_factory.h', 'base/android/test_statistics.h', @@ -1807,6 +1807,7 @@ 'base/android/java/src/org/chromium/media/AudioManagerAndroid.java', 'base/android/java/src/org/chromium/media/AudioRecordInput.java', 'base/android/java/src/org/chromium/media/MediaCodecBridge.java', + 'base/android/java/src/org/chromium/media/MediaCodecUtil.java', 'base/android/java/src/org/chromium/media/MediaDrmBridge.java', 'base/android/java/src/org/chromium/media/MediaPlayerBridge.java', 'base/android/java/src/org/chromium/media/MediaPlayerListener.java', @@ -1856,6 +1857,8 @@ 'base/android/media_codec_player.h', 'base/android/media_codec_video_decoder.cc', 'base/android/media_codec_video_decoder.h', + 'base/android/media_codec_util.cc', + 'base/android/media_codec_util.h', 'base/android/media_common_android.h', 'base/android/media_decoder_job.cc', 'base/android/media_decoder_job.h', @@ -1882,12 +1885,28 @@ 'base/android/media_task_runner.h', 'base/android/media_url_interceptor.h', 'base/android/provision_fetcher.h', + 'base/android/sdk_media_codec_bridge.cc', + 'base/android/sdk_media_codec_bridge.h', 'base/android/video_decoder_job.cc', 'base/android/video_decoder_job.h', 'base/android/webaudio_media_codec_bridge.cc', 'base/android/webaudio_media_codec_bridge.h', 'base/android/webaudio_media_codec_info.h', ], + 'conditions': [ + # Only 64 bit builds are using android-21 NDK library, check common.gypi + ['target_arch=="arm64" or target_arch=="x64" or target_arch=="mips64el"', { + 'sources': [ + 'base/android/ndk_media_codec_bridge.cc', + 'base/android/ndk_media_codec_bridge.h', + ], + 'link_settings': { + 'libraries': [ + '-lmediandk', + ], + }, + }], + ], 'dependencies': [ '../base/base.gyp:base', '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h', |