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

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: Created 7 years, 11 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
Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index 17447e56b0239a032a2a94c7f560269c4c1aa40b..53e80432730b2648ee69727f300b8de92ac483a8 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -801,10 +801,14 @@
'mp4/mp4_stream_parser_unittest.cc',
'webm/webm_cluster_parser_unittest.cc',
],
+ 'sources': [
+ 'base/android/media_codec_bridge_unittest.cc',
Ami GONE FROM CHROMIUM 2013/01/23 01:32:32 I think this can go in the main sources list (plat
dwkang1 2013/01/28 14:54:30 Thanks for the link! Done.
+ ],
'conditions': [
['gtest_target_type == "shared_library"', {
'dependencies': [
'../testing/android/native_test.gyp:native_test_native_code',
+ 'player_android',
],
}],
],
@@ -1243,18 +1247,36 @@
'includes': [ '../build/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',
'base/android/media_player_bridge.h',
'base/android/media_player_listener.cc',
'base/android/media_player_listener.h',
+ # TODO(dwkang) : make jar_file_jni_generator support the array
+ # return type (MediaCodec) and inner class (MediaCodec$BufferInfo)
+ # and remove the following jni files from here.
+ # Intoducing a helper java class can also be an alternative.
+ 'base/android/MediaCodec_jni.h',
],
'dependencies': [
'../base/base.gyp:base',
+ 'media_format_jni_headers',
'player_android_jni_headers',
],
'include_dirs': [

Powered by Google App Engine
This is Rietveld 408576698