Fixing a bug in expand_rate calculation for stereo signal.

BUG=
R=henrik.lundin@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/41849004

Cr-Commit-Position: refs/heads/master@{#8307}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8307 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
minyue@webrtc.org 2015-02-10 08:35:38 +00:00
parent 8e612aba60
commit c11348b5d7

View File

@ -1349,14 +1349,16 @@ void NetEqImpl::DoMerge(int16_t* decoded_buffer, size_t decoded_length,
int new_length = merge_->Process(decoded_buffer, decoded_length,
mute_factor_array_.get(),
algorithm_buffer_.get());
int expand_length_correction = new_length -
static_cast<int>(decoded_length / algorithm_buffer_->Channels());
// Update in-call and post-call statistics.
if (expand_->MuteFactor(0) == 0) {
// Expand generates only noise.
stats_.ExpandedNoiseSamples(new_length - static_cast<int>(decoded_length));
stats_.ExpandedNoiseSamples(expand_length_correction);
} else {
// Expansion generates more than only noise.
stats_.ExpandedVoiceSamples(new_length - static_cast<int>(decoded_length));
stats_.ExpandedVoiceSamples(expand_length_correction);
}
last_mode_ = kModeMerge;