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

Unified Diff: webrtc/modules/audio_coding/main/acm2/codec_manager.cc

Issue 1476743002: Move the FEC enabling logic from CodecManager to Rent-A-Codec (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@rac0
Patch Set: Created 5 years, 1 month 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
« no previous file with comments | « no previous file | webrtc/modules/audio_coding/main/acm2/rent_a_codec.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/audio_coding/main/acm2/codec_manager.cc
diff --git a/webrtc/modules/audio_coding/main/acm2/codec_manager.cc b/webrtc/modules/audio_coding/main/acm2/codec_manager.cc
index 7db6919b2e7a2f4a887505c255adbb477f5a3d10..7796786866b0425c40e370ef9e055f54abf69793 100644
--- a/webrtc/modules/audio_coding/main/acm2/codec_manager.cc
+++ b/webrtc/modules/audio_coding/main/acm2/codec_manager.cc
@@ -173,10 +173,6 @@ int CodecManager::RegisterEncoder(const CodecInst& send_codec) {
rent_a_codec_.RentEncoderStack(enc, &codec_stack_params_);
RTC_DCHECK(CurrentEncoder());
- codec_stack_params_.use_codec_fec =
- codec_stack_params_.use_codec_fec &&
- enc->SetFec(codec_stack_params_.use_codec_fec);
-
send_codec_inst_ = send_codec;
return 0;
}
@@ -202,10 +198,6 @@ int CodecManager::RegisterEncoder(const CodecInst& send_codec) {
send_codec_inst_.rate = send_codec.rate;
}
- codec_stack_params_.use_codec_fec =
- codec_stack_params_.use_codec_fec &&
- CurrentEncoder()->SetFec(codec_stack_params_.use_codec_fec);
-
return 0;
}
@@ -222,16 +214,6 @@ void CodecManager::RegisterEncoder(AudioEncoder* external_speech_encoder) {
static const char kName[] = "external";
memcpy(send_codec_inst_.plname, kName, sizeof(kName));
- if (codec_stack_params_.use_codec_fec) {
- // Switch FEC on. On failure, remember that FEC is off.
- if (!external_speech_encoder->SetFec(true))
- codec_stack_params_.use_codec_fec = false;
- } else {
- // Switch FEC off. This shouldn't fail.
- const bool success = external_speech_encoder->SetFec(false);
- RTC_DCHECK(success);
- }
-
rent_a_codec_.RentEncoderStack(external_speech_encoder, &codec_stack_params_);
}
« no previous file with comments | « no previous file | webrtc/modules/audio_coding/main/acm2/rent_a_codec.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698