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

Side by Side Diff: media/BUILD.gn

Issue 1539983004: Convert enable_mpeg2ts into a new-style buildflag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove redundant ffmpeg_branding introduced by incorrect merge Created 4 years, 12 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
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/buildflag_header.gni")
5 import("//build/config/android/config.gni") 6 import("//build/config/android/config.gni")
6 import("//build/config/arm.gni") 7 import("//build/config/arm.gni")
7 import("//build/config/features.gni") 8 import("//build/config/features.gni")
8 import("//build/config/linux/pkg_config.gni") 9 import("//build/config/linux/pkg_config.gni")
9 import("//build/config/ui.gni") 10 import("//build/config/ui.gni")
10 import("//media/media_options.gni") 11 import("//media/media_options.gni")
11 import("//testing/test.gni") 12 import("//testing/test.gni")
12 13
14 buildflag_header("media_features") {
15 header = "media_features.h"
16
17 # Enables the MPEG2-TS stream parser for use with Media Source. Disabled by
ddorwin 2016/01/04 22:19:45 This is consistent with the previous name but now
servolk 2016/01/05 00:18:09 Did you mean .src=foo.ts (mpeg2ts)? AFAIK there's
ddorwin 2016/01/05 18:59:56 Yes, oops. SG.
18 # default (except on Chromecast) since it's not available on the normal Web
ddorwin 2016/01/04 22:19:45 Just keep it simple: Only supported on Chromecast.
servolk 2016/01/05 00:18:09 Done.
19 # Platform and costs money.
20 enable_mse_mpeg2ts_stream_parser = is_chromecast
21
22 flags =
23 [ "ENABLE_MSE_MPEG2TS_STREAM_PARSER=$enable_mse_mpeg2ts_stream_parser" ]
24 }
25
13 # Common configuration for targets in the media directory. 26 # Common configuration for targets in the media directory.
14 # NOT for exporting. 27 # NOT for exporting.
15 config("media_config") { 28 config("media_config") {
16 defines = [] 29 defines = []
17 if (!media_use_libvpx) { 30 if (!media_use_libvpx) {
18 defines += [ "MEDIA_DISABLE_LIBVPX" ] 31 defines += [ "MEDIA_DISABLE_LIBVPX" ]
19 } 32 }
20 if (!media_use_ffmpeg) { 33 if (!media_use_ffmpeg) {
21 defines += [ "MEDIA_DISABLE_FFMPEG" ] 34 defines += [ "MEDIA_DISABLE_FFMPEG" ]
22 } 35 }
(...skipping 449 matching lines...) Expand 10 before | Expand all | Expand 10 after
472 "mfuuid.lib", 485 "mfuuid.lib",
473 ] 486 ]
474 } 487 }
475 488
476 if (proprietary_codecs) { 489 if (proprietary_codecs) {
477 sources += [ 490 sources += [
478 "cdm/cenc_utils.cc", 491 "cdm/cenc_utils.cc",
479 "cdm/cenc_utils.h", 492 "cdm/cenc_utils.h",
480 "filters/h264_to_annex_b_bitstream_converter.cc", 493 "filters/h264_to_annex_b_bitstream_converter.cc",
481 "filters/h264_to_annex_b_bitstream_converter.h", 494 "filters/h264_to_annex_b_bitstream_converter.h",
482 "formats/mp2t/es_adapter_video.cc", 495 "formats/mp2t/es_adapter_video.cc",
ddorwin 2016/01/04 22:19:45 Shouldn't all of these files be protected by enabl
servolk 2016/01/05 00:18:09 Good point, I'm also a bit surprised. This code wa
483 "formats/mp2t/es_adapter_video.h", 496 "formats/mp2t/es_adapter_video.h",
484 "formats/mp2t/es_parser.cc", 497 "formats/mp2t/es_parser.cc",
485 "formats/mp2t/es_parser.h", 498 "formats/mp2t/es_parser.h",
486 "formats/mp2t/es_parser_adts.cc", 499 "formats/mp2t/es_parser_adts.cc",
487 "formats/mp2t/es_parser_adts.h", 500 "formats/mp2t/es_parser_adts.h",
488 "formats/mp2t/es_parser_h264.cc", 501 "formats/mp2t/es_parser_h264.cc",
489 "formats/mp2t/es_parser_h264.h", 502 "formats/mp2t/es_parser_h264.h",
490 "formats/mp2t/es_parser_mpeg1audio.cc", 503 "formats/mp2t/es_parser_mpeg1audio.cc",
491 "formats/mp2t/es_parser_mpeg1audio.h", 504 "formats/mp2t/es_parser_mpeg1audio.h",
492 "formats/mp2t/mp2t_common.h", 505 "formats/mp2t/mp2t_common.h",
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
542 "filters/source_buffer_platform_lowmem.cc", 555 "filters/source_buffer_platform_lowmem.cc",
543 ] 556 ]
544 } else { 557 } else {
545 sources += [ 558 sources += [
546 "filters/source_buffer_platform.cc", 559 "filters/source_buffer_platform.cc",
547 "filters/source_buffer_platform.h", 560 "filters/source_buffer_platform.h",
548 ] 561 ]
549 } 562 }
550 563
551 public_deps = [ 564 public_deps = [
565 ":media_features",
552 "//media/audio", 566 "//media/audio",
553 "//media/base", 567 "//media/base",
554 "//third_party/opus", 568 "//third_party/opus",
555 ] 569 ]
556 570
557 deps += [ 571 deps += [
558 ":shared_memory_support", 572 ":shared_memory_support",
559 "//base", 573 "//base",
560 "//base:i18n", 574 "//base:i18n",
561 "//base/third_party/dynamic_annotations", 575 "//base/third_party/dynamic_annotations",
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
900 "//media/base:test_support", 914 "//media/base:test_support",
901 "//media/test:pipeline_integration_tests", 915 "//media/test:pipeline_integration_tests",
902 "//testing/gmock", 916 "//testing/gmock",
903 "//testing/gtest", 917 "//testing/gtest",
904 "//third_party/ffmpeg", 918 "//third_party/ffmpeg",
905 "//ui/gfx:test_support", 919 "//ui/gfx:test_support",
906 "//ui/gfx/geometry", 920 "//ui/gfx/geometry",
907 ] 921 ]
908 } 922 }
909 } 923 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698