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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/media.gyp

Issue 1539983004: Convert enable_mpeg2ts into a new-style buildflag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Buildfix 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/stream_parser_factory.cc ('k') | media/media_options.gni » ('j') | media/media_options.gni » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index 3cbb74f7b085924244ff6a1e8978337f6b5c5961..1ff9d5361e5ecb1585ae5c646cfaebfe8181cb0d 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -33,6 +33,11 @@
}, {
'use_low_memory_buffer%': 0,
}],
+ ['chromecast == 1', {
ddorwin 2016/01/05 18:59:56 Ditto with the .GNI below.
+ 'enable_mse_mpeg2ts_stream_parser%': 1,
+ }, {
+ 'enable_mse_mpeg2ts_stream_parser%': 0,
+ }],
['chromecast==1', {
# Enable HEVC/H265 demuxing. Actual decoding must be provided by the
# platform.
@@ -48,10 +53,22 @@
],
'targets': [
{
+ # GN version: //media:media_features
+ 'target_name': 'media_features',
+ 'includes': [ '../build/buildflag_header.gypi' ],
+ 'variables': {
+ 'buildflag_header_path': 'media/media_features.h',
+ 'buildflag_flags': [
+ "ENABLE_MSE_MPEG2TS_STREAM_PARSER=<(enable_mse_mpeg2ts_stream_parser)",
+ ],
+ },
+ },
+ {
# GN version: //media
'target_name': 'media',
'type': '<(component)',
'dependencies': [
+ 'media_features',
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
@@ -1039,32 +1056,6 @@
'filters/ffmpeg_h264_to_annex_b_bitstream_converter.h',
'filters/h264_to_annex_b_bitstream_converter.cc',
'filters/h264_to_annex_b_bitstream_converter.h',
- 'formats/mp2t/es_adapter_video.cc',
- 'formats/mp2t/es_adapter_video.h',
- 'formats/mp2t/es_parser.cc',
- 'formats/mp2t/es_parser.h',
- 'formats/mp2t/es_parser_adts.cc',
- 'formats/mp2t/es_parser_adts.h',
- 'formats/mp2t/es_parser_h264.cc',
- 'formats/mp2t/es_parser_h264.h',
- 'formats/mp2t/es_parser_mpeg1audio.cc',
- 'formats/mp2t/es_parser_mpeg1audio.h',
- 'formats/mp2t/mp2t_common.h',
- 'formats/mp2t/mp2t_stream_parser.cc',
- 'formats/mp2t/mp2t_stream_parser.h',
- 'formats/mp2t/timestamp_unroller.cc',
- 'formats/mp2t/timestamp_unroller.h',
- 'formats/mp2t/ts_packet.cc',
- 'formats/mp2t/ts_packet.h',
- 'formats/mp2t/ts_section.h',
- 'formats/mp2t/ts_section_pat.cc',
- 'formats/mp2t/ts_section_pat.h',
- 'formats/mp2t/ts_section_pes.cc',
- 'formats/mp2t/ts_section_pes.h',
- 'formats/mp2t/ts_section_pmt.cc',
- 'formats/mp2t/ts_section_pmt.h',
- 'formats/mp2t/ts_section_psi.cc',
- 'formats/mp2t/ts_section_psi.h',
'formats/mp4/aac.cc',
'formats/mp4/aac.h',
'formats/mp4/avc.cc',
@@ -1095,6 +1086,36 @@
'formats/mpeg/mpeg_audio_stream_parser_base.h',
],
}],
+ ['proprietary_codecs==1 and enable_mse_mpeg2ts_stream_parser==1', {
+ 'sources': [
+ 'formats/mp2t/es_adapter_video.cc',
+ 'formats/mp2t/es_adapter_video.h',
+ 'formats/mp2t/es_parser.cc',
+ 'formats/mp2t/es_parser.h',
+ 'formats/mp2t/es_parser_adts.cc',
+ 'formats/mp2t/es_parser_adts.h',
+ 'formats/mp2t/es_parser_h264.cc',
+ 'formats/mp2t/es_parser_h264.h',
+ 'formats/mp2t/es_parser_mpeg1audio.cc',
+ 'formats/mp2t/es_parser_mpeg1audio.h',
+ 'formats/mp2t/mp2t_common.h',
+ 'formats/mp2t/mp2t_stream_parser.cc',
+ 'formats/mp2t/mp2t_stream_parser.h',
+ 'formats/mp2t/timestamp_unroller.cc',
+ 'formats/mp2t/timestamp_unroller.h',
+ 'formats/mp2t/ts_packet.cc',
+ 'formats/mp2t/ts_packet.h',
+ 'formats/mp2t/ts_section.h',
+ 'formats/mp2t/ts_section_pat.cc',
+ 'formats/mp2t/ts_section_pat.h',
+ 'formats/mp2t/ts_section_pes.cc',
+ 'formats/mp2t/ts_section_pes.h',
+ 'formats/mp2t/ts_section_pmt.cc',
+ 'formats/mp2t/ts_section_pmt.h',
+ 'formats/mp2t/ts_section_psi.cc',
+ 'formats/mp2t/ts_section_psi.h',
+ ],
+ }],
['proprietary_codecs==1 and enable_hevc_demuxing==1', {
'defines': [
'ENABLE_HEVC_DEMUXING'
@@ -1413,14 +1434,6 @@
'filters/h264_to_annex_b_bitstream_converter_unittest.cc',
'formats/common/stream_parser_test_base.cc',
'formats/common/stream_parser_test_base.h',
- 'formats/mp2t/es_adapter_video_unittest.cc',
- 'formats/mp2t/es_parser_adts_unittest.cc',
- 'formats/mp2t/es_parser_h264_unittest.cc',
- 'formats/mp2t/es_parser_mpeg1audio_unittest.cc',
- 'formats/mp2t/es_parser_test_base.cc',
- 'formats/mp2t/es_parser_test_base.h',
- 'formats/mp2t/mp2t_stream_parser_unittest.cc',
- 'formats/mp2t/timestamp_unroller_unittest.cc',
'formats/mp4/aac_unittest.cc',
'formats/mp4/avc_unittest.cc',
'formats/mp4/box_reader_unittest.cc',
@@ -1432,6 +1445,18 @@
'formats/mpeg/mpeg1_audio_stream_parser_unittest.cc',
],
}],
+ ['proprietary_codecs==1 and enable_mse_mpeg2ts_stream_parser==1', {
+ 'sources': [
+ 'formats/mp2t/es_adapter_video_unittest.cc',
+ 'formats/mp2t/es_parser_adts_unittest.cc',
+ 'formats/mp2t/es_parser_h264_unittest.cc',
+ 'formats/mp2t/es_parser_mpeg1audio_unittest.cc',
+ 'formats/mp2t/es_parser_test_base.cc',
+ 'formats/mp2t/es_parser_test_base.h',
+ 'formats/mp2t/mp2t_stream_parser_unittest.cc',
+ 'formats/mp2t/timestamp_unroller_unittest.cc',
+ ],
+ }],
['OS=="mac"', {
'sources': [
'capture/video/mac/video_capture_device_factory_mac_unittest.mm',
« no previous file with comments | « media/filters/stream_parser_factory.cc ('k') | media/media_options.gni » ('j') | media/media_options.gni » ('J')

Powered by Google App Engine
This is Rietveld 408576698