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

Side by Side Diff: media/media.gyp

Issue 10780026: Add HE AAC support to ISO BMFF. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Remove aac.h. 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
« no previous file with comments | « media/base/bit_reader_unittest.cc ('k') | media/mp4/aac.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 'base/android/media_jni_registrar.h', 128 'base/android/media_jni_registrar.h',
129 'base/audio_decoder.cc', 129 'base/audio_decoder.cc',
130 'base/audio_decoder.h', 130 'base/audio_decoder.h',
131 'base/audio_decoder_config.cc', 131 'base/audio_decoder_config.cc',
132 'base/audio_decoder_config.h', 132 'base/audio_decoder_config.h',
133 'base/audio_renderer.h', 133 'base/audio_renderer.h',
134 'base/audio_renderer_mixer.cc', 134 'base/audio_renderer_mixer.cc',
135 'base/audio_renderer_mixer.h', 135 'base/audio_renderer_mixer.h',
136 'base/audio_renderer_mixer_input.cc', 136 'base/audio_renderer_mixer_input.cc',
137 'base/audio_renderer_mixer_input.h', 137 'base/audio_renderer_mixer_input.h',
138 'base/bit_reader.cc',
139 'base/bit_reader.h',
138 'base/bitstream_buffer.h', 140 'base/bitstream_buffer.h',
139 'base/buffers.cc', 141 'base/buffers.cc',
140 'base/buffers.h', 142 'base/buffers.h',
141 'base/byte_queue.cc', 143 'base/byte_queue.cc',
142 'base/byte_queue.h', 144 'base/byte_queue.h',
143 'base/channel_layout.cc', 145 'base/channel_layout.cc',
144 'base/channel_layout.h', 146 'base/channel_layout.h',
145 'base/clock.cc', 147 'base/clock.cc',
146 'base/clock.h', 148 'base/clock.h',
147 'base/composite_filter.cc', 149 'base/composite_filter.cc',
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 ['OS=="win"', { 451 ['OS=="win"', {
450 'sources!': [ 452 'sources!': [
451 'audio/pulse/pulse_output.cc', 453 'audio/pulse/pulse_output.cc',
452 'audio/pulse/pulse_output.h', 454 'audio/pulse/pulse_output.h',
453 'video/capture/video_capture_device_dummy.cc', 455 'video/capture/video_capture_device_dummy.cc',
454 'video/capture/video_capture_device_dummy.h', 456 'video/capture/video_capture_device_dummy.h',
455 ], 457 ],
456 }], 458 }],
457 ['proprietary_codecs==1 or branding=="Chrome"', { 459 ['proprietary_codecs==1 or branding=="Chrome"', {
458 'sources': [ 460 'sources': [
461 'mp4/aac.cc',
462 'mp4/aac.h',
459 'mp4/avc.cc', 463 'mp4/avc.cc',
460 'mp4/avc.h', 464 'mp4/avc.h',
461 'mp4/box_definitions.cc', 465 'mp4/box_definitions.cc',
462 'mp4/box_definitions.h', 466 'mp4/box_definitions.h',
463 'mp4/box_reader.cc', 467 'mp4/box_reader.cc',
464 'mp4/box_reader.h', 468 'mp4/box_reader.h',
465 'mp4/cenc.cc', 469 'mp4/cenc.cc',
466 'mp4/cenc.h', 470 'mp4/cenc.h',
471 'mp4/es_descriptor.cc',
472 'mp4/es_descriptor.h',
467 'mp4/mp4_stream_parser.cc', 473 'mp4/mp4_stream_parser.cc',
468 'mp4/mp4_stream_parser.h', 474 'mp4/mp4_stream_parser.h',
469 'mp4/offset_byte_queue.cc', 475 'mp4/offset_byte_queue.cc',
470 'mp4/offset_byte_queue.h', 476 'mp4/offset_byte_queue.h',
471 'mp4/track_run_iterator.cc', 477 'mp4/track_run_iterator.cc',
472 'mp4/track_run_iterator.h', 478 'mp4/track_run_iterator.h',
473 ], 479 ],
474 }], 480 }],
475 ], 481 ],
476 }, 482 },
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
662 'audio/cross_process_notification_unittest.cc', 668 'audio/cross_process_notification_unittest.cc',
663 'audio/linux/alsa_output_unittest.cc', 669 'audio/linux/alsa_output_unittest.cc',
664 'audio/mac/audio_low_latency_input_mac_unittest.cc', 670 'audio/mac/audio_low_latency_input_mac_unittest.cc',
665 'audio/mac/audio_output_mac_unittest.cc', 671 'audio/mac/audio_output_mac_unittest.cc',
666 'audio/simple_sources_unittest.cc', 672 'audio/simple_sources_unittest.cc',
667 'audio/win/audio_low_latency_input_win_unittest.cc', 673 'audio/win/audio_low_latency_input_win_unittest.cc',
668 'audio/win/audio_low_latency_output_win_unittest.cc', 674 'audio/win/audio_low_latency_output_win_unittest.cc',
669 'audio/win/audio_output_win_unittest.cc', 675 'audio/win/audio_output_win_unittest.cc',
670 'base/audio_renderer_mixer_unittest.cc', 676 'base/audio_renderer_mixer_unittest.cc',
671 'base/audio_renderer_mixer_input_unittest.cc', 677 'base/audio_renderer_mixer_input_unittest.cc',
678 'base/bit_reader_unittest.cc',
672 'base/buffers_unittest.cc', 679 'base/buffers_unittest.cc',
673 'base/clock_unittest.cc', 680 'base/clock_unittest.cc',
674 'base/composite_filter_unittest.cc', 681 'base/composite_filter_unittest.cc',
675 'base/data_buffer_unittest.cc', 682 'base/data_buffer_unittest.cc',
676 'base/decoder_buffer_unittest.cc', 683 'base/decoder_buffer_unittest.cc',
677 'base/djb2_unittest.cc', 684 'base/djb2_unittest.cc',
678 'base/filter_collection_unittest.cc', 685 'base/filter_collection_unittest.cc',
679 'base/multi_channel_resampler_unittest.cc', 686 'base/multi_channel_resampler_unittest.cc',
680 'base/pipeline_unittest.cc', 687 'base/pipeline_unittest.cc',
681 'base/ranges_unittest.cc', 688 'base/ranges_unittest.cc',
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
764 }], 771 }],
765 ], 772 ],
766 }], 773 }],
767 [ 'target_arch=="ia32" or target_arch=="x64"', { 774 [ 'target_arch=="ia32" or target_arch=="x64"', {
768 'sources': [ 775 'sources': [
769 'base/simd/convert_rgb_to_yuv_unittest.cc', 776 'base/simd/convert_rgb_to_yuv_unittest.cc',
770 ], 777 ],
771 }], 778 }],
772 ['proprietary_codecs==1 or branding=="Chrome"', { 779 ['proprietary_codecs==1 or branding=="Chrome"', {
773 'sources': [ 780 'sources': [
781 'mp4/aac_unittest.cc',
774 'mp4/avc_unittest.cc', 782 'mp4/avc_unittest.cc',
775 'mp4/box_reader_unittest.cc', 783 'mp4/box_reader_unittest.cc',
784 'mp4/es_descriptor_unittest.cc',
776 'mp4/mp4_stream_parser_unittest.cc', 785 'mp4/mp4_stream_parser_unittest.cc',
777 'mp4/offset_byte_queue_unittest.cc', 786 'mp4/offset_byte_queue_unittest.cc',
778 'mp4/track_run_iterator_unittest.cc', 787 'mp4/track_run_iterator_unittest.cc',
779 ], 788 ],
780 }], 789 }],
781 ], 790 ],
782 }, 791 },
783 { 792 {
784 'target_name': 'media_test_support', 793 'target_name': 'media_test_support',
785 'type': 'static_library', 794 'type': 'static_library',
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
1136 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 1145 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
1137 ], 1146 ],
1138 'sources': [ 1147 'sources': [
1139 'tools/media_bench/media_bench.cc', 1148 'tools/media_bench/media_bench.cc',
1140 ], 1149 ],
1141 }, 1150 },
1142 ], 1151 ],
1143 }] 1152 }]
1144 ], 1153 ],
1145 } 1154 }
OLDNEW
« no previous file with comments | « media/base/bit_reader_unittest.cc ('k') | media/mp4/aac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698