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

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: rebase Created 4 years, 12 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
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
ddorwin 2016/01/04 23:22:18 80 chars
servolk 2016/01/07 02:30:04 Do gyp files also have 80-char limit? I thought th
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 1047 matching lines...) Expand 10 before | Expand all | Expand 10 after
1099 'defines': [ 1103 'defines': [
1100 'ENABLE_HEVC_DEMUXING' 1104 'ENABLE_HEVC_DEMUXING'
1101 ], 1105 ],
1102 'sources': [ 1106 'sources': [
1103 'filters/h265_parser.cc', 1107 'filters/h265_parser.cc',
1104 'filters/h265_parser.h', 1108 'filters/h265_parser.h',
1105 'formats/mp4/hevc.cc', 1109 'formats/mp4/hevc.cc',
1106 'formats/mp4/hevc.h', 1110 'formats/mp4/hevc.h',
1107 ], 1111 ],
1108 }], 1112 }],
1113 ['proprietary_codecs==1 and enable_ac3_eac3_demuxing==1', {
1114 'defines': [
1115 'ENABLE_AC3_EAC3_DEMUXING'
1116 ],
1117 }],
1109 ['proprietary_codecs==1 and enable_hevc_demuxing==1 and media_use_ffmpeg ==1', { 1118 ['proprietary_codecs==1 and enable_hevc_demuxing==1 and media_use_ffmpeg ==1', {
1110 'sources': [ 1119 'sources': [
1111 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc', 1120 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc',
1112 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.h', 1121 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.h',
1113 ], 1122 ],
1114 }], 1123 }],
1115 ['target_arch=="ia32" or target_arch=="x64"', { 1124 ['target_arch=="ia32" or target_arch=="x64"', {
1116 'dependencies': [ 1125 'dependencies': [
1117 'media_asm', 1126 'media_asm',
1118 ], 1127 ],
(...skipping 1023 matching lines...) Expand 10 before | Expand all | Expand 10 after
2142 'dependencies': [ 2151 'dependencies': [
2143 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 2152 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
2144 ], 2153 ],
2145 }], 2154 }],
2146 ], 2155 ],
2147 }, 2156 },
2148 ], 2157 ],
2149 }], 2158 }],
2150 ], 2159 ],
2151 } 2160 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698