Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1217)

Unified Diff: media/media.gyp

Issue 11973010: AndroidVDA by using Android's MediaCodec API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixing android_clang build error. Created 7 years, 10 months 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
« no previous file with comments | « media/base/android/media_codec_bridge_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index 269aa2bff69c6c22088bdaad320f961d06121b3f..e09304e1eff21e8d39dc1ad230783a24af9b45db 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -868,6 +868,7 @@
'audio/win/audio_output_win_unittest.cc',
'audio/win/audio_unified_win_unittest.cc',
'audio/win/core_audio_util_win_unittest.cc',
+ 'base/android/media_codec_bridge_unittest.cc',
'base/audio_bus_unittest.cc',
'base/audio_converter_unittest.cc',
'base/audio_fifo_unittest.cc',
@@ -997,6 +998,7 @@
['gtest_target_type == "shared_library"', {
'dependencies': [
'../testing/android/native_test.gyp:native_test_native_code',
+ 'player_android',
],
}],
],
@@ -1434,9 +1436,31 @@
'includes': [ '../build/jni_generator.gypi' ],
},
{
+ 'target_name': 'media_codec_jni_headers',
+ 'type': 'none',
+ 'variables': {
+ 'jni_gen_dir': 'media',
+ 'input_java_class': 'android/media/MediaCodec.class',
+ 'input_jar_file': '<(android_sdk)/android.jar',
+ },
+ 'includes': [ '../build/jar_file_jni_generator.gypi' ],
+ },
+ {
+ 'target_name': 'media_format_jni_headers',
+ 'type': 'none',
+ 'variables': {
+ 'jni_gen_dir': 'media',
+ 'input_java_class': 'android/media/MediaFormat.class',
+ 'input_jar_file': '<(android_sdk)/android.jar',
+ },
+ 'includes': [ '../build/jar_file_jni_generator.gypi' ],
+ },
+ {
'target_name': 'player_android',
'type': 'static_library',
'sources': [
+ 'base/android/media_codec_bridge.cc',
+ 'base/android/media_codec_bridge.h',
'base/android/media_jni_registrar.cc',
'base/android/media_jni_registrar.h',
'base/android/media_player_bridge.cc',
@@ -1446,6 +1470,8 @@
],
'dependencies': [
'../base/base.gyp:base',
+ 'media_codec_jni_headers',
+ 'media_format_jni_headers',
'player_android_jni_headers',
],
'include_dirs': [
« no previous file with comments | « media/base/android/media_codec_bridge_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698