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