Re-add AC3/EAC3 audio demuxing support

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 19 matching lines @@
       # 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', {
         # Enable HEVC/H265 demuxing. Actual decoding must be provided by the
         # platform.
         'enable_hevc_demuxing%': 1,
+        # Enable AC3/EAC3 audio demuxing. Actual decoding must be provided by the
+        # platform (or HDMI sink in Chromecast for audio pass-through case).
+        'enable_ac3_eac3_demuxing%': 1,
       }, {
         'enable_hevc_demuxing%': 0,
+        'enable_ac3_eac3_demuxing%': 0,
       }],
     ],
   },
   'includes': [
     'media_cdm.gypi',
     'media_variables.gypi',
   ],
   'targets': [
     {
       # GN version: //media
@@ skipping 1047 matching lines @@
           'defines': [
             'ENABLE_HEVC_DEMUXING'
           ],
           'sources': [
             'filters/h265_parser.cc',
             'filters/h265_parser.h',
             'formats/mp4/hevc.cc',
             'formats/mp4/hevc.h',
           ],
         }],
+        ['proprietary_codecs==1 and enable_ac3_eac3_demuxing==1', {
+          'defines': [
+            'ENABLE_AC3_EAC3_AUDIO_DEMUXING'

[ddorwin, 2016/01/07 19:12:43]

Should we try to keep the variable and the define names consistent?

[servolk, 2016/01/07 21:17:36]

I've fixed this in the patchset 32 with conversion to buildflag.

+          ],
+        }],
         ['proprietary_codecs==1 and enable_hevc_demuxing==1 and media_use_ffmpeg==1', {
           'sources': [
             'filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc',
             'filters/ffmpeg_h265_to_annex_b_bitstream_converter.h',
           ],
         }],
         ['target_arch=="ia32" or target_arch=="x64"', {
           'dependencies': [
             'media_asm',
           ],
@@ skipping 199 matching lines @@
       'include_dirs': [
         # Needed by media_drm_bridge.cc.
         '<(SHARED_INTERMEDIATE_DIR)',
       ],
       'conditions': [
         ['arm_neon==1', {
           'defines': [
             'USE_NEON'
           ],
         }],
+        ['proprietary_codecs==1 and enable_ac3_eac3_demuxing==1', {
+          'defines': [
+            'ENABLE_AC3_EAC3_AUDIO_DEMUXING'
+          ],
+        }],
         ['proprietary_codecs==1 and enable_hevc_demuxing==1', {
           'defines': [
             'ENABLE_HEVC_DEMUXING'
           ],
           'sources': [
             'filters/h265_parser_unittest.cc',
           ],
         }],
         ['media_use_ffmpeg==1', {
           'dependencies': [
@@ skipping 800 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }