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

Fix for 3 NetEq fuzzer issues.

Browse Source 
I was not able to reproduce chromium:1146676 locally, so the change in merge.cc is a speculative fix.

Bug: chromium:1146835, chromium:1146676, chromium:1137226
Change-Id: I14472ba5b41e58b2d5f27d9833249c14505af18f
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/194264
Commit-Queue: Ivo Creusen <ivoc@webrtc.org>
Reviewed-by: Henrik Lundin <henrik.lundin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32759}
This commit is contained in:
Ivo Creusen
2020-12-03 10:06:25 +01:00
committed by Commit Bot
parent e7b5c1a235
commit f65a003f7f
3 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
modules/audio_coding/neteq/cross_correlation.cc
View File

@ -38,19 +38,9 @@ int CrossCorrelationWithAutoShift(const int16_t* sequence_1,
// In order to avoid overflow when computing the sum we should scale the
// samples so that (in_vector_length * max_1 * max_2) will not overflow.
// Expected scaling fulfills
// 1) sufficient:
// sequence_1_length * (max_1 * max_2 >> scaling) <= 0x7fffffff;
// 2) necessary:
// if (scaling > 0)
// sequence_1_length * (max_1 * max_2 >> (scaling - 1)) > 0x7fffffff;
// The following calculation fulfills 1) and almost fulfills 2).
// There are some corner cases that 2) is not satisfied, e.g.,
// max_1 = 17, max_2 = 30848, sequence_1_length = 4095, in such case,
// optimal scaling is 0, while the following calculation results in 1.
const int32_t factor =
(max_1 * max_2) / (std::numeric_limits<int32_t>::max() /
static_cast<int32_t>(sequence_1_length));
const int64_t max_value =
max_1 * max_2 * static_cast<int64_t>(sequence_1_length);
const int32_t factor = max_value >> 31;
const int scaling = factor == 0 ? 0 : 31 - WebRtcSpl_NormW32(factor);
WebRtcSpl_CrossCorrelation(cross_correlation, sequence_1, sequence_2,

3
modules/audio_coding/neteq/delay_manager.cc
View File

@ -158,7 +158,8 @@ absl::optional<int> DelayManager::Update(uint32_t timestamp,
}
const int expected_iat_ms =
1000 * static_cast<int32_t>(timestamp - last_timestamp_) / sample_rate_hz;
1000ll * static_cast<int32_t>(timestamp - last_timestamp_) /
sample_rate_hz;
const int iat_ms = packet_iat_stopwatch_->ElapsedMs();
const int iat_delay_ms = iat_ms - expected_iat_ms;
int relative_delay;

3
modules/audio_coding/neteq/merge.cc
View File

@ -50,6 +50,9 @@ size_t Merge::Process(int16_t* input,
assert(fs_hz_ == 8000 || fs_hz_ == 16000 || fs_hz_ == 32000 ||
fs_hz_ == 48000);
assert(fs_hz_ <= kMaxSampleRate); // Should not be possible.
if (input_length == 0) {
return 0;
}
size_t old_length;
size_t expand_period;