Convert enable_mpeg2ts into a new-style buildflag

media/media.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
     # Override to dynamically link the cras (ChromeOS audio) library.
     'use_cras%': 0,
     # Option e.g. for Linux distributions to link pulseaudio directly
@@ skipping 15 matching lines @@
       }, {
         'use_alsa%': 0,
         'use_pulseaudio%': 0,
       }],
       # low memory buffer is used in non-Android based chromecast build due to hardware limitation.
       ['chromecast==1 and OS!="android"', {
         'use_low_memory_buffer%': 1,
       }, {
         '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.
         'enable_hevc_demuxing%': 1,
       }, {
         'enable_hevc_demuxing%': 0,
       }],
     ],
   },
   'includes': [
     'media_cdm.gypi',
     'media_variables.gypi',
   ],
   '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',
         '../crypto/crypto.gyp:crypto',
         '../gpu/gpu.gyp:command_buffer_common',
         '../skia/skia.gyp:skia',
         '../third_party/libwebm/libwebm.gyp:libwebm',
         '../third_party/libyuv/libyuv.gyp:libyuv',
         '../third_party/opus/opus.gyp:opus',
         '../ui/events/events.gyp:events_base',
@@ skipping 967 matching lines @@
         ['proprietary_codecs==1', {
           'sources': [
             'cdm/cenc_utils.cc',
             'cdm/cenc_utils.h',
             'filters/ffmpeg_aac_bitstream_converter.cc',
             'filters/ffmpeg_aac_bitstream_converter.h',
             'filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc',
             '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',
             'formats/mp4/avc.h',
             'formats/mp4/bitstream_converter.cc',
             'formats/mp4/bitstream_converter.h',
             'formats/mp4/box_definitions.cc',
             'formats/mp4/box_definitions.h',
             'formats/mp4/box_reader.cc',
             'formats/mp4/box_reader.h',
@@ skipping 10 matching lines @@
             'formats/mpeg/adts_constants.cc',
             'formats/mpeg/adts_constants.h',
             'formats/mpeg/adts_stream_parser.cc',
             'formats/mpeg/adts_stream_parser.h',
             'formats/mpeg/mpeg1_audio_stream_parser.cc',
             'formats/mpeg/mpeg1_audio_stream_parser.h',
             'formats/mpeg/mpeg_audio_stream_parser_base.cc',
             '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'
           ],
           'sources': [
             'filters/h265_parser.cc',
             'filters/h265_parser.h',
             'formats/mp4/hevc.cc',
             'formats/mp4/hevc.h',
           ],
@@ skipping 298 matching lines @@
           ],
         }],
         ['proprietary_codecs==1', {
           'sources': [
             'cdm/cenc_utils_unittest.cc',
             'filters/ffmpeg_aac_bitstream_converter_unittest.cc',
             'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc',
             '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',
             'formats/mp4/es_descriptor_unittest.cc',
             'formats/mp4/mp4_stream_parser_unittest.cc',
             'formats/mp4/sample_to_group_iterator_unittest.cc',
             'formats/mp4/track_run_iterator_unittest.cc',
             'formats/mpeg/adts_stream_parser_unittest.cc',
             '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',
           ]
         }],
         ['use_x11==1', {
           'dependencies': [
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
         }],
@@ skipping 697 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }