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

Side by Side Diff: media/media.gyp

Issue 691233002: Added aac bitstream converter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Figured it out Created 6 years, 1 month 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 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 391 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 'filters/decoder_stream_traits.cc', 402 'filters/decoder_stream_traits.cc',
403 'filters/decoder_stream_traits.h', 403 'filters/decoder_stream_traits.h',
404 'filters/decrypting_audio_decoder.cc', 404 'filters/decrypting_audio_decoder.cc',
405 'filters/decrypting_audio_decoder.h', 405 'filters/decrypting_audio_decoder.h',
406 'filters/decrypting_demuxer_stream.cc', 406 'filters/decrypting_demuxer_stream.cc',
407 'filters/decrypting_demuxer_stream.h', 407 'filters/decrypting_demuxer_stream.h',
408 'filters/decrypting_video_decoder.cc', 408 'filters/decrypting_video_decoder.cc',
409 'filters/decrypting_video_decoder.h', 409 'filters/decrypting_video_decoder.h',
410 'filters/ffmpeg_audio_decoder.cc', 410 'filters/ffmpeg_audio_decoder.cc',
411 'filters/ffmpeg_audio_decoder.h', 411 'filters/ffmpeg_audio_decoder.h',
412 'filters/ffmpeg_bitstream_converter.h',
412 'filters/ffmpeg_demuxer.cc', 413 'filters/ffmpeg_demuxer.cc',
413 'filters/ffmpeg_demuxer.h', 414 'filters/ffmpeg_demuxer.h',
414 'filters/ffmpeg_glue.cc', 415 'filters/ffmpeg_glue.cc',
415 'filters/ffmpeg_glue.h', 416 'filters/ffmpeg_glue.h',
416 'filters/ffmpeg_video_decoder.cc', 417 'filters/ffmpeg_video_decoder.cc',
417 'filters/ffmpeg_video_decoder.h', 418 'filters/ffmpeg_video_decoder.h',
418 'filters/file_data_source.cc', 419 'filters/file_data_source.cc',
419 'filters/file_data_source.h', 420 'filters/file_data_source.h',
420 'filters/frame_processor.cc', 421 'filters/frame_processor.cc',
421 'filters/frame_processor.h', 422 'filters/frame_processor.h',
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
597 'base/container_names.h', 598 'base/container_names.h',
598 'base/media_file_checker.cc', 599 'base/media_file_checker.cc',
599 'base/media_file_checker.h', 600 'base/media_file_checker.h',
600 'base/media_posix.cc', 601 'base/media_posix.cc',
601 'ffmpeg/ffmpeg_common.cc', 602 'ffmpeg/ffmpeg_common.cc',
602 'ffmpeg/ffmpeg_common.h', 603 'ffmpeg/ffmpeg_common.h',
603 'filters/audio_file_reader.cc', 604 'filters/audio_file_reader.cc',
604 'filters/audio_file_reader.h', 605 'filters/audio_file_reader.h',
605 'filters/blocking_url_protocol.cc', 606 'filters/blocking_url_protocol.cc',
606 'filters/blocking_url_protocol.h', 607 'filters/blocking_url_protocol.h',
608 'filters/ffmpeg_aac_bitstream_converter.cc',
609 'filters/ffmpeg_aac_bitstream_converter.h',
607 'filters/ffmpeg_audio_decoder.cc', 610 'filters/ffmpeg_audio_decoder.cc',
608 'filters/ffmpeg_audio_decoder.h', 611 'filters/ffmpeg_audio_decoder.h',
612 'filters/ffmpeg_bitstream_converter.h',
609 'filters/ffmpeg_demuxer.cc', 613 'filters/ffmpeg_demuxer.cc',
610 'filters/ffmpeg_demuxer.h', 614 'filters/ffmpeg_demuxer.h',
611 'filters/ffmpeg_glue.cc', 615 'filters/ffmpeg_glue.cc',
612 'filters/ffmpeg_glue.h', 616 'filters/ffmpeg_glue.h',
613 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc', 617 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc',
614 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.h', 618 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.h',
615 'filters/ffmpeg_video_decoder.cc', 619 'filters/ffmpeg_video_decoder.cc',
616 'filters/ffmpeg_video_decoder.h', 620 'filters/ffmpeg_video_decoder.h',
617 'filters/in_memory_url_protocol.cc', 621 'filters/in_memory_url_protocol.cc',
618 'filters/in_memory_url_protocol.h', 622 'filters/in_memory_url_protocol.h',
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
929 # TODO(wolenetz): Fix size_t to int truncations in win64. See 933 # TODO(wolenetz): Fix size_t to int truncations in win64. See
930 # http://crbug.com/171009 934 # http://crbug.com/171009
931 'conditions': [ 935 'conditions': [
932 ['target_arch=="x64"', { 936 ['target_arch=="x64"', {
933 'msvs_disabled_warnings': [ 4267, ], 937 'msvs_disabled_warnings': [ 4267, ],
934 }], 938 }],
935 ], 939 ],
936 }], 940 }],
937 ['proprietary_codecs==1', { 941 ['proprietary_codecs==1', {
938 'sources': [ 942 'sources': [
943 'filters/ffmpeg_aac_bitstream_converter.cc',
944 'filters/ffmpeg_aac_bitstream_converter.h',
939 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc', 945 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc',
940 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.h', 946 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.h',
941 'filters/h264_to_annex_b_bitstream_converter.cc', 947 'filters/h264_to_annex_b_bitstream_converter.cc',
942 'filters/h264_to_annex_b_bitstream_converter.h', 948 'filters/h264_to_annex_b_bitstream_converter.h',
943 'formats/mp2t/es_adapter_video.cc', 949 'formats/mp2t/es_adapter_video.cc',
944 'formats/mp2t/es_adapter_video.h', 950 'formats/mp2t/es_adapter_video.h',
945 'formats/mp2t/es_parser.cc', 951 'formats/mp2t/es_parser.cc',
946 'formats/mp2t/es_parser.h', 952 'formats/mp2t/es_parser.h',
947 'formats/mp2t/es_parser_adts.cc', 953 'formats/mp2t/es_parser_adts.cc',
948 'formats/mp2t/es_parser_adts.h', 954 'formats/mp2t/es_parser_adts.h',
(...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after
1326 ], 1332 ],
1327 }, { # media_use_ffmpeg== 0 1333 }, { # media_use_ffmpeg== 0
1328 'sources!': [ 1334 'sources!': [
1329 'base/audio_video_metadata_extractor_unittest.cc', 1335 'base/audio_video_metadata_extractor_unittest.cc',
1330 'base/container_names_unittest.cc', 1336 'base/container_names_unittest.cc',
1331 'base/media_file_checker_unittest.cc', 1337 'base/media_file_checker_unittest.cc',
1332 'ffmpeg/ffmpeg_common_unittest.cc', 1338 'ffmpeg/ffmpeg_common_unittest.cc',
1333 'filters/audio_decoder_unittest.cc', 1339 'filters/audio_decoder_unittest.cc',
1334 'filters/audio_file_reader_unittest.cc', 1340 'filters/audio_file_reader_unittest.cc',
1335 'filters/blocking_url_protocol_unittest.cc', 1341 'filters/blocking_url_protocol_unittest.cc',
1342 'filters/ffmpeg_aac_bitstream_converter_unittest.cc',
1336 'filters/ffmpeg_demuxer_unittest.cc', 1343 'filters/ffmpeg_demuxer_unittest.cc',
1337 'filters/ffmpeg_glue_unittest.cc', 1344 'filters/ffmpeg_glue_unittest.cc',
1338 'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc', 1345 'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc',
1339 'filters/ffmpeg_video_decoder_unittest.cc', 1346 'filters/ffmpeg_video_decoder_unittest.cc',
1340 'filters/in_memory_url_protocol_unittest.cc', 1347 'filters/in_memory_url_protocol_unittest.cc',
1341 'filters/pipeline_integration_test.cc', 1348 'filters/pipeline_integration_test.cc',
1342 'filters/pipeline_integration_test_base.cc', 1349 'filters/pipeline_integration_test_base.cc',
1343 ], 1350 ],
1344 }], 1351 }],
1345 ['use_alsa==1', { 1352 ['use_alsa==1', {
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
1394 'audio/audio_low_latency_input_output_unittest.cc', 1401 'audio/audio_low_latency_input_output_unittest.cc',
1395 ], 1402 ],
1396 }], 1403 }],
1397 ['target_arch=="ia32" or target_arch=="x64"', { 1404 ['target_arch=="ia32" or target_arch=="x64"', {
1398 'sources': [ 1405 'sources': [
1399 'base/simd/convert_rgb_to_yuv_unittest.cc', 1406 'base/simd/convert_rgb_to_yuv_unittest.cc',
1400 ], 1407 ],
1401 }], 1408 }],
1402 ['proprietary_codecs==1', { 1409 ['proprietary_codecs==1', {
1403 'sources': [ 1410 'sources': [
1411 'filters/ffmpeg_aac_bitstream_converter_unittest.cc',
1404 'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc', 1412 'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc',
1405 'filters/h264_to_annex_b_bitstream_converter_unittest.cc', 1413 'filters/h264_to_annex_b_bitstream_converter_unittest.cc',
1406 'formats/common/stream_parser_test_base.cc', 1414 'formats/common/stream_parser_test_base.cc',
1407 'formats/common/stream_parser_test_base.h', 1415 'formats/common/stream_parser_test_base.h',
1408 'formats/mp2t/es_adapter_video_unittest.cc', 1416 'formats/mp2t/es_adapter_video_unittest.cc',
1409 'formats/mp2t/es_parser_adts_unittest.cc', 1417 'formats/mp2t/es_parser_adts_unittest.cc',
1410 'formats/mp2t/es_parser_h264_unittest.cc', 1418 'formats/mp2t/es_parser_h264_unittest.cc',
1411 'formats/mp2t/es_parser_mpeg1audio_unittest.cc', 1419 'formats/mp2t/es_parser_mpeg1audio_unittest.cc',
1412 'formats/mp2t/es_parser_test_base.cc', 1420 'formats/mp2t/es_parser_test_base.cc',
1413 'formats/mp2t/es_parser_test_base.h', 1421 'formats/mp2t/es_parser_test_base.h',
(...skipping 562 matching lines...) Expand 10 before | Expand all | Expand 10 after
1976 '../build/isolate.gypi', 1984 '../build/isolate.gypi',
1977 ], 1985 ],
1978 'sources': [ 1986 'sources': [
1979 'media_unittests.isolate', 1987 'media_unittests.isolate',
1980 ], 1988 ],
1981 }, 1989 },
1982 ], 1990 ],
1983 }], 1991 }],
1984 ], 1992 ],
1985 } 1993 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698