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

Side by Side Diff: media/media.gyp

Issue 10710002: Add HE AAC support to ISO BMFF. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Add unittest for 5.1 channel. 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 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 'audio/win/wavein_input_win.h', 122 'audio/win/wavein_input_win.h',
123 'audio/win/waveout_output_win.cc', 123 'audio/win/waveout_output_win.cc',
124 'audio/win/waveout_output_win.h', 124 'audio/win/waveout_output_win.h',
125 'base/android/media_jni_registrar.cc', 125 'base/android/media_jni_registrar.cc',
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/bit_reader.cc',
133 'base/bit_reader.h',
132 'base/bitstream_buffer.h', 134 'base/bitstream_buffer.h',
133 'base/buffers.cc', 135 'base/buffers.cc',
134 'base/buffers.h', 136 'base/buffers.h',
135 'base/byte_queue.cc', 137 'base/byte_queue.cc',
136 'base/byte_queue.h', 138 'base/byte_queue.h',
137 'base/channel_layout.cc', 139 'base/channel_layout.cc',
138 'base/channel_layout.h', 140 'base/channel_layout.h',
139 'base/clock.cc', 141 'base/clock.cc',
140 'base/clock.h', 142 'base/clock.h',
141 'base/composite_filter.cc', 143 'base/composite_filter.cc',
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 ['OS=="win"', { 443 ['OS=="win"', {
442 'sources!': [ 444 'sources!': [
443 'audio/pulse/pulse_output.cc', 445 'audio/pulse/pulse_output.cc',
444 'audio/pulse/pulse_output.h', 446 'audio/pulse/pulse_output.h',
445 'video/capture/video_capture_device_dummy.cc', 447 'video/capture/video_capture_device_dummy.cc',
446 'video/capture/video_capture_device_dummy.h', 448 'video/capture/video_capture_device_dummy.h',
447 ], 449 ],
448 }], 450 }],
449 ['proprietary_codecs==1 or branding=="Chrome"', { 451 ['proprietary_codecs==1 or branding=="Chrome"', {
450 'sources': [ 452 'sources': [
453 'mp4/aac.cc',
454 'mp4/aac.h',
451 'mp4/avc.cc', 455 'mp4/avc.cc',
452 'mp4/avc.h', 456 'mp4/avc.h',
453 'mp4/box_definitions.cc', 457 'mp4/box_definitions.cc',
454 'mp4/box_definitions.h', 458 'mp4/box_definitions.h',
455 'mp4/box_reader.cc', 459 'mp4/box_reader.cc',
456 'mp4/box_reader.h', 460 'mp4/box_reader.h',
457 'mp4/cenc.cc', 461 'mp4/cenc.cc',
458 'mp4/cenc.h', 462 'mp4/cenc.h',
459 'mp4/mp4_stream_parser.cc', 463 'mp4/mp4_stream_parser.cc',
460 'mp4/mp4_stream_parser.h', 464 'mp4/mp4_stream_parser.h',
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
652 'audio/audio_parameters_unittest.cc', 656 'audio/audio_parameters_unittest.cc',
653 'audio/audio_util_unittest.cc', 657 'audio/audio_util_unittest.cc',
654 'audio/cross_process_notification_unittest.cc', 658 'audio/cross_process_notification_unittest.cc',
655 'audio/linux/alsa_output_unittest.cc', 659 'audio/linux/alsa_output_unittest.cc',
656 'audio/mac/audio_low_latency_input_mac_unittest.cc', 660 'audio/mac/audio_low_latency_input_mac_unittest.cc',
657 'audio/mac/audio_output_mac_unittest.cc', 661 'audio/mac/audio_output_mac_unittest.cc',
658 'audio/simple_sources_unittest.cc', 662 'audio/simple_sources_unittest.cc',
659 'audio/win/audio_low_latency_input_win_unittest.cc', 663 'audio/win/audio_low_latency_input_win_unittest.cc',
660 'audio/win/audio_low_latency_output_win_unittest.cc', 664 'audio/win/audio_low_latency_output_win_unittest.cc',
661 'audio/win/audio_output_win_unittest.cc', 665 'audio/win/audio_output_win_unittest.cc',
666 'base/bit_reader_unittest.cc',
662 'base/buffers_unittest.cc', 667 'base/buffers_unittest.cc',
663 'base/clock_unittest.cc', 668 'base/clock_unittest.cc',
664 'base/composite_filter_unittest.cc', 669 'base/composite_filter_unittest.cc',
665 'base/data_buffer_unittest.cc', 670 'base/data_buffer_unittest.cc',
666 'base/decoder_buffer_unittest.cc', 671 'base/decoder_buffer_unittest.cc',
667 'base/djb2_unittest.cc', 672 'base/djb2_unittest.cc',
668 'base/filter_collection_unittest.cc', 673 'base/filter_collection_unittest.cc',
669 'base/h264_bitstream_converter_unittest.cc', 674 'base/h264_bitstream_converter_unittest.cc',
670 'base/pipeline_unittest.cc', 675 'base/pipeline_unittest.cc',
671 'base/ranges_unittest.cc', 676 'base/ranges_unittest.cc',
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
747 }], 752 }],
748 ], 753 ],
749 }], 754 }],
750 [ 'target_arch=="ia32" or target_arch=="x64"', { 755 [ 'target_arch=="ia32" or target_arch=="x64"', {
751 'sources': [ 756 'sources': [
752 'base/simd/convert_rgb_to_yuv_unittest.cc', 757 'base/simd/convert_rgb_to_yuv_unittest.cc',
753 ], 758 ],
754 }], 759 }],
755 ['proprietary_codecs==1 or branding=="Chrome"', { 760 ['proprietary_codecs==1 or branding=="Chrome"', {
756 'sources': [ 761 'sources': [
762 'mp4/aac_unittest.cc',
757 'mp4/avc_unittest.cc', 763 'mp4/avc_unittest.cc',
758 'mp4/box_reader_unittest.cc', 764 'mp4/box_reader_unittest.cc',
759 'mp4/mp4_stream_parser_unittest.cc', 765 'mp4/mp4_stream_parser_unittest.cc',
760 'mp4/offset_byte_queue_unittest.cc', 766 'mp4/offset_byte_queue_unittest.cc',
761 ], 767 ],
762 }], 768 }],
763 ], 769 ],
764 }, 770 },
765 { 771 {
766 'target_name': 'media_test_support', 772 'target_name': 'media_test_support',
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
1088 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 1094 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
1089 ], 1095 ],
1090 'sources': [ 1096 'sources': [
1091 'tools/media_bench/media_bench.cc', 1097 'tools/media_bench/media_bench.cc',
1092 ], 1098 ],
1093 }, 1099 },
1094 ], 1100 ],
1095 }] 1101 }]
1096 ], 1102 ],
1097 } 1103 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698