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

Side by Side Diff: media/media.gyp

Issue 812643005: Re-add AC3/EAC3 audio demuxing support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: buildfix Created 4 years, 11 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
« no previous file with comments | « media/formats/mp4/mp4_stream_parser_unittest.cc ('k') | media/media_options.gni » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 # Override to dynamically link the cras (ChromeOS audio) library. 8 # Override to dynamically link the cras (ChromeOS audio) library.
9 'use_cras%': 0, 9 'use_cras%': 0,
10 # Option e.g. for Linux distributions to link pulseaudio directly 10 # Option e.g. for Linux distributions to link pulseaudio directly
(...skipping 15 matching lines...) Expand all
26 }, { 26 }, {
27 'use_alsa%': 0, 27 'use_alsa%': 0,
28 'use_pulseaudio%': 0, 28 'use_pulseaudio%': 0,
29 }], 29 }],
30 # low memory buffer is used in non-Android based chromecast build due to h ardware limitation. 30 # low memory buffer is used in non-Android based chromecast build due to h ardware limitation.
31 ['chromecast==1 and OS!="android"', { 31 ['chromecast==1 and OS!="android"', {
32 'use_low_memory_buffer%': 1, 32 'use_low_memory_buffer%': 1,
33 }, { 33 }, {
34 'use_low_memory_buffer%': 0, 34 'use_low_memory_buffer%': 0,
35 }], 35 }],
36 ['chromecast == 1', { 36 ['proprietary_codecs==1 and chromecast==1', {
37 # Enable AC3/EAC3 audio demuxing. Actual decoding must be provided by
38 # the platform (or HDMI sink in Chromecast for audio pass-through case).
39 'enable_ac3_eac3_audio_demuxing%': 1,
37 'enable_mse_mpeg2ts_stream_parser%': 1, 40 'enable_mse_mpeg2ts_stream_parser%': 1,
38 }, { 41 }, {
42 'enable_ac3_eac3_audio_demuxing%': 0,
39 'enable_mse_mpeg2ts_stream_parser%': 0, 43 'enable_mse_mpeg2ts_stream_parser%': 0,
40 }], 44 }],
41 ['chromecast==1', { 45 ['chromecast==1', {
42 # Enable HEVC/H265 demuxing. Actual decoding must be provided by the 46 # Enable HEVC/H265 demuxing. Actual decoding must be provided by the
43 # platform. 47 # platform.
44 'enable_hevc_demuxing%': 1, 48 'enable_hevc_demuxing%': 1,
45 }, { 49 }, {
46 'enable_hevc_demuxing%': 0, 50 'enable_hevc_demuxing%': 0,
47 }], 51 }],
48 ], 52 ],
49 }, 53 },
50 'includes': [ 54 'includes': [
51 'media_cdm.gypi', 55 'media_cdm.gypi',
52 'media_variables.gypi', 56 'media_variables.gypi',
53 ], 57 ],
54 'targets': [ 58 'targets': [
55 { 59 {
56 # GN version: //media:media_features 60 # GN version: //media:media_features
57 'target_name': 'media_features', 61 'target_name': 'media_features',
58 'includes': [ '../build/buildflag_header.gypi' ], 62 'includes': [ '../build/buildflag_header.gypi' ],
59 'variables': { 63 'variables': {
60 'buildflag_header_path': 'media/media_features.h', 64 'buildflag_header_path': 'media/media_features.h',
61 'buildflag_flags': [ 65 'buildflag_flags': [
66 "ENABLE_AC3_EAC3_AUDIO_DEMUXING=<(enable_ac3_eac3_audio_demuxing)",
62 "ENABLE_MSE_MPEG2TS_STREAM_PARSER=<(enable_mse_mpeg2ts_stream_parser)" , 67 "ENABLE_MSE_MPEG2TS_STREAM_PARSER=<(enable_mse_mpeg2ts_stream_parser)" ,
63 ], 68 ],
64 }, 69 },
65 }, 70 },
66 { 71 {
67 # GN version: //media 72 # GN version: //media
68 'target_name': 'media', 73 'target_name': 'media',
69 'type': '<(component)', 74 'type': '<(component)',
70 'dependencies': [ 75 'dependencies': [
71 'media_features', 76 'media_features',
(...skipping 2091 matching lines...) Expand 10 before | Expand all | Expand 10 after
2163 'dependencies': [ 2168 'dependencies': [
2164 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 2169 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
2165 ], 2170 ],
2166 }], 2171 }],
2167 ], 2172 ],
2168 }, 2173 },
2169 ], 2174 ],
2170 }], 2175 }],
2171 ], 2176 ],
2172 } 2177 }
OLDNEW
« no previous file with comments | « media/formats/mp4/mp4_stream_parser_unittest.cc ('k') | media/media_options.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698