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

Bugfix for histogram scaling function in NetEq's DelayManager.

Browse Source 
If the previous value of the histogram is unknown, no scaling should be performed. Without this check a crash would occur. This issue was introduced in https://webrtc-review.googlesource.com/c/src/+/8101, and can only be triggered if the corresponding field trial is set.

Bug: webrtc:8381
Change-Id: I6e7cd8e14f6f4cc972fc094f010ecdf5091b2017
Reviewed-on: https://webrtc-review.googlesource.com/12380
Commit-Queue: Ivo Creusen <ivoc@webrtc.org>
Reviewed-by: Henrik Lundin <henrik.lundin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20336}
This commit is contained in:
Ivo Creusen
2017-10-17 17:19:14 +02:00
committed by Commit Bot
parent a811027990
commit 25eb28c8c2
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -389,6 +389,11 @@ void DelayManager::RegisterEmptyPacket() {
DelayManager::IATVector DelayManager::ScaleHistogram(const IATVector& histogram, DelayManager::IATVector DelayManager::ScaleHistogram(const IATVector& histogram,
int old_packet_length, int old_packet_length,
int new_packet_length) { int new_packet_length) {
if (old_packet_length == 0) {
// If we don't know the previous frame length, don't make any changes to the
// histogram.
return histogram;
}
RTC_DCHECK_GT(new_packet_length, 0); RTC_DCHECK_GT(new_packet_length, 0);
RTC_DCHECK_EQ(old_packet_length % 10, 0); RTC_DCHECK_EQ(old_packet_length % 10, 0);
RTC_DCHECK_EQ(new_packet_length % 10, 0); RTC_DCHECK_EQ(new_packet_length % 10, 0);