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

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: Move CanPlay tests into _mp4 test case Created 5 years 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
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 19 matching lines...) Expand all
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 ['chromecast==1', {
37 # Enable HEVC/H265 demuxing. Actual decoding must be provided by the 37 # Enable HEVC/H265 demuxing. Actual decoding must be provided by the
38 # platform. 38 # platform.
39 'enable_hevc_demuxing%': 1, 39 'enable_hevc_demuxing%': 1,
40 # Enable AC3/EAC3 audio demuxing. Actual decoding must be provided by th e
41 # platform (or HDMI sink in Chromecast for audio pass-through case).
42 'enable_ac3_eac3_demuxing%': 1,
40 }, { 43 }, {
41 'enable_hevc_demuxing%': 0, 44 'enable_hevc_demuxing%': 0,
45 'enable_ac3_eac3_demuxing%': 0,
42 }], 46 }],
43 ], 47 ],
44 }, 48 },
45 'includes': [ 49 'includes': [
46 'media_cdm.gypi', 50 'media_cdm.gypi',
47 'media_variables.gypi', 51 'media_variables.gypi',
48 ], 52 ],
49 'targets': [ 53 'targets': [
50 { 54 {
51 # GN version: //media 55 # GN version: //media
(...skipping 1060 matching lines...) Expand 10 before | Expand all | Expand 10 after
1112 'defines': [ 1116 'defines': [
1113 'ENABLE_HEVC_DEMUXING' 1117 'ENABLE_HEVC_DEMUXING'
1114 ], 1118 ],
1115 'sources': [ 1119 'sources': [
1116 'filters/h265_parser.cc', 1120 'filters/h265_parser.cc',
1117 'filters/h265_parser.h', 1121 'filters/h265_parser.h',
1118 'formats/mp4/hevc.cc', 1122 'formats/mp4/hevc.cc',
1119 'formats/mp4/hevc.h', 1123 'formats/mp4/hevc.h',
1120 ], 1124 ],
1121 }], 1125 }],
1126 ['proprietary_codecs==1 and enable_ac3_eac3_demuxing==1', {
1127 'defines': [
1128 'ENABLE_AC3_EAC3_DEMUXING'
1129 ],
1130 }],
1122 ['proprietary_codecs==1 and enable_hevc_demuxing==1 and media_use_ffmpeg ==1', { 1131 ['proprietary_codecs==1 and enable_hevc_demuxing==1 and media_use_ffmpeg ==1', {
1123 'sources': [ 1132 'sources': [
1124 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc', 1133 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc',
1125 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.h', 1134 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.h',
1126 ], 1135 ],
1127 }], 1136 }],
1128 ['target_arch=="ia32" or target_arch=="x64"', { 1137 ['target_arch=="ia32" or target_arch=="x64"', {
1129 'dependencies': [ 1138 'dependencies': [
1130 'media_asm', 1139 'media_asm',
1131 ], 1140 ],
(...skipping 1002 matching lines...) Expand 10 before | Expand all | Expand 10 after
2134 'dependencies': [ 2143 'dependencies': [
2135 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 2144 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
2136 ], 2145 ],
2137 }], 2146 }],
2138 ], 2147 ],
2139 }, 2148 },
2140 ], 2149 ],
2141 }], 2150 }],
2142 ], 2151 ],
2143 } 2152 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698