generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Making sure neteq gets compiled with OPUS.

Browse Source 
All WebRTC calls on GN were failing because we failed to add OPUS as a
receive codec. The reason was that the WEBRTC_CODEC_OPUS define wasn't
set for the audio_decoder_impl.cc file; this CL fixes that.

BUG=None
R=kjellander@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/42309004

Cr-Commit-Position: refs/heads/master@{#8672}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8672 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
phoglund@webrtc.org 2015-03-10 16:23:24 +00:00
parent 51ccf37638
commit 49d0d34ed5
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
webrtc/modules/audio_coding/BUILD.gn
View File

@ -673,6 +673,7 @@ source_set("webrtc_opus") {
public_configs = [ "../..:common_inherited_config" ] public_configs = [ "../..:common_inherited_config" ]
deps += [ rtc_opus_dir ] deps += [ rtc_opus_dir ]
forward_dependent_configs_from = [ rtc_opus_dir ]
} }
} }
@ -760,8 +761,6 @@ source_set("neteq") {
":neteq_config", ":neteq_config",
] ]
forward_dependent_configs_from = [ rtc_opus_dir ]
if (is_clang) { if (is_clang) {
# Suppress warnings from Chrome's Clang plugins. # Suppress warnings from Chrome's Clang plugins.
# See http://code.google.com/p/webrtc/issues/detail?id=163 for details. # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
@ -780,6 +779,12 @@ source_set("neteq") {
"../..:webrtc_common", "../..:webrtc_common",
"../../common_audio", "../../common_audio",
"../../system_wrappers", "../../system_wrappers",
rtc_opus_dir,
] ]
defines = []
if (rtc_include_opus) {
defines += [ "WEBRTC_CODEC_OPUS" ]
deps += [ ":webrtc_opus" ]
}
} }