diff options
Diffstat (limited to 'chromium/media/media.gyp')
| -rw-r--r-- | chromium/media/media.gyp | 451 |
1 files changed, 173 insertions, 278 deletions
diff --git a/chromium/media/media.gyp b/chromium/media/media.gyp index c685090fd17..09deb821b22 100644 --- a/chromium/media/media.gyp +++ b/chromium/media/media.gyp @@ -12,12 +12,12 @@ # detection of ABI mismatches and prevents silent errors. 'linux_link_pulseaudio%': 0, 'conditions': [ - ['OS=="android" or OS=="ios"', { - # Android and iOS don't use ffmpeg. + ['OS=="android"', { + # Android doesn't use ffmpeg. 'media_use_ffmpeg%': 0, - # Android and iOS don't use libvpx. + # Android doesn't use libvpx. 'media_use_libvpx%': 0, - }, { # 'OS!="android" and OS!="ios"' + }, { # 'OS!="android"' 'media_use_ffmpeg%': 1, 'media_use_libvpx%': 1, }], @@ -27,24 +27,31 @@ }, { 'use_alsa%': 0, }], - ['os_posix==1 and OS!="mac" and OS!="ios" and OS!="android" and chromeos!=1', { + ['os_posix==1 and OS!="mac" and OS!="android" and chromeos!=1', { 'use_pulseaudio%': 1, }, { 'use_pulseaudio%': 0, }], ], }, + 'includes': [ + 'media_cdm.gypi', + ], 'targets': [ { 'target_name': 'media', 'type': '<(component)', 'dependencies': [ '../base/base.gyp:base', + '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../crypto/crypto.gyp:crypto', + '../net/net.gyp:net', + '../gpu/gpu.gyp:command_buffer_common', '../skia/skia.gyp:skia', '../third_party/opus/opus.gyp:opus', '../ui/ui.gyp:ui', '../url/url.gyp:url_lib', + 'shared_memory_support', ], 'defines': [ 'MEDIA_IMPLEMENTATION', @@ -60,9 +67,7 @@ 'audio/android/opensles_input.h', 'audio/android/opensles_output.cc', 'audio/android/opensles_output.h', - 'audio/async_socket_io_handler.h', - 'audio/async_socket_io_handler_posix.cc', - 'audio/async_socket_io_handler_win.cc', + 'audio/android/opensles_wrapper.cc', 'audio/audio_buffers_state.cc', 'audio/audio_buffers_state.h', 'audio/audio_device_name.cc', @@ -99,26 +104,20 @@ 'audio/audio_source_diverter.h', 'audio/audio_util.cc', 'audio/audio_util.h', + 'audio/clockless_audio_sink.cc', + 'audio/clockless_audio_sink.h', 'audio/cras/audio_manager_cras.cc', 'audio/cras/audio_manager_cras.h', 'audio/cras/cras_input.cc', 'audio/cras/cras_input.h', 'audio/cras/cras_unified.cc', 'audio/cras/cras_unified.h', - 'audio/cross_process_notification.cc', - 'audio/cross_process_notification.h', - 'audio/cross_process_notification_posix.cc', - 'audio/cross_process_notification_win.cc', 'audio/fake_audio_consumer.cc', 'audio/fake_audio_consumer.h', 'audio/fake_audio_input_stream.cc', 'audio/fake_audio_input_stream.h', 'audio/fake_audio_output_stream.cc', 'audio/fake_audio_output_stream.h', - 'audio/ios/audio_manager_ios.h', - 'audio/ios/audio_manager_ios.mm', - 'audio/ios/audio_session_util_ios.h', - 'audio/ios/audio_session_util_ios.mm', 'audio/linux/alsa_input.cc', 'audio/linux/alsa_input.h', 'audio/linux/alsa_output.cc', @@ -153,10 +152,10 @@ 'audio/openbsd/audio_manager_openbsd.h', 'audio/pulse/audio_manager_pulse.cc', 'audio/pulse/audio_manager_pulse.h', - 'audio/pulse/pulse_output.cc', - 'audio/pulse/pulse_output.h', 'audio/pulse/pulse_input.cc', 'audio/pulse/pulse_input.h', + 'audio/pulse/pulse_output.cc', + 'audio/pulse/pulse_output.h', 'audio/pulse/pulse_unified.cc', 'audio/pulse/pulse_unified.h', 'audio/pulse/pulse_util.cc', @@ -183,14 +182,15 @@ 'audio/win/audio_unified_win.h', 'audio/win/avrt_wrapper_win.cc', 'audio/win/avrt_wrapper_win.h', - 'audio/win/device_enumeration_win.cc', - 'audio/win/device_enumeration_win.h', 'audio/win/core_audio_util_win.cc', 'audio/win/core_audio_util_win.h', + 'audio/win/device_enumeration_win.cc', + 'audio/win/device_enumeration_win.h', 'audio/win/wavein_input_win.cc', 'audio/win/wavein_input_win.h', 'audio/win/waveout_output_win.cc', 'audio/win/waveout_output_win.h', + 'base/android/demuxer_android.h', 'base/android/demuxer_stream_player_params.cc', 'base/android/demuxer_stream_player_params.h', 'base/android/media_player_manager.h', @@ -217,19 +217,19 @@ 'base/audio_pull_fifo.h', 'base/audio_renderer.cc', 'base/audio_renderer.h', - 'base/audio_renderer_sink.h', 'base/audio_renderer_mixer.cc', 'base/audio_renderer_mixer.h', 'base/audio_renderer_mixer_input.cc', 'base/audio_renderer_mixer_input.h', + 'base/audio_renderer_sink.h', 'base/audio_splicer.cc', 'base/audio_splicer.h', 'base/audio_timestamp_helper.cc', 'base/audio_timestamp_helper.h', 'base/bind_to_loop.h', - 'base/bitstream_buffer.h', 'base/bit_reader.cc', 'base/bit_reader.h', + 'base/bitstream_buffer.h', 'base/buffers.h', 'base/byte_queue.cc', 'base/byte_queue.h', @@ -247,10 +247,10 @@ 'base/decoder_buffer.h', 'base/decoder_buffer_queue.cc', 'base/decoder_buffer_queue.h', - 'base/decryptor.cc', - 'base/decryptor.h', 'base/decrypt_config.cc', 'base/decrypt_config.h', + 'base/decryptor.cc', + 'base/decryptor.h', 'base/demuxer.cc', 'base/demuxer.h', 'base/demuxer_stream.cc', @@ -259,6 +259,8 @@ 'base/djb2.h', 'base/filter_collection.cc', 'base/filter_collection.h', + 'base/keyboard_event_counter.cc', + 'base/keyboard_event_counter.h', 'base/media.cc', 'base/media.h', 'base/media_file_checker.cc', @@ -302,6 +304,11 @@ 'base/stream_parser_buffer.cc', 'base/stream_parser_buffer.h', 'base/text_track.h', + 'base/user_input_monitor.cc', + 'base/user_input_monitor.h', + 'base/user_input_monitor_linux.cc', + 'base/user_input_monitor_mac.cc', + 'base/user_input_monitor_win.cc', 'base/video_decoder.cc', 'base/video_decoder.h', 'base/video_decoder_config.cc', @@ -348,10 +355,10 @@ 'filters/ffmpeg_video_decoder.h', 'filters/file_data_source.cc', 'filters/file_data_source.h', + 'filters/gpu_video_accelerator_factories.cc', + 'filters/gpu_video_accelerator_factories.h', 'filters/gpu_video_decoder.cc', 'filters/gpu_video_decoder.h', - 'filters/gpu_video_decoder_factories.cc', - 'filters/gpu_video_decoder_factories.h', 'filters/h264_to_annex_b_bitstream_converter.cc', 'filters/h264_to_annex_b_bitstream_converter.h', 'filters/in_memory_url_protocol.cc', @@ -372,12 +379,16 @@ 'filters/video_renderer_base.h', 'filters/vpx_video_decoder.cc', 'filters/vpx_video_decoder.h', - 'midi/midi_manager.h', + 'filters/wsola_internals.cc', + 'filters/wsola_internals.h', 'midi/midi_manager.cc', - 'midi/midi_manager_mac.h', + 'midi/midi_manager.h', 'midi/midi_manager_mac.cc', - 'midi/midi_port_info.h', + 'midi/midi_manager_mac.h', 'midi/midi_port_info.cc', + 'midi/midi_port_info.h', + 'mp3/mp3_stream_parser.cc', + 'mp3/mp3_stream_parser.h', 'video/capture/android/video_capture_device_android.cc', 'video/capture/android/video_capture_device_android.h', 'video/capture/fake_video_capture_device.cc', @@ -388,14 +399,12 @@ 'video/capture/mac/video_capture_device_mac.mm', 'video/capture/mac/video_capture_device_qtkit_mac.h', 'video/capture/mac/video_capture_device_qtkit_mac.mm', - 'video/capture/video_capture.h', 'video/capture/video_capture_device.cc', 'video/capture/video_capture_device.h', - 'video/capture/video_capture_device_dummy.cc', - 'video/capture/video_capture_device_dummy.h', 'video/capture/video_capture_proxy.cc', 'video/capture/video_capture_proxy.h', + 'video/capture/video_capture_types.cc', 'video/capture/video_capture_types.h', 'video/capture/win/capability_list_win.cc', 'video/capture/win/capability_list_win.h', @@ -416,6 +425,8 @@ 'video/picture.h', 'video/video_decode_accelerator.cc', 'video/video_decode_accelerator.h', + 'video/video_encode_accelerator.cc', + 'video/video_encode_accelerator.h', 'webm/webm_audio_client.cc', 'webm/webm_audio_client.h', 'webm/webm_cluster_parser.cc', @@ -452,13 +463,6 @@ 'USE_NEON' ], }], - ['OS!="ios"', { - 'dependencies': [ - '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', - '../gpu/gpu.gyp:command_buffer_common', - 'shared_memory_support', - ], - }], ['media_use_ffmpeg==1', { 'dependencies': [ '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', @@ -505,55 +509,7 @@ 'filters/vpx_video_decoder.h', ], }], - ['OS=="ios"', { - 'includes': [ - # For shared_memory_support_sources variable. - 'shared_memory_support.gypi', - ], - 'sources': [ - 'base/media_stub.cc', - # These sources are normally built via a dependency on the - # shared_memory_support target, but that target is not built on iOS. - # Instead, directly build only the files that are needed for iOS. - '<@(shared_memory_support_sources)', - ], - 'sources/': [ - # Exclude everything but iOS-specific files. - ['exclude', '\\.(cc|mm)$'], - ['include', '_ios\\.(cc|mm)$'], - ['include', '(^|/)ios/'], - # Re-include specific pieces. - # iOS support is limited to audio input only. - ['include', '^audio/audio_buffers_state\\.'], - ['include', '^audio/audio_input_controller\\.'], - ['include', '^audio/audio_manager\\.'], - ['include', '^audio/audio_manager_base\\.'], - ['include', '^audio/audio_parameters\\.'], - ['include', '^audio/fake_audio_consumer\\.'], - ['include', '^audio/fake_audio_input_stream\\.'], - ['include', '^audio/fake_audio_output_stream\\.'], - ['include', '^base/audio_bus\\.'], - ['include', '^base/channel_layout\\.'], - ['include', '^base/media\\.cc$'], - ['include', '^base/media_stub\\.cc$'], - ['include', '^base/media_switches\\.'], - ['include', '^base/vector_math\\.'], - ], - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework', - '$(SDKROOT)/System/Library/Frameworks/AVFoundation.framework', - '$(SDKROOT)/System/Library/Frameworks/CoreAudio.framework', - '$(SDKROOT)/System/Library/Frameworks/CoreMIDI.framework', - ], - }, - }], ['OS=="android"', { - 'link_settings': { - 'libraries': [ - '-lOpenSLES', - ], - }, 'include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/media', ], @@ -574,6 +530,9 @@ ], }], ], + 'defines': [ + 'DISABLE_USER_INPUT_MONITOR', + ], }], # A simple WebM encoder for animated avatars on ChromeOS. ['chromeos==1', { @@ -622,8 +581,16 @@ '-lXdamage', '-lXext', '-lXfixes', + '-lXtst', ], }, + }, { # else: use_x11==0 + 'sources!': [ + 'base/user_input_monitor_linux.cc', + ], + 'defines': [ + 'DISABLE_USER_INPUT_MONITOR', + ], }], ['use_cras==1', { 'cflags': [ @@ -809,6 +776,25 @@ }], ['proprietary_codecs==1 or branding=="Chrome"', { 'sources': [ + 'mp2t/es_parser.h', + 'mp2t/es_parser_adts.cc', + 'mp2t/es_parser_adts.h', + 'mp2t/es_parser_h264.cc', + 'mp2t/es_parser_h264.h', + 'mp2t/mp2t_common.h', + 'mp2t/mp2t_stream_parser.cc', + 'mp2t/mp2t_stream_parser.h', + 'mp2t/ts_packet.cc', + 'mp2t/ts_packet.h', + 'mp2t/ts_section.h', + 'mp2t/ts_section_pat.cc', + 'mp2t/ts_section_pat.h', + 'mp2t/ts_section_pes.cc', + 'mp2t/ts_section_pes.h', + 'mp2t/ts_section_pmt.cc', + 'mp2t/ts_section_pmt.h', + 'mp2t/ts_section_psi.cc', + 'mp2t/ts_section_psi.h', 'mp4/aac.cc', 'mp4/aac.h', 'mp4/avc.cc', @@ -834,8 +820,7 @@ '../build/linux/system.gyp:gtk', ], }], - # ios check is necessary due to http://crbug.com/172682. - ['OS!="ios" and (target_arch=="ia32" or target_arch=="x64")', { + ['target_arch=="ia32" or target_arch=="x64"', { 'dependencies': [ 'media_asm', 'media_mmx', @@ -851,13 +836,10 @@ 'ENABLE_EAC3_PLAYBACK', ], }], - ], - 'target_conditions': [ - ['OS=="ios"', { - 'sources/': [ - # Pull in specific Mac files for iOS (which have been filtered out - # by file name rules). - ['include', '^audio/mac/audio_input_mac\\.'], + ['OS!="linux" and OS!="win"', { + 'sources!': [ + 'base/keyboard_event_counter.cc', + 'base/keyboard_event_counter.h', ], }], ], @@ -868,29 +850,29 @@ 'dependencies': [ 'media', 'media_test_support', + 'shared_memory_support', '../base/base.gyp:base', '../base/base.gyp:base_i18n', '../base/base.gyp:test_support_base', + '../gpu/gpu.gyp:command_buffer_common', '../skia/skia.gyp:skia', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', '../ui/ui.gyp:ui', ], 'sources': [ - 'audio/async_socket_io_handler_unittest.cc', + 'audio/android/audio_android_unittest.cc', 'audio/audio_input_controller_unittest.cc', - 'audio/audio_input_device_unittest.cc', 'audio/audio_input_unittest.cc', 'audio/audio_input_volume_unittest.cc', 'audio/audio_low_latency_input_output_unittest.cc', + 'audio/audio_manager_unittest.cc', 'audio/audio_output_controller_unittest.cc', 'audio/audio_output_device_unittest.cc', 'audio/audio_output_proxy_unittest.cc', 'audio/audio_parameters_unittest.cc', 'audio/audio_power_monitor_unittest.cc', - 'audio/cross_process_notification_unittest.cc', 'audio/fake_audio_consumer_unittest.cc', - 'audio/ios/audio_manager_ios_unittest.cc', 'audio/linux/alsa_output_unittest.cc', 'audio/mac/audio_auhal_mac_unittest.cc', 'audio/mac/audio_device_listener_mac_unittest.cc', @@ -936,10 +918,12 @@ 'base/ranges_unittest.cc', 'base/run_all_unittests.cc', 'base/scoped_histogram_timer_unittest.cc', + 'base/serial_runner_unittest.cc', 'base/seekable_buffer_unittest.cc', 'base/sinc_resampler_unittest.cc', 'base/test_data_util.cc', 'base/test_data_util.h', + 'base/user_input_monitor_unittest.cc', 'base/vector_math_testing.h', 'base/vector_math_unittest.cc', 'base/video_frame_unittest.cc', @@ -993,12 +977,6 @@ 'USE_NEON' ], }], - ['OS!="ios"', { - 'dependencies': [ - '../gpu/gpu.gyp:command_buffer_common', - 'shared_memory_support', - ], - }], ['media_use_ffmpeg==1', { 'dependencies': [ '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', @@ -1008,7 +986,17 @@ 'base/media_file_checker_unittest.cc', ], }], - ['os_posix==1 and OS!="mac" and OS!="ios"', { + ['use_alsa==1', { + 'defines': [ + 'USE_ALSA', + ], + }], + ['use_pulseaudio==1', { + 'defines': [ + 'USE_PULSEAUDIO', + ], + }], + ['os_posix==1 and OS!="mac"', { 'conditions': [ ['linux_use_tcmalloc==1', { 'dependencies': [ @@ -1017,17 +1005,6 @@ }], ], }], - ['OS=="ios"', { - 'sources/': [ - ['exclude', '.*'], - ['include', '^audio/audio_input_controller_unittest\\.cc$'], - ['include', '^audio/audio_input_unittest\\.cc$'], - ['include', '^audio/audio_parameters_unittest\\.cc$'], - ['include', '^audio/ios/audio_manager_ios_unittest\\.cc$'], - ['include', '^base/mock_reader\\.h$'], - ['include', '^base/run_all_unittests\\.cc$'], - ], - }], ['OS=="android"', { 'sources!': [ 'audio/audio_input_volume_unittest.cc', @@ -1043,6 +1020,8 @@ 'filters/ffmpeg_video_decoder_unittest.cc', 'filters/pipeline_integration_test.cc', 'filters/pipeline_integration_test_base.cc', + 'mp2t/mp2t_stream_parser_unittest.cc', + 'mp3/mp3_stream_parser_unittest.cc', 'mp4/mp4_stream_parser_unittest.cc', 'webm/webm_cluster_parser_unittest.cc', ], @@ -1074,13 +1053,15 @@ 'audio/audio_low_latency_input_output_unittest.cc', ], }], - ['OS!="ios" and (target_arch=="ia32" or target_arch=="x64")', { + ['target_arch=="ia32" or target_arch=="x64"', { 'sources': [ 'base/simd/convert_rgb_to_yuv_unittest.cc', ], }], - ['proprietary_codecs==1 or branding=="Chrome"', { + ['proprietary_codecs==1', { 'sources': [ + 'mp2t/mp2t_stream_parser_unittest.cc', + 'mp3/mp3_stream_parser_unittest.cc', 'mp4/aac_unittest.cc', 'mp4/avc_unittest.cc', 'mp4/box_reader_unittest.cc', @@ -1125,15 +1106,62 @@ 'base/mock_filters.h', 'base/test_helpers.cc', 'base/test_helpers.h', - 'filters/mock_gpu_video_decoder_factories.cc', - 'filters/mock_gpu_video_decoder_factories.h', + 'filters/mock_gpu_video_accelerator_factories.cc', + 'filters/mock_gpu_video_accelerator_factories.h', 'video/mock_video_decode_accelerator.cc', 'video/mock_video_decode_accelerator.h', ], }, + { + # Minimal target for NaCl and other renderer side media clients which + # only need to send audio data across the shared memory to the browser + # process. + 'target_name': 'shared_memory_support', + 'type': '<(component)', + 'dependencies': [ + '../base/base.gyp:base', + ], + 'defines': [ + 'MEDIA_IMPLEMENTATION', + ], + 'include_dirs': [ + '..', + ], + 'includes': [ + 'shared_memory_support.gypi', + ], + 'sources': [ + '<@(shared_memory_support_sources)', + ], + 'conditions': [ + ['arm_neon==1', { + 'defines': [ + 'USE_NEON' + ], + }], + ['target_arch=="ia32" or target_arch=="x64"', { + 'dependencies': [ + 'shared_memory_support_sse' + ], + }], + ], + }, + { + 'target_name': 'demuxer_bench', + 'type': 'executable', + 'dependencies': [ + 'media', + '../base/base.gyp:base', + ], + 'sources': [ + 'tools/demuxer_bench/demuxer_bench.cc', + ], + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + 'msvs_disabled_warnings': [ 4267, ], + }, ], 'conditions': [ - ['OS!="ios" and target_arch!="arm"', { + ['target_arch!="arm"', { 'targets': [ { 'target_name': 'media_asm', @@ -1232,13 +1260,8 @@ 'include_dirs': [ '..', ], - 'conditions': [ - # TODO(jschuh): Get MMX enabled on Win64. crbug.com/179657 - ['OS!="win" or target_arch=="ia32"', { - 'sources': [ - 'base/simd/filter_yuv_mmx.cc', - ], - }], + 'sources': [ + 'base/simd/filter_yuv_mmx.cc', ], }, { @@ -1293,125 +1316,6 @@ }, ], # targets }], - ['OS!="ios"', { - 'includes': [ - 'media_cdm.gypi', - ], - 'targets': [ - { - # Minimal target for NaCl and other renderer side media clients which - # only need to send audio data across the shared memory to the browser - # process. - 'target_name': 'shared_memory_support', - 'type': '<(component)', - 'dependencies': [ - '../base/base.gyp:base', - ], - 'defines': [ - 'MEDIA_IMPLEMENTATION', - ], - 'include_dirs': [ - '..', - ], - 'includes': [ - 'shared_memory_support.gypi', - ], - 'sources': [ - '<@(shared_memory_support_sources)', - ], - 'conditions': [ - ['arm_neon==1', { - 'defines': [ - 'USE_NEON' - ], - }], - ['target_arch=="ia32" or target_arch=="x64"', { - 'dependencies': [ - 'shared_memory_support_sse' - ], - }], - ], - }, - { - 'target_name': 'seek_tester', - 'type': 'executable', - 'dependencies': [ - 'media', - '../base/base.gyp:base', - ], - 'sources': [ - 'tools/seek_tester/seek_tester.cc', - ], - }, - { - 'target_name': 'demuxer_bench', - 'type': 'executable', - 'dependencies': [ - 'media', - '../base/base.gyp:base', - ], - 'sources': [ - 'tools/demuxer_bench/demuxer_bench.cc', - ], - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [ 4267, ], - }, - ], - }], - ['(OS=="win" or toolkit_uses_gtk==1) and use_aura!=1', { - 'targets': [ - { - 'target_name': 'shader_bench', - 'type': 'executable', - 'dependencies': [ - 'media', - '../base/base.gyp:base', - '../ui/gl/gl.gyp:gl', - '../ui/ui.gyp:ui', - ], - 'sources': [ - 'tools/shader_bench/cpu_color_painter.cc', - 'tools/shader_bench/cpu_color_painter.h', - 'tools/shader_bench/gpu_color_painter.cc', - 'tools/shader_bench/gpu_color_painter.h', - 'tools/shader_bench/gpu_painter.cc', - 'tools/shader_bench/gpu_painter.h', - 'tools/shader_bench/painter.cc', - 'tools/shader_bench/painter.h', - 'tools/shader_bench/shader_bench.cc', - 'tools/shader_bench/window.cc', - 'tools/shader_bench/window.h', - ], - 'conditions': [ - ['toolkit_uses_gtk==1', { - 'dependencies': [ - '../build/linux/system.gyp:gtk', - ], - 'sources': [ - 'tools/shader_bench/window_linux.cc', - ], - }], - ['OS=="win"', { - 'dependencies': [ - '../third_party/angle_dx11/src/build_angle.gyp:libEGL', - '../third_party/angle_dx11/src/build_angle.gyp:libGLESv2', - ], - 'sources': [ - 'tools/shader_bench/window_win.cc', - ], - }], - # See http://crbug.com/162998#c4 for why this is needed. - ['OS=="linux" and linux_use_tcmalloc==1', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], - ], - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [ 4267, ], - }, - ], - }], ['use_x11==1', { 'targets': [ { @@ -1479,6 +1383,7 @@ 'sources': [ 'base/android/java/src/org/chromium/media/AudioManagerAndroid.java', 'base/android/java/src/org/chromium/media/MediaCodecBridge.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', 'base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.java', @@ -1503,8 +1408,12 @@ 'target_name': 'player_android', 'type': 'static_library', 'sources': [ + 'base/android/audio_decoder_job.cc', + 'base/android/audio_decoder_job.h', 'base/android/media_codec_bridge.cc', 'base/android/media_codec_bridge.h', + 'base/android/media_decoder_job.cc', + 'base/android/media_decoder_job.h', 'base/android/media_drm_bridge.cc', 'base/android/media_drm_bridge.h', 'base/android/media_jni_registrar.cc', @@ -1517,6 +1426,8 @@ 'base/android/media_player_listener.h', 'base/android/media_source_player.cc', 'base/android/media_source_player.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', @@ -1539,6 +1450,7 @@ 'type': 'none', 'dependencies': [ '../base/base.gyp:base', + 'media_android_imageformat_list', ], 'export_dependent_settings': [ '../base/base.gyp:base', @@ -1548,7 +1460,18 @@ }, 'includes': ['../build/java.gypi'], }, - + { + 'target_name': 'media_android_imageformat_list', + 'type': 'none', + 'sources': [ + 'base/android/java/src/org/chromium/media/ImageFormat.template', + ], + 'variables': { + 'package_name': 'org/chromium/media', + 'template_deps': ['video/capture/android/imageformat_list.h'], + }, + 'includes': [ '../build/android/java_cpp_template.gypi' ], + }, ], }], ['media_use_ffmpeg==1', { @@ -1617,34 +1540,6 @@ }], ], }, - { - 'target_name': 'ffmpeg_tests', - 'type': 'executable', - 'dependencies': [ - '../base/base.gyp:base', - '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', - 'media', - ], - 'sources': [ - 'test/ffmpeg_tests/ffmpeg_tests.cc', - ], - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [ 4267, ], - }, - { - 'target_name': 'media_bench', - 'type': 'executable', - 'dependencies': [ - '../base/base.gyp:base', - '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', - 'media', - ], - 'sources': [ - 'tools/media_bench/media_bench.cc', - ], - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [ 4267, ], - }, ], }], ], |