webrtc/modules/audio_coding/main/acm2/codec_manager.cc - Issue 1416633011: CodecManager::RegisterEncoder: Call SetFec on new encoder, not old

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1416633011: CodecManager::RegisterEncoder: Call SetFec on new encoder, not old (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@rac3

Patch Set: better better test 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 | « webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest_oldapi.cc ('k') | webrtc/modules/audio_coding/main/acm2/codec_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | 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 e4070c76aef7648c5ecba92a0fea1bff06d9e70b..ac21020dc2e3847b4e79b2dde50fad31f405092b 100644

--- a/webrtc/modules/audio_coding/main/acm2/codec_manager.cc

+++ b/webrtc/modules/audio_coding/main/acm2/codec_manager.cc

@@ -319,8 +319,15 @@ void CodecManager::RegisterEncoder(AudioEncoder* external_speech_encoder) {

if (send_codec_inst_.channels != 1)

dtx_enabled_ = false;

- codec_fec_enabled_ =

- codec_fec_enabled_ && codec_owner_.Encoder()->SetFec(codec_fec_enabled_);

+ if (codec_fec_enabled_) {

+ // Switch FEC on. On failure, remember that FEC is off.

+ if (!external_speech_encoder->SetFec(true))

+ codec_fec_enabled_ = false;

+ } else {

+ // Switch FEC off. This shouldn't fail.

+ const bool success = external_speech_encoder->SetFec(false);

+ RTC_DCHECK(success);

+ }

int cng_pt = dtx_enabled_

? CngPayloadType(external_speech_encoder->SampleRateHz())

: -1;