zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Conditionally use OPUS_GET_IN_DTX if available

Browse Source 
OPUS_GET_IN_DTX was added 2019-04-15, but we still need to support
building on systems with older versions of the Opus headers (eg. Debian
Jessie, released 2015-04-25).  This is needed to fix the "Build From
Tarball" bot [1].

[1] https://ci.chromium.org/p/infra/builders/cron/Build%20From%20Tarball

BUG=chromium:1047860,webrtc:11085
R=minyue@webrtc.org,henrick.lundin@webrtc.org

Change-Id: I5418c3caf4d2c7da9b9ba43ce85879b1e0eec6e6
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/168560
Reviewed-by: Minyue Li <minyue@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Tommi <tommi@webrtc.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#30612}
This commit is contained in:
Tom Anderson
2020-02-24 12:01:11 -08:00
committed by Commit Bot
parent d6fb409d46
commit 422f9dd5df
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/audio_coding/codecs/opus/opus_interface.cc
View File

@ -376,12 +376,13 @@ int32_t WebRtcOpus_GetInDtx(OpusEncInst* inst) {
if (!inst) {
return -1;
}
#ifdef OPUS_GET_IN_DTX
int32_t in_dtx;
if (ENCODER_CTL(inst, OPUS_GET_IN_DTX(&in_dtx)) == 0) {
return in_dtx;
} else {
return -1;
}
#endif
return -1;
}
int16_t WebRtcOpus_DecoderCreate(OpusDecInst** inst,