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

Side by Side Diff: build/common.gypi

Issue 812643005: Re-add AC3/EAC3 audio demuxing support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Code cleanup Created 5 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
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 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 1450 matching lines...) Expand 10 before | Expand all | Expand 10 after
1461 1461
1462 # Relative path to icu.gyp from this file. 1462 # Relative path to icu.gyp from this file.
1463 'icu_gyp_path': '../third_party/icu/icu.gyp', 1463 'icu_gyp_path': '../third_party/icu/icu.gyp',
1464 1464
1465 # IPC fuzzer is disabled by default. 1465 # IPC fuzzer is disabled by default.
1466 'enable_ipc_fuzzer%': 0, 1466 'enable_ipc_fuzzer%': 0,
1467 1467
1468 # Force disable libstdc++ debug mode. 1468 # Force disable libstdc++ debug mode.
1469 'disable_glibcxx_debug%': 0, 1469 'disable_glibcxx_debug%': 0,
1470 1470
1471 # Set to 1 to enable AC3/EAC3 audio demuxing
DaleCurtis 2015/01/14 23:36:33 Do we need this here? I don't see any non media/ c
servolk 2015/01/14 23:44:11 Two reasons: 1. I was trying to keep gyp variables
DaleCurtis 2015/01/14 23:50:07 New values of this type are effectively banned, so
servolk 2015/01/15 00:06:45 Added the same option to media/media_options.gni f
DaleCurtis 2015/01/15 01:51:01 If it's only necessary in media/ and net/ I'd just
servolk 2015/01/15 02:37:20 Ok, I can try to move the media mime checks from n
DaleCurtis 2015/01/15 17:56:13 +rsleevi,wolenetz who are more familiar with the h
1472 'enable_ac3_eac3_audio_demuxing%': 0,
1473
1471 # Set to 1 to compile with MSE support for MPEG2 TS 1474 # Set to 1 to compile with MSE support for MPEG2 TS
1472 'enable_mpeg2ts_stream_parser%': 0, 1475 'enable_mpeg2ts_stream_parser%': 0,
1473 1476
1474 # Support ChromeOS touchpad gestures with ozone. 1477 # Support ChromeOS touchpad gestures with ozone.
1475 'use_evdev_gestures%': 0, 1478 'use_evdev_gestures%': 0,
1476 1479
1477 # Default ozone platform (if no --ozone-platform flag). 1480 # Default ozone platform (if no --ozone-platform flag).
1478 'ozone_platform%': "", 1481 'ozone_platform%': "",
1479 1482
1480 # Ozone platforms to include in the build. 1483 # Ozone platforms to include in the build.
(...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after
1798 1801
1799 # Default android linker script for shared library exports. 1802 # Default android linker script for shared library exports.
1800 'android_linker_script%': '<(SHARED_INTERMEDIATE_DIR)/android_exports.ls t', 1803 'android_linker_script%': '<(SHARED_INTERMEDIATE_DIR)/android_exports.ls t',
1801 }], # OS=="android" 1804 }], # OS=="android"
1802 ['embedded==1', { 1805 ['embedded==1', {
1803 'use_system_fontconfig%': 0, 1806 'use_system_fontconfig%': 0,
1804 }, { 1807 }, {
1805 'use_system_fontconfig%': 1, 1808 'use_system_fontconfig%': 1,
1806 }], 1809 }],
1807 ['chromecast==1', { 1810 ['chromecast==1', {
1811 'enable_ac3_eac3_audio_demuxing%': 1,
1808 'enable_mpeg2ts_stream_parser%': 1, 1812 'enable_mpeg2ts_stream_parser%': 1,
1809 'ffmpeg_branding%': 'ChromeOS', 1813 'ffmpeg_branding%': 'ChromeOS',
1810 'ozone_platform_ozonex%': 1, 1814 'ozone_platform_ozonex%': 1,
1811 'use_playready%': 0, 1815 'use_playready%': 0,
1812 'conditions': [ 1816 'conditions': [
1813 ['target_arch=="arm"', { 1817 ['target_arch=="arm"', {
1814 'arm_arch%': '', 1818 'arm_arch%': '',
1815 'arm_tune%': 'cortex-a9', 1819 'arm_tune%': 'cortex-a9',
1816 'arm_thumb%': 1, 1820 'arm_thumb%': 1,
1817 'video_hole%': 1, 1821 'video_hole%': 1,
(...skipping 822 matching lines...) Expand 10 before | Expand all | Expand 10 after
2640 }], 2644 }],
2641 ['enable_webrtc==1', { 2645 ['enable_webrtc==1', {
2642 'defines': ['ENABLE_WEBRTC=1'], 2646 'defines': ['ENABLE_WEBRTC=1'],
2643 }], 2647 }],
2644 ['proprietary_codecs==1', { 2648 ['proprietary_codecs==1', {
2645 'defines': ['USE_PROPRIETARY_CODECS'], 2649 'defines': ['USE_PROPRIETARY_CODECS'],
2646 'conditions': [ 2650 'conditions': [
2647 ['enable_mpeg2ts_stream_parser==1', { 2651 ['enable_mpeg2ts_stream_parser==1', {
2648 'defines': ['ENABLE_MPEG2TS_STREAM_PARSER'], 2652 'defines': ['ENABLE_MPEG2TS_STREAM_PARSER'],
2649 }], 2653 }],
2654 ['enable_ac3_eac3_audio_demuxing==1', {
2655 'defines': ['ENABLE_AC3_EAC3_AUDIO_DEMUXING'],
2656 }],
2650 ], 2657 ],
2651 }], 2658 }],
2652 ['enable_viewport==1', { 2659 ['enable_viewport==1', {
2653 'defines': ['ENABLE_VIEWPORT'], 2660 'defines': ['ENABLE_VIEWPORT'],
2654 }], 2661 }],
2655 ['enable_pepper_cdms==1', { 2662 ['enable_pepper_cdms==1', {
2656 'defines': ['ENABLE_PEPPER_CDMS'], 2663 'defines': ['ENABLE_PEPPER_CDMS'],
2657 }], 2664 }],
2658 ['enable_browser_cdms==1', { 2665 ['enable_browser_cdms==1', {
2659 'defines': ['ENABLE_BROWSER_CDMS'], 2666 'defines': ['ENABLE_BROWSER_CDMS'],
(...skipping 3178 matching lines...) Expand 10 before | Expand all | Expand 10 after
5838 # settings in target dicts. SYMROOT is a special case, because many other 5845 # settings in target dicts. SYMROOT is a special case, because many other
5839 # Xcode variables depend on it, including variables such as 5846 # Xcode variables depend on it, including variables such as
5840 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5847 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5841 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5848 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5842 # files to appear (when present) in the UI as actual files and not red 5849 # files to appear (when present) in the UI as actual files and not red
5843 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5850 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5844 # and therefore SYMROOT, needs to be set at the project level. 5851 # and therefore SYMROOT, needs to be set at the project level.
5845 'SYMROOT': '<(DEPTH)/xcodebuild', 5852 'SYMROOT': '<(DEPTH)/xcodebuild',
5846 }, 5853 },
5847 } 5854 }
OLDNEW
« no previous file with comments | « no previous file | media/base/audio_decoder_config.h » ('j') | media/filters/stream_parser_factory.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698