media/media.gyp - Issue 1472943002: Refactor MediaCodecBridge to add support for NDK APIs

Unified Diff: media/media.gyp

Issue 1472943002: Refactor MediaCodecBridge to add support for NDK APIs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: add media_codec_util.cc(h) Created 5 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: media/media.gyp

diff --git a/media/media.gyp b/media/media.gyp

index 6dd8100faad01f32bd45ebf542523dedf584eca8..4f7e7b237f811fc8ac71d7ee33934d85971ba634 100644

--- a/media/media.gyp

+++ b/media/media.gyp

@@ -1195,12 +1195,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',

@@ -1827,6 +1827,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',

@@ -1876,6 +1877,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',

@@ -1902,12 +1905,27 @@

'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': [

+ ['target_arch=="arm64" or target_arch=="x64" or target_arch=="mips64el"', {

xhwang 2015/11/30 23:11:50 add a comment about why NDK is only used under the

qinmin 2015/12/03 22:46:24 Done.

+ 'sources': [

+ 'base/android/ndk_media_codec_bridge.cc',

+ 'base/android/ndk_media_codec_bridge.h',

xhwang 2015/11/30 23:11:50 do we also want to exclude base/android/sdk_media_

qinmin 2015/12/03 22:46:24 Not now, the ndk work is still WIP, removing sdk_m

+ ],

+ 'link_settings': {

+ 'libraries': [

+ '-lmediandk',

+ ],

+ },

+ }],

+ ],

'dependencies': [

'../base/base.gyp:base',

'../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',

« media/base/android/sdk_media_codec_bridge.cc ('K') | « media/base/android/video_decoder_job.cc ('k') | no next file » | no next file with comments »