webrtc/modules/audio_coding/acm2/audio_coding_module_impl.cc - Issue 1908923002: Audio Coding Module: Use separate instances for 16 kHz and 32 kHz iSAC decoder

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/acm2/audio_coding_module_impl.cc

Issue 1908923002: Audio Coding Module: Use separate instances for 16 kHz and 32 kHz iSAC decoder (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: New test checksums for non-ARM platforms Created 4 years, 8 months 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/acm2/audio_coding_module_impl.h ('k') | webrtc/modules/audio_coding/acm2/audio_coding_module_unittest_oldapi.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 f00b2432f2430a47bfb67be58c276539107f9a53..1a1ae37a8a38da869caa30fc78539ccb49c11028 100644

--- a/webrtc/modules/audio_coding/acm2/audio_coding_module_impl.cc

+++ b/webrtc/modules/audio_coding/acm2/audio_coding_module_impl.cc

@@ -719,10 +719,12 @@ int AudioCodingModuleImpl::RegisterReceiveCodecUnlocked(

AudioDecoder* isac_decoder = nullptr;

if (STR_CASE_CMP(codec.plname, "isac") == 0) {

- if (!isac_decoder_) {

- isac_decoder_ = isac_factory();

+ std::unique_ptr<AudioDecoder>& saved_isac_decoder =

+ codec.plfreq == 16000 ? isac_decoder_16k_ : isac_decoder_32k_;

+ if (!saved_isac_decoder) {

+ saved_isac_decoder = isac_factory();

}

- isac_decoder = isac_decoder_.get();

+ isac_decoder = saved_isac_decoder.get();

}

return receiver_.AddCodec(*codec_index, codec.pltype, codec.channels,

codec.plfreq, isac_decoder, codec.plname);