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

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 #4 and Rebase. 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
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 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 if (proprietary_codecs) { 356 if (proprietary_codecs) {
357 sources += [ 357 sources += [
358 "formats/mp2t/es_adapter_video.cc", 358 "formats/mp2t/es_adapter_video.cc",
359 "formats/mp2t/es_adapter_video.h", 359 "formats/mp2t/es_adapter_video.h",
360 "formats/mp2t/es_parser.cc", 360 "formats/mp2t/es_parser.cc",
361 "formats/mp2t/es_parser.h", 361 "formats/mp2t/es_parser.h",
362 "formats/mp2t/es_parser_adts.cc", 362 "formats/mp2t/es_parser_adts.cc",
363 "formats/mp2t/es_parser_adts.h", 363 "formats/mp2t/es_parser_adts.h",
364 "formats/mp2t/es_parser_h264.cc", 364 "formats/mp2t/es_parser_h264.cc",
365 "formats/mp2t/es_parser_h264.h", 365 "formats/mp2t/es_parser_h264.h",
366 "formats/mp2t/es_parser_mpeg1audio.cc",
367 "formats/mp2t/es_parser_mpeg1audio.h",
366 "formats/mp2t/mp2t_common.h", 368 "formats/mp2t/mp2t_common.h",
367 "formats/mp2t/mp2t_stream_parser.cc", 369 "formats/mp2t/mp2t_stream_parser.cc",
368 "formats/mp2t/mp2t_stream_parser.h", 370 "formats/mp2t/mp2t_stream_parser.h",
369 "formats/mp2t/ts_packet.cc", 371 "formats/mp2t/ts_packet.cc",
370 "formats/mp2t/ts_packet.h", 372 "formats/mp2t/ts_packet.h",
371 "formats/mp2t/ts_section.h", 373 "formats/mp2t/ts_section.h",
372 "formats/mp2t/ts_section_pat.cc", 374 "formats/mp2t/ts_section_pat.cc",
373 "formats/mp2t/ts_section_pat.h", 375 "formats/mp2t/ts_section_pat.h",
374 "formats/mp2t/ts_section_pes.cc", 376 "formats/mp2t/ts_section_pes.cc",
375 "formats/mp2t/ts_section_pes.h", 377 "formats/mp2t/ts_section_pes.h",
(...skipping 16 matching lines...) Expand all
392 "formats/mp4/mp4_stream_parser.cc", 394 "formats/mp4/mp4_stream_parser.cc",
393 "formats/mp4/mp4_stream_parser.h", 395 "formats/mp4/mp4_stream_parser.h",
394 "formats/mp4/sample_to_group_iterator.cc", 396 "formats/mp4/sample_to_group_iterator.cc",
395 "formats/mp4/sample_to_group_iterator.h", 397 "formats/mp4/sample_to_group_iterator.h",
396 "formats/mp4/track_run_iterator.cc", 398 "formats/mp4/track_run_iterator.cc",
397 "formats/mp4/track_run_iterator.h", 399 "formats/mp4/track_run_iterator.h",
398 "formats/mpeg/adts_constants.cc", 400 "formats/mpeg/adts_constants.cc",
399 "formats/mpeg/adts_constants.h", 401 "formats/mpeg/adts_constants.h",
400 "formats/mpeg/adts_stream_parser.cc", 402 "formats/mpeg/adts_stream_parser.cc",
401 "formats/mpeg/adts_stream_parser.h", 403 "formats/mpeg/adts_stream_parser.h",
402 "formats/mpeg/mp3_stream_parser.cc",
403 "formats/mpeg/mp3_stream_parser.h",
404 "formats/mpeg/mpeg_audio_stream_parser_base.cc", 404 "formats/mpeg/mpeg_audio_stream_parser_base.cc",
405 "formats/mpeg/mpeg_audio_stream_parser_base.h", 405 "formats/mpeg/mpeg_audio_stream_parser_base.h",
406 "formats/mpeg/mpeg1_audio_stream_parser.cc",
407 "formats/mpeg/mpeg1_audio_stream_parser.h",
406 ] 408 ]
407 } 409 }
408 410
409 deps += [ 411 deps += [
410 ":shared_memory_support", 412 ":shared_memory_support",
411 "//base", 413 "//base",
412 "//base:i18n", 414 "//base:i18n",
413 "//base/third_party/dynamic_annotations", 415 "//base/third_party/dynamic_annotations",
414 "//crypto", 416 "//crypto",
415 "//crypto:platform", # TODO(ajwong): This used to be provided by crypto.gyp via export_dependent_settings 417 "//crypto:platform", # TODO(ajwong): This used to be provided by crypto.gyp via export_dependent_settings
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
504 506
505 if (proprietary_codecs) { 507 if (proprietary_codecs) {
506 sources += [ 508 sources += [
507 "filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc", 509 "filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc",
508 "filters/h264_to_annex_b_bitstream_converter_unittest.cc", 510 "filters/h264_to_annex_b_bitstream_converter_unittest.cc",
509 "formats/common/stream_parser_test_base.cc", 511 "formats/common/stream_parser_test_base.cc",
510 "formats/common/stream_parser_test_base.h", 512 "formats/common/stream_parser_test_base.h",
511 "formats/mp2t/es_adapter_video_unittest.cc", 513 "formats/mp2t/es_adapter_video_unittest.cc",
512 "formats/mp2t/es_parser_adts_unittest.cc", 514 "formats/mp2t/es_parser_adts_unittest.cc",
513 "formats/mp2t/es_parser_h264_unittest.cc", 515 "formats/mp2t/es_parser_h264_unittest.cc",
516 "formats/mp2t/es_parser_mpeg1audio_unittest.cc",
514 "formats/mp2t/es_parser_test_base.cc", 517 "formats/mp2t/es_parser_test_base.cc",
515 "formats/mp2t/es_parser_test_base.h", 518 "formats/mp2t/es_parser_test_base.h",
516 "formats/mp2t/mp2t_stream_parser_unittest.cc", 519 "formats/mp2t/mp2t_stream_parser_unittest.cc",
517 "formats/mp4/aac_unittest.cc", 520 "formats/mp4/aac_unittest.cc",
518 "formats/mp4/avc_unittest.cc", 521 "formats/mp4/avc_unittest.cc",
519 "formats/mp4/box_reader_unittest.cc", 522 "formats/mp4/box_reader_unittest.cc",
520 "formats/mp4/es_descriptor_unittest.cc", 523 "formats/mp4/es_descriptor_unittest.cc",
521 "formats/mp4/mp4_stream_parser_unittest.cc", 524 "formats/mp4/mp4_stream_parser_unittest.cc",
522 "formats/mp4/sample_to_group_iterator_unittest.cc", 525 "formats/mp4/sample_to_group_iterator_unittest.cc",
523 "formats/mp4/track_run_iterator_unittest.cc", 526 "formats/mp4/track_run_iterator_unittest.cc",
524 "formats/mpeg/adts_stream_parser_unittest.cc", 527 "formats/mpeg/adts_stream_parser_unittest.cc",
525 "formats/mpeg/mp3_stream_parser_unittest.cc", 528 "formats/mpeg/mpeg1_audio_stream_parser_unittest.cc",
526 ] 529 ]
527 } 530 }
528 531
529 if (is_win && cpu_arch == "x64") { 532 if (is_win && cpu_arch == "x64") {
530 cflags += [ 533 cflags += [
531 "/wd4267" # TODO(wolenetz): Fix size_t to int trunctaion in win64. See 534 "/wd4267" # TODO(wolenetz): Fix size_t to int trunctaion in win64. See
532 # http://crbug.com/171009 535 # http://crbug.com/171009
533 ] 536 ]
534 } 537 }
535 538
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
740 java_cpp_template("media_android_imageformat_list") { 743 java_cpp_template("media_android_imageformat_list") {
741 sources = [ 744 sources = [
742 "base/android/java/src/org/chromium/media/ImageFormat.template", 745 "base/android/java/src/org/chromium/media/ImageFormat.template",
743 ] 746 ]
744 inputs = [ 747 inputs = [
745 "video/capture/android/imageformat_list.h" 748 "video/capture/android/imageformat_list.h"
746 ] 749 ]
747 package_name = "org/chromium/media" 750 package_name = "org/chromium/media"
748 } 751 }
749 } 752 }
OLDNEW
« no previous file with comments | « no previous file | media/filters/stream_parser_factory.cc » ('j') | media/formats/mp2t/es_parser_mpeg1audio.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698