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

Side by Side Diff: media/media.gyp

Issue 506943003: Support MPEG1 audio in the MPEG2-TS stream parser. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address CR comments from patch set #5. Created 6 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « media/formats/mpeg/mpeg1_audio_stream_parser_unittest.cc ('k') | no next file » | 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 cras (ChromeOS audio) library. 8 # Override to dynamically link the cras (ChromeOS audio) library.
9 'use_cras%': 0, 9 'use_cras%': 0,
10 # Option e.g. for Linux distributions to link pulseaudio directly 10 # Option e.g. for Linux distributions to link pulseaudio directly
(...skipping 915 matching lines...) Expand 10 before | Expand all | Expand 10 after
926 'filters/h264_to_annex_b_bitstream_converter.cc', 926 'filters/h264_to_annex_b_bitstream_converter.cc',
927 'filters/h264_to_annex_b_bitstream_converter.h', 927 'filters/h264_to_annex_b_bitstream_converter.h',
928 'formats/mp2t/es_adapter_video.cc', 928 'formats/mp2t/es_adapter_video.cc',
929 'formats/mp2t/es_adapter_video.h', 929 'formats/mp2t/es_adapter_video.h',
930 'formats/mp2t/es_parser.cc', 930 'formats/mp2t/es_parser.cc',
931 'formats/mp2t/es_parser.h', 931 'formats/mp2t/es_parser.h',
932 'formats/mp2t/es_parser_adts.cc', 932 'formats/mp2t/es_parser_adts.cc',
933 'formats/mp2t/es_parser_adts.h', 933 'formats/mp2t/es_parser_adts.h',
934 'formats/mp2t/es_parser_h264.cc', 934 'formats/mp2t/es_parser_h264.cc',
935 'formats/mp2t/es_parser_h264.h', 935 'formats/mp2t/es_parser_h264.h',
936 'formats/mp2t/es_parser_mpeg1audio.cc',
937 'formats/mp2t/es_parser_mpeg1audio.h',
936 'formats/mp2t/mp2t_common.h', 938 'formats/mp2t/mp2t_common.h',
937 'formats/mp2t/mp2t_stream_parser.cc', 939 'formats/mp2t/mp2t_stream_parser.cc',
938 'formats/mp2t/mp2t_stream_parser.h', 940 'formats/mp2t/mp2t_stream_parser.h',
939 'formats/mp2t/ts_packet.cc', 941 'formats/mp2t/ts_packet.cc',
940 'formats/mp2t/ts_packet.h', 942 'formats/mp2t/ts_packet.h',
941 'formats/mp2t/ts_section.h', 943 'formats/mp2t/ts_section.h',
942 'formats/mp2t/ts_section_pat.cc', 944 'formats/mp2t/ts_section_pat.cc',
943 'formats/mp2t/ts_section_pat.h', 945 'formats/mp2t/ts_section_pat.h',
944 'formats/mp2t/ts_section_pes.cc', 946 'formats/mp2t/ts_section_pes.cc',
945 'formats/mp2t/ts_section_pes.h', 947 'formats/mp2t/ts_section_pes.h',
(...skipping 16 matching lines...) Expand all
962 'formats/mp4/mp4_stream_parser.cc', 964 'formats/mp4/mp4_stream_parser.cc',
963 'formats/mp4/mp4_stream_parser.h', 965 'formats/mp4/mp4_stream_parser.h',
964 'formats/mp4/sample_to_group_iterator.cc', 966 'formats/mp4/sample_to_group_iterator.cc',
965 'formats/mp4/sample_to_group_iterator.h', 967 'formats/mp4/sample_to_group_iterator.h',
966 'formats/mp4/track_run_iterator.cc', 968 'formats/mp4/track_run_iterator.cc',
967 'formats/mp4/track_run_iterator.h', 969 'formats/mp4/track_run_iterator.h',
968 'formats/mpeg/adts_constants.cc', 970 'formats/mpeg/adts_constants.cc',
969 'formats/mpeg/adts_constants.h', 971 'formats/mpeg/adts_constants.h',
970 'formats/mpeg/adts_stream_parser.cc', 972 'formats/mpeg/adts_stream_parser.cc',
971 'formats/mpeg/adts_stream_parser.h', 973 'formats/mpeg/adts_stream_parser.h',
972 'formats/mpeg/mp3_stream_parser.cc',
973 'formats/mpeg/mp3_stream_parser.h',
974 'formats/mpeg/mpeg_audio_stream_parser_base.cc', 974 'formats/mpeg/mpeg_audio_stream_parser_base.cc',
975 'formats/mpeg/mpeg_audio_stream_parser_base.h', 975 'formats/mpeg/mpeg_audio_stream_parser_base.h',
976 'formats/mpeg/mpeg1_audio_stream_parser.cc',
977 'formats/mpeg/mpeg1_audio_stream_parser.h',
976 ], 978 ],
977 }], 979 }],
978 ['target_arch=="ia32" or target_arch=="x64"', { 980 ['target_arch=="ia32" or target_arch=="x64"', {
979 'dependencies': [ 981 'dependencies': [
980 'media_asm', 982 'media_asm',
981 'media_sse2', 983 'media_sse2',
982 ], 984 ],
983 'sources': [ 985 'sources': [
984 'base/simd/convert_yuv_to_rgb_x86.cc', 986 'base/simd/convert_yuv_to_rgb_x86.cc',
985 ], 987 ],
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after
1311 }], 1313 }],
1312 ['proprietary_codecs==1', { 1314 ['proprietary_codecs==1', {
1313 'sources': [ 1315 'sources': [
1314 'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc', 1316 'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc',
1315 'filters/h264_to_annex_b_bitstream_converter_unittest.cc', 1317 'filters/h264_to_annex_b_bitstream_converter_unittest.cc',
1316 'formats/common/stream_parser_test_base.cc', 1318 'formats/common/stream_parser_test_base.cc',
1317 'formats/common/stream_parser_test_base.h', 1319 'formats/common/stream_parser_test_base.h',
1318 'formats/mp2t/es_adapter_video_unittest.cc', 1320 'formats/mp2t/es_adapter_video_unittest.cc',
1319 'formats/mp2t/es_parser_adts_unittest.cc', 1321 'formats/mp2t/es_parser_adts_unittest.cc',
1320 'formats/mp2t/es_parser_h264_unittest.cc', 1322 'formats/mp2t/es_parser_h264_unittest.cc',
1323 'formats/mp2t/es_parser_mpeg1audio_unittest.cc',
1321 'formats/mp2t/es_parser_test_base.cc', 1324 'formats/mp2t/es_parser_test_base.cc',
1322 'formats/mp2t/es_parser_test_base.h', 1325 'formats/mp2t/es_parser_test_base.h',
1323 'formats/mp2t/mp2t_stream_parser_unittest.cc', 1326 'formats/mp2t/mp2t_stream_parser_unittest.cc',
1324 'formats/mp4/aac_unittest.cc', 1327 'formats/mp4/aac_unittest.cc',
1325 'formats/mp4/avc_unittest.cc', 1328 'formats/mp4/avc_unittest.cc',
1326 'formats/mp4/box_reader_unittest.cc', 1329 'formats/mp4/box_reader_unittest.cc',
1327 'formats/mp4/es_descriptor_unittest.cc', 1330 'formats/mp4/es_descriptor_unittest.cc',
1328 'formats/mp4/mp4_stream_parser_unittest.cc', 1331 'formats/mp4/mp4_stream_parser_unittest.cc',
1329 'formats/mp4/sample_to_group_iterator_unittest.cc', 1332 'formats/mp4/sample_to_group_iterator_unittest.cc',
1330 'formats/mp4/track_run_iterator_unittest.cc', 1333 'formats/mp4/track_run_iterator_unittest.cc',
1331 'formats/mpeg/adts_stream_parser_unittest.cc', 1334 'formats/mpeg/adts_stream_parser_unittest.cc',
1332 'formats/mpeg/mp3_stream_parser_unittest.cc', 1335 'formats/mpeg/mpeg1_audio_stream_parser_unittest.cc',
1333 ], 1336 ],
1334 }], 1337 }],
1335 # TODO(wolenetz): Fix size_t to int truncations in win64. See 1338 # TODO(wolenetz): Fix size_t to int truncations in win64. See
1336 # http://crbug.com/171009 1339 # http://crbug.com/171009
1337 ['OS=="win" and target_arch=="x64"', { 1340 ['OS=="win" and target_arch=="x64"', {
1338 'msvs_disabled_warnings': [ 4267, ], 1341 'msvs_disabled_warnings': [ 4267, ],
1339 }], 1342 }],
1340 ['OS=="mac"', { 1343 ['OS=="mac"', {
1341 'sources': [ 1344 'sources': [
1342 'video/capture/mac/video_capture_device_factory_mac_unittest.mm', 1345 'video/capture/mac/video_capture_device_factory_mac_unittest.mm',
(...skipping 460 matching lines...) Expand 10 before | Expand all | Expand 10 after
1803 ], 1806 ],
1804 }], 1807 }],
1805 ], 1808 ],
1806 }], 1809 }],
1807 ], 1810 ],
1808 }, 1811 },
1809 ], 1812 ],
1810 }], 1813 }],
1811 ], 1814 ],
1812 } 1815 }
OLDNEW
« no previous file with comments | « media/formats/mpeg/mpeg1_audio_stream_parser_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698