webrtc/modules/audio_processing/audio_buffer.cc - Issue 1862553002: Fix the number of frames used when interleaving in AudioBuffer::InterleaveTo()

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_processing/audio_buffer.cc

Issue 1862553002: Fix the number of frames used when interleaving in AudioBuffer::InterleaveTo() (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Rebasing 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 | « data/audio_processing/output_data_fixed.pb ('k') | webrtc/modules/audio_processing/test/audio_processing_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/audio_processing/audio_buffer.cc

diff --git a/webrtc/modules/audio_processing/audio_buffer.cc b/webrtc/modules/audio_processing/audio_buffer.cc

index f300bb85cd0ba21e4f1913b872dcf0f962caa2f1..f9b9f631d2b813523ed4a9935ecbc3c0af2ab3bd 100644

--- a/webrtc/modules/audio_processing/audio_buffer.cc

+++ b/webrtc/modules/audio_processing/audio_buffer.cc

@@ -430,10 +430,10 @@ void AudioBuffer::InterleaveTo(AudioFrame* frame, bool data_changed) {

}

if (frame->num_channels_ == num_channels_) {

- Interleave(data_ptr->ibuf()->channels(), proc_num_frames_, num_channels_,

+ Interleave(data_ptr->ibuf()->channels(), output_num_frames_, num_channels_,

frame->data_);

} else {

- UpmixMonoToInterleaved(data_ptr->ibuf()->channels()[0], proc_num_frames_,

+ UpmixMonoToInterleaved(data_ptr->ibuf()->channels()[0], output_num_frames_,

frame->num_channels_, frame->data_);

}

« no previous file with comments | « data/audio_processing/output_data_fixed.pb ('k') | webrtc/modules/audio_processing/test/audio_processing_unittest.cc » ('j') | no next file with comments »