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

Side by Side Diff: media/BUILD.gn

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 | « no previous file | media/filters/stream_parser_factory.cc » ('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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 import("//build/config/android/config.gni") 5 import("//build/config/android/config.gni")
6 import("//build/config/arm.gni") 6 import("//build/config/arm.gni")
7 import("//build/config/ui.gni") 7 import("//build/config/ui.gni")
8 import("//build/config/linux/pkg_config.gni") 8 import("//build/config/linux/pkg_config.gni")
9 import("//media/media_options.gni") 9 import("//media/media_options.gni")
10 10
(...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 if (proprietary_codecs) { 362 if (proprietary_codecs) {
363 sources += [ 363 sources += [
364 "formats/mp2t/es_adapter_video.cc", 364 "formats/mp2t/es_adapter_video.cc",
365 "formats/mp2t/es_adapter_video.h", 365 "formats/mp2t/es_adapter_video.h",
366 "formats/mp2t/es_parser.cc", 366 "formats/mp2t/es_parser.cc",
367 "formats/mp2t/es_parser.h", 367 "formats/mp2t/es_parser.h",
368 "formats/mp2t/es_parser_adts.cc", 368 "formats/mp2t/es_parser_adts.cc",
369 "formats/mp2t/es_parser_adts.h", 369 "formats/mp2t/es_parser_adts.h",
370 "formats/mp2t/es_parser_h264.cc", 370 "formats/mp2t/es_parser_h264.cc",
371 "formats/mp2t/es_parser_h264.h", 371 "formats/mp2t/es_parser_h264.h",
372 "formats/mp2t/es_parser_mpeg1audio.cc",
373 "formats/mp2t/es_parser_mpeg1audio.h",
372 "formats/mp2t/mp2t_common.h", 374 "formats/mp2t/mp2t_common.h",
373 "formats/mp2t/mp2t_stream_parser.cc", 375 "formats/mp2t/mp2t_stream_parser.cc",
374 "formats/mp2t/mp2t_stream_parser.h", 376 "formats/mp2t/mp2t_stream_parser.h",
375 "formats/mp2t/ts_packet.cc", 377 "formats/mp2t/ts_packet.cc",
376 "formats/mp2t/ts_packet.h", 378 "formats/mp2t/ts_packet.h",
377 "formats/mp2t/ts_section.h", 379 "formats/mp2t/ts_section.h",
378 "formats/mp2t/ts_section_pat.cc", 380 "formats/mp2t/ts_section_pat.cc",
379 "formats/mp2t/ts_section_pat.h", 381 "formats/mp2t/ts_section_pat.h",
380 "formats/mp2t/ts_section_pes.cc", 382 "formats/mp2t/ts_section_pes.cc",
381 "formats/mp2t/ts_section_pes.h", 383 "formats/mp2t/ts_section_pes.h",
(...skipping 16 matching lines...) Expand all
398 "formats/mp4/mp4_stream_parser.cc", 400 "formats/mp4/mp4_stream_parser.cc",
399 "formats/mp4/mp4_stream_parser.h", 401 "formats/mp4/mp4_stream_parser.h",
400 "formats/mp4/sample_to_group_iterator.cc", 402 "formats/mp4/sample_to_group_iterator.cc",
401 "formats/mp4/sample_to_group_iterator.h", 403 "formats/mp4/sample_to_group_iterator.h",
402 "formats/mp4/track_run_iterator.cc", 404 "formats/mp4/track_run_iterator.cc",
403 "formats/mp4/track_run_iterator.h", 405 "formats/mp4/track_run_iterator.h",
404 "formats/mpeg/adts_constants.cc", 406 "formats/mpeg/adts_constants.cc",
405 "formats/mpeg/adts_constants.h", 407 "formats/mpeg/adts_constants.h",
406 "formats/mpeg/adts_stream_parser.cc", 408 "formats/mpeg/adts_stream_parser.cc",
407 "formats/mpeg/adts_stream_parser.h", 409 "formats/mpeg/adts_stream_parser.h",
408 "formats/mpeg/mp3_stream_parser.cc",
409 "formats/mpeg/mp3_stream_parser.h",
410 "formats/mpeg/mpeg_audio_stream_parser_base.cc", 410 "formats/mpeg/mpeg_audio_stream_parser_base.cc",
411 "formats/mpeg/mpeg_audio_stream_parser_base.h", 411 "formats/mpeg/mpeg_audio_stream_parser_base.h",
412 "formats/mpeg/mpeg1_audio_stream_parser.cc",
413 "formats/mpeg/mpeg1_audio_stream_parser.h",
412 ] 414 ]
413 } 415 }
414 416
415 deps += [ 417 deps += [
416 ":shared_memory_support", 418 ":shared_memory_support",
417 "//base", 419 "//base",
418 "//base:i18n", 420 "//base:i18n",
419 "//base/third_party/dynamic_annotations", 421 "//base/third_party/dynamic_annotations",
420 "//crypto", 422 "//crypto",
421 "//crypto:platform", # TODO(ajwong): This used to be provided by crypto.gyp via export_dependent_settings 423 "//crypto:platform", # TODO(ajwong): This used to be provided by crypto.gyp via export_dependent_settings
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
529 531
530 if (proprietary_codecs) { 532 if (proprietary_codecs) {
531 sources += [ 533 sources += [
532 "filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc", 534 "filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc",
533 "filters/h264_to_annex_b_bitstream_converter_unittest.cc", 535 "filters/h264_to_annex_b_bitstream_converter_unittest.cc",
534 "formats/common/stream_parser_test_base.cc", 536 "formats/common/stream_parser_test_base.cc",
535 "formats/common/stream_parser_test_base.h", 537 "formats/common/stream_parser_test_base.h",
536 "formats/mp2t/es_adapter_video_unittest.cc", 538 "formats/mp2t/es_adapter_video_unittest.cc",
537 "formats/mp2t/es_parser_adts_unittest.cc", 539 "formats/mp2t/es_parser_adts_unittest.cc",
538 "formats/mp2t/es_parser_h264_unittest.cc", 540 "formats/mp2t/es_parser_h264_unittest.cc",
541 "formats/mp2t/es_parser_mpeg1audio_unittest.cc",
539 "formats/mp2t/es_parser_test_base.cc", 542 "formats/mp2t/es_parser_test_base.cc",
540 "formats/mp2t/es_parser_test_base.h", 543 "formats/mp2t/es_parser_test_base.h",
541 "formats/mp2t/mp2t_stream_parser_unittest.cc", 544 "formats/mp2t/mp2t_stream_parser_unittest.cc",
542 "formats/mp4/aac_unittest.cc", 545 "formats/mp4/aac_unittest.cc",
543 "formats/mp4/avc_unittest.cc", 546 "formats/mp4/avc_unittest.cc",
544 "formats/mp4/box_reader_unittest.cc", 547 "formats/mp4/box_reader_unittest.cc",
545 "formats/mp4/es_descriptor_unittest.cc", 548 "formats/mp4/es_descriptor_unittest.cc",
546 "formats/mp4/mp4_stream_parser_unittest.cc", 549 "formats/mp4/mp4_stream_parser_unittest.cc",
547 "formats/mp4/sample_to_group_iterator_unittest.cc", 550 "formats/mp4/sample_to_group_iterator_unittest.cc",
548 "formats/mp4/track_run_iterator_unittest.cc", 551 "formats/mp4/track_run_iterator_unittest.cc",
549 "formats/mpeg/adts_stream_parser_unittest.cc", 552 "formats/mpeg/adts_stream_parser_unittest.cc",
550 "formats/mpeg/mp3_stream_parser_unittest.cc", 553 "formats/mpeg/mpeg1_audio_stream_parser_unittest.cc",
551 ] 554 ]
552 } 555 }
553 556
554 if (is_win && cpu_arch == "x64") { 557 if (is_win && cpu_arch == "x64") {
555 cflags += [ 558 cflags += [
556 "/wd4267" # TODO(wolenetz): Fix size_t to int trunctaion in win64. See 559 "/wd4267" # TODO(wolenetz): Fix size_t to int trunctaion in win64. See
557 # http://crbug.com/171009 560 # http://crbug.com/171009
558 ] 561 ]
559 } 562 }
560 563
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
720 deps = [ 723 deps = [
721 ":media", 724 ":media",
722 ":shared_memory_support", 725 ":shared_memory_support",
723 "//base", 726 "//base",
724 "//ui/gl", 727 "//ui/gl",
725 "//ui/gfx", 728 "//ui/gfx",
726 "//ui/gfx/geometry", 729 "//ui/gfx/geometry",
727 ] 730 ]
728 } 731 }
729 } 732 }
OLDNEW
« no previous file with comments | « no previous file | media/filters/stream_parser_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698