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

AudioCodingModuleImpl: Stop failing artificially for non-Opus encoders

Browse Source 
All encoders already handle the "Opus-specific" requests sanely (by
failing nicely), so we don't need extra checks to protect them.

BUG=webrtc:5028

Review URL: https://codereview.webrtc.org/1527453005

Cr-Commit-Position: refs/heads/master@{#11051}
This commit is contained in:
kwiberg
2015-12-16 06:24:05 -08:00
committed by Commit bot
parent 99b1a32146
commit 44307630d3
5 changed files with 5 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
webrtc/modules/audio_coding/acm2/codec_manager.cc
View File

@ -166,7 +166,9 @@ bool CodecManager::SetVAD(bool enable, ACMVADMode mode) {
return false;
}
if (CurrentEncoderIsOpus()) {
// TODO(kwiberg): This doesn't protect Opus when injected as an external
// encoder.
if (send_codec_inst_ && IsOpus(*send_codec_inst_)) {
// VAD/DTX not supported, but don't fail.
enable = false;
}
@ -187,9 +189,5 @@ bool CodecManager::SetCodecFEC(bool enable_codec_fec) {
return true;
}
bool CodecManager::CurrentEncoderIsOpus() const {
return send_codec_inst_ ? IsOpus(*send_codec_inst_) : false;
}
} // namespace acm2
} // namespace webrtc