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

Unified Diff: webrtc/modules/audio_coding/acm2/audio_coding_module_impl.cc

Issue 1527453005: AudioCodingModuleImpl: Stop failing artificially for non-Opus encoders (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@rac1
Patch Set: Created 5 years 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 side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/audio_coding/acm2/audio_coding_module_impl.cc
diff --git a/webrtc/modules/audio_coding/acm2/audio_coding_module_impl.cc b/webrtc/modules/audio_coding/acm2/audio_coding_module_impl.cc
index ac4571257f8ab11210cae382db44993e5d5f37fe..7166da3bc97e916f28263e1ab00730c103972eaf 100644
--- a/webrtc/modules/audio_coding/acm2/audio_coding_module_impl.cc
+++ b/webrtc/modules/audio_coding/acm2/audio_coding_module_impl.cc
@@ -740,8 +740,6 @@ int AudioCodingModuleImpl::SetOpusApplication(OpusApplicationMode application) {
if (!HaveValidEncoder("SetOpusApplication")) {
return -1;
}
- if (!codec_manager_.CurrentEncoderIsOpus())
- return -1;
AudioEncoder::Application app;
switch (application) {
case kVoip:
@@ -763,8 +761,6 @@ int AudioCodingModuleImpl::SetOpusMaxPlaybackRate(int frequency_hz) {
if (!HaveValidEncoder("SetOpusMaxPlaybackRate")) {
return -1;
}
- if (!codec_manager_.CurrentEncoderIsOpus())
- return -1;
rent_a_codec_.GetEncoderStack()->SetMaxPlaybackRate(frequency_hz);
return 0;
}
@@ -774,8 +770,6 @@ int AudioCodingModuleImpl::EnableOpusDtx() {
if (!HaveValidEncoder("EnableOpusDtx")) {
return -1;
}
- if (!codec_manager_.CurrentEncoderIsOpus())
- return -1;
return rent_a_codec_.GetEncoderStack()->SetDtx(true) ? 0 : -1;
}
@@ -784,8 +778,6 @@ int AudioCodingModuleImpl::DisableOpusDtx() {
if (!HaveValidEncoder("DisableOpusDtx")) {
return -1;
}
- if (!codec_manager_.CurrentEncoderIsOpus())
- return -1;
return rent_a_codec_.GetEncoderStack()->SetDtx(false) ? 0 : -1;
}
« no previous file with comments | « no previous file | webrtc/modules/audio_coding/acm2/codec_manager.h » ('j') | webrtc/modules/audio_coding/acm2/codec_manager.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698