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

Side by Side 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 unified diff | Download patch
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 # Override to dynamically link the PulseAudio library. 8 # Override to dynamically link the PulseAudio library.
9 'use_pulseaudio%': 0, 9 'use_pulseaudio%': 0,
10 # Override to dynamically link the cras (ChromeOS audio) library. 10 # Override to dynamically link the cras (ChromeOS audio) library.
(...skipping 783 matching lines...) Expand 10 before | Expand all | Expand 10 after
794 'filters/ffmpeg_audio_decoder_unittest.cc', 794 'filters/ffmpeg_audio_decoder_unittest.cc',
795 'filters/ffmpeg_demuxer_unittest.cc', 795 'filters/ffmpeg_demuxer_unittest.cc',
796 'filters/ffmpeg_glue_unittest.cc', 796 'filters/ffmpeg_glue_unittest.cc',
797 'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc', 797 'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc',
798 'filters/ffmpeg_video_decoder_unittest.cc', 798 'filters/ffmpeg_video_decoder_unittest.cc',
799 'filters/pipeline_integration_test.cc', 799 'filters/pipeline_integration_test.cc',
800 'filters/pipeline_integration_test_base.cc', 800 'filters/pipeline_integration_test_base.cc',
801 'mp4/mp4_stream_parser_unittest.cc', 801 'mp4/mp4_stream_parser_unittest.cc',
802 'webm/webm_cluster_parser_unittest.cc', 802 'webm/webm_cluster_parser_unittest.cc',
803 ], 803 ],
804 'sources': [
805 '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.
806 ],
804 'conditions': [ 807 'conditions': [
805 ['gtest_target_type == "shared_library"', { 808 ['gtest_target_type == "shared_library"', {
806 'dependencies': [ 809 'dependencies': [
807 '../testing/android/native_test.gyp:native_test_native_code', 810 '../testing/android/native_test.gyp:native_test_native_code',
811 'player_android',
808 ], 812 ],
809 }], 813 }],
810 ], 814 ],
811 }], 815 }],
812 ['OS == "linux"', { 816 ['OS == "linux"', {
813 'conditions': [ 817 'conditions': [
814 ['use_cras == 1', { 818 ['use_cras == 1', {
815 'sources': [ 819 'sources': [
816 'audio/linux/cras_input_unittest.cc', 820 'audio/linux/cras_input_unittest.cc',
817 'audio/linux/cras_output_unittest.cc', 821 'audio/linux/cras_output_unittest.cc',
(...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after
1236 'sources': [ 1240 'sources': [
1237 'base/android/java/src/org/chromium/media/MediaPlayerBridge.java', 1241 'base/android/java/src/org/chromium/media/MediaPlayerBridge.java',
1238 'base/android/java/src/org/chromium/media/MediaPlayerListener.java', 1242 'base/android/java/src/org/chromium/media/MediaPlayerListener.java',
1239 ], 1243 ],
1240 'variables': { 1244 'variables': {
1241 'jni_gen_dir': 'media', 1245 'jni_gen_dir': 'media',
1242 }, 1246 },
1243 'includes': [ '../build/jni_generator.gypi' ], 1247 'includes': [ '../build/jni_generator.gypi' ],
1244 }, 1248 },
1245 { 1249 {
1250 'target_name': 'media_format_jni_headers',
1251 'type': 'none',
1252 'variables': {
1253 'jni_gen_dir': 'media',
1254 'input_java_class': 'android/media/MediaFormat.class',
1255 'input_jar_file': '<(android_sdk)/android.jar',
1256 },
1257 'includes': [ '../build/jar_file_jni_generator.gypi' ],
1258 },
1259 {
1246 'target_name': 'player_android', 1260 'target_name': 'player_android',
1247 'type': 'static_library', 1261 'type': 'static_library',
1248 'sources': [ 1262 'sources': [
1263 'base/android/media_codec_bridge.cc',
1264 'base/android/media_codec_bridge.h',
1249 'base/android/media_jni_registrar.cc', 1265 'base/android/media_jni_registrar.cc',
1250 'base/android/media_jni_registrar.h', 1266 'base/android/media_jni_registrar.h',
1251 'base/android/media_player_bridge.cc', 1267 'base/android/media_player_bridge.cc',
1252 'base/android/media_player_bridge.h', 1268 'base/android/media_player_bridge.h',
1253 'base/android/media_player_listener.cc', 1269 'base/android/media_player_listener.cc',
1254 'base/android/media_player_listener.h', 1270 'base/android/media_player_listener.h',
1271 # TODO(dwkang) : make jar_file_jni_generator support the array
1272 # return type (MediaCodec) and inner class (MediaCodec$BufferInfo)
1273 # and remove the following jni files from here.
1274 # Intoducing a helper java class can also be an alternative.
1275 'base/android/MediaCodec_jni.h',
1255 ], 1276 ],
1256 'dependencies': [ 1277 'dependencies': [
1257 '../base/base.gyp:base', 1278 '../base/base.gyp:base',
1279 'media_format_jni_headers',
1258 'player_android_jni_headers', 1280 'player_android_jni_headers',
1259 ], 1281 ],
1260 'include_dirs': [ 1282 'include_dirs': [
1261 '<(SHARED_INTERMEDIATE_DIR)/media', 1283 '<(SHARED_INTERMEDIATE_DIR)/media',
1262 ], 1284 ],
1263 }, 1285 },
1264 { 1286 {
1265 'target_name': 'media_java', 1287 'target_name': 'media_java',
1266 'type': 'none', 1288 'type': 'none',
1267 'dependencies': [ 1289 'dependencies': [
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
1368 'media', 1390 'media',
1369 ], 1391 ],
1370 'sources': [ 1392 'sources': [
1371 'tools/media_bench/media_bench.cc', 1393 'tools/media_bench/media_bench.cc',
1372 ], 1394 ],
1373 }, 1395 },
1374 ], 1396 ],
1375 }] 1397 }]
1376 ], 1398 ],
1377 } 1399 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698