zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the number of frames used when interleaving in AudioBuffer::InterleaveTo()

Browse Source 
R=henrik.lundin@webrtc.org, peah@webrtc.org
TBR=tina.legrand@webrtc.org

Review URL: https://codereview.webrtc.org/1862553002 .

Cr-Commit-Position: refs/heads/master@{#12249}
This commit is contained in:
Alejandro Luebs
2016-04-05 17:29:19 -07:00
parent faed4ab24b
commit 40cbec5415
3 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/modules/audio_processing/audio_buffer.cc
View File

@ -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_);
}
}