webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc - Issue 1235643003: Miscellaneous changes split from https://codereview.webrtc.org/1230503003 .

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/neteq/audio_decoder_impl.cc

Issue 1235643003: Miscellaneous changes split from https://codereview.webrtc.org/1230503003 . (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master

Patch Set: static_cast isn't C Created 5 years, 5 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/main/test/PCMFile.cc ('k') | webrtc/modules/audio_coding/neteq/dsp_helper.cc » ('j') | webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc

diff --git a/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc b/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc

index 99ff95a2ec1378d65bcdaa0bfa383e9f29697961..6a9b953f23a3a9d9db5f683a3820afebb9b49a2e 100644

--- a/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc

+++ b/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc

@@ -256,16 +256,14 @@ int AudioDecoderG722Stereo::DecodeInternal(const uint8_t* encoded,

static_cast<int16_t>(encoded_len / 2),

&decoded[decoded_len], &temp_type);

if (ret == decoded_len) {

- decoded_len += ret;

+ ret += decoded_len; // Return total number of samples.

// Interleave output.

- for (int k = decoded_len / 2; k < decoded_len; k++) {

+ for (int k = ret / 2; k < ret; k++) {

int16_t temp = decoded[k];

- memmove(&decoded[2 * k - decoded_len + 2],

- &decoded[2 * k - decoded_len + 1],

- (decoded_len - k - 1) * sizeof(int16_t));

- decoded[2 * k - decoded_len + 1] = temp;

+ memmove(&decoded[2 * k - ret + 2], &decoded[2 * k - ret + 1],

+ (ret - k - 1) * sizeof(int16_t));

+ decoded[2 * k - ret + 1] = temp;

}

- ret = decoded_len; // Return total number of samples.

}

*speech_type = ConvertSpeechType(temp_type);