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

Side by Side Diff: media/media.gyp

Issue 10753005: Add HE AAC support to ISO BMFF. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 5 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 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 'base/android/media_jni_registrar.h', 126 'base/android/media_jni_registrar.h',
127 'base/audio_decoder.cc', 127 'base/audio_decoder.cc',
128 'base/audio_decoder.h', 128 'base/audio_decoder.h',
129 'base/audio_decoder_config.cc', 129 'base/audio_decoder_config.cc',
130 'base/audio_decoder_config.h', 130 'base/audio_decoder_config.h',
131 'base/audio_renderer.h', 131 'base/audio_renderer.h',
132 'base/audio_renderer_mixer.cc', 132 'base/audio_renderer_mixer.cc',
133 'base/audio_renderer_mixer.h', 133 'base/audio_renderer_mixer.h',
134 'base/audio_renderer_mixer_input.cc', 134 'base/audio_renderer_mixer_input.cc',
135 'base/audio_renderer_mixer_input.h', 135 'base/audio_renderer_mixer_input.h',
136 'base/bit_reader.cc',
137 'base/bit_reader.h',
136 'base/bitstream_buffer.h', 138 'base/bitstream_buffer.h',
137 'base/buffers.cc', 139 'base/buffers.cc',
138 'base/buffers.h', 140 'base/buffers.h',
139 'base/byte_queue.cc', 141 'base/byte_queue.cc',
140 'base/byte_queue.h', 142 'base/byte_queue.h',
141 'base/channel_layout.cc', 143 'base/channel_layout.cc',
142 'base/channel_layout.h', 144 'base/channel_layout.h',
143 'base/clock.cc', 145 'base/clock.cc',
144 'base/clock.h', 146 'base/clock.h',
145 'base/composite_filter.cc', 147 'base/composite_filter.cc',
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
445 ['OS=="win"', { 447 ['OS=="win"', {
446 'sources!': [ 448 'sources!': [
447 'audio/pulse/pulse_output.cc', 449 'audio/pulse/pulse_output.cc',
448 'audio/pulse/pulse_output.h', 450 'audio/pulse/pulse_output.h',
449 'video/capture/video_capture_device_dummy.cc', 451 'video/capture/video_capture_device_dummy.cc',
450 'video/capture/video_capture_device_dummy.h', 452 'video/capture/video_capture_device_dummy.h',
451 ], 453 ],
452 }], 454 }],
453 ['proprietary_codecs==1 or branding=="Chrome"', { 455 ['proprietary_codecs==1 or branding=="Chrome"', {
454 'sources': [ 456 'sources': [
457 'mp4/aac.cc',
458 'mp4/aac.h',
455 'mp4/avc.cc', 459 'mp4/avc.cc',
456 'mp4/avc.h', 460 'mp4/avc.h',
457 'mp4/box_definitions.cc', 461 'mp4/box_definitions.cc',
458 'mp4/box_definitions.h', 462 'mp4/box_definitions.h',
459 'mp4/box_reader.cc', 463 'mp4/box_reader.cc',
460 'mp4/box_reader.h', 464 'mp4/box_reader.h',
461 'mp4/cenc.cc', 465 'mp4/cenc.cc',
462 'mp4/cenc.h', 466 'mp4/cenc.h',
467 'mp4/es_descriptor.cc',
468 'mp4/es_descriptor.h',
463 'mp4/mp4_stream_parser.cc', 469 'mp4/mp4_stream_parser.cc',
464 'mp4/mp4_stream_parser.h', 470 'mp4/mp4_stream_parser.h',
465 'mp4/offset_byte_queue.cc', 471 'mp4/offset_byte_queue.cc',
466 'mp4/offset_byte_queue.h', 472 'mp4/offset_byte_queue.h',
467 'mp4/track_run_iterator.cc', 473 'mp4/track_run_iterator.cc',
468 'mp4/track_run_iterator.h', 474 'mp4/track_run_iterator.h',
469 ], 475 ],
470 }], 476 }],
471 ], 477 ],
472 }, 478 },
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
658 'audio/cross_process_notification_unittest.cc', 664 'audio/cross_process_notification_unittest.cc',
659 'audio/linux/alsa_output_unittest.cc', 665 'audio/linux/alsa_output_unittest.cc',
660 'audio/mac/audio_low_latency_input_mac_unittest.cc', 666 'audio/mac/audio_low_latency_input_mac_unittest.cc',
661 'audio/mac/audio_output_mac_unittest.cc', 667 'audio/mac/audio_output_mac_unittest.cc',
662 'audio/simple_sources_unittest.cc', 668 'audio/simple_sources_unittest.cc',
663 'audio/win/audio_low_latency_input_win_unittest.cc', 669 'audio/win/audio_low_latency_input_win_unittest.cc',
664 'audio/win/audio_low_latency_output_win_unittest.cc', 670 'audio/win/audio_low_latency_output_win_unittest.cc',
665 'audio/win/audio_output_win_unittest.cc', 671 'audio/win/audio_output_win_unittest.cc',
666 'base/audio_renderer_mixer_unittest.cc', 672 'base/audio_renderer_mixer_unittest.cc',
667 'base/audio_renderer_mixer_input_unittest.cc', 673 'base/audio_renderer_mixer_input_unittest.cc',
674 'base/bit_reader_unittest.cc',
668 'base/buffers_unittest.cc', 675 'base/buffers_unittest.cc',
669 'base/clock_unittest.cc', 676 'base/clock_unittest.cc',
670 'base/composite_filter_unittest.cc', 677 'base/composite_filter_unittest.cc',
671 'base/data_buffer_unittest.cc', 678 'base/data_buffer_unittest.cc',
672 'base/decoder_buffer_unittest.cc', 679 'base/decoder_buffer_unittest.cc',
673 'base/djb2_unittest.cc', 680 'base/djb2_unittest.cc',
674 'base/fake_audio_render_callback.cc', 681 'base/fake_audio_render_callback.cc',
675 'base/fake_audio_render_callback.h', 682 'base/fake_audio_render_callback.h',
676 'base/filter_collection_unittest.cc', 683 'base/filter_collection_unittest.cc',
677 'base/h264_bitstream_converter_unittest.cc', 684 'base/h264_bitstream_converter_unittest.cc',
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
755 }], 762 }],
756 ], 763 ],
757 }], 764 }],
758 [ 'target_arch=="ia32" or target_arch=="x64"', { 765 [ 'target_arch=="ia32" or target_arch=="x64"', {
759 'sources': [ 766 'sources': [
760 'base/simd/convert_rgb_to_yuv_unittest.cc', 767 'base/simd/convert_rgb_to_yuv_unittest.cc',
761 ], 768 ],
762 }], 769 }],
763 ['proprietary_codecs==1 or branding=="Chrome"', { 770 ['proprietary_codecs==1 or branding=="Chrome"', {
764 'sources': [ 771 'sources': [
772 'mp4/aac_unittest.cc',
765 'mp4/avc_unittest.cc', 773 'mp4/avc_unittest.cc',
766 'mp4/box_reader_unittest.cc', 774 'mp4/box_reader_unittest.cc',
775 'mp4/es_descriptor_unittest.cc',
767 'mp4/mp4_stream_parser_unittest.cc', 776 'mp4/mp4_stream_parser_unittest.cc',
768 'mp4/offset_byte_queue_unittest.cc', 777 'mp4/offset_byte_queue_unittest.cc',
769 ], 778 ],
770 }], 779 }],
771 ], 780 ],
772 }, 781 },
773 { 782 {
774 'target_name': 'media_test_support', 783 'target_name': 'media_test_support',
775 'type': 'static_library', 784 'type': 'static_library',
776 'dependencies': [ 785 'dependencies': [
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
1096 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 1105 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
1097 ], 1106 ],
1098 'sources': [ 1107 'sources': [
1099 'tools/media_bench/media_bench.cc', 1108 'tools/media_bench/media_bench.cc',
1100 ], 1109 ],
1101 }, 1110 },
1102 ], 1111 ],
1103 }] 1112 }]
1104 ], 1113 ],
1105 } 1114 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698