Chromium Code Reviews| Index: media/media.gyp |
| diff --git a/media/media.gyp b/media/media.gyp |
| index ba3c87e693ea7510b8f8daaaed506c8d1f5e3af4..85e022384dfd5745461317fe9ce1c8650f1f9c78 100644 |
| --- a/media/media.gyp |
| +++ b/media/media.gyp |
| @@ -37,8 +37,12 @@ |
| # 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, |
| }], |
| ], |
| }, |
| @@ -1106,6 +1110,11 @@ |
| '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
servolk
2016/01/07 21:17:36
I've fixed this in the patchset 32 with conversion
|
| + ], |
| + }], |
| ['proprietary_codecs==1 and enable_hevc_demuxing==1 and media_use_ffmpeg==1', { |
| 'sources': [ |
| 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc', |
| @@ -1325,6 +1334,11 @@ |
| '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' |