admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corrected upper limits of NetEq minimum and maximum delay.

Browse Source 
Set limits of NetEq minimum and maximum delay to 0-10000 ms closed interval.
Fixed error message in Audio Coding Module.

Bug: webrtc:6861
Change-Id: Id1b9928f808bdb6e1088c6895f2ec4a53b00efb2
Reviewed-on: https://webrtc-review.googlesource.com/1343
Commit-Queue: Gustaf Ullberg <gustaf@webrtc.org>
Reviewed-by: Henrik Lundin <henrik.lundin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#19860}
This commit is contained in:
Gustaf Ullberg 2017-09-15 13:59:52 +02:00 committed by Commit Bot
parent 7120742701
commit 48d96c0bcc
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/audio_coding/acm2/audio_coding_module.cc
View File

@ -1096,7 +1096,7 @@ int AudioCodingModuleImpl::IncomingPacket(const uint8_t* incoming_payload,
// Minimum playout delay (Used for lip-sync).
int AudioCodingModuleImpl::SetMinimumPlayoutDelay(int time_ms) {
if ((time_ms < 0) || (time_ms > 10000)) {
LOG(LS_ERROR) << "Delay must be in the range of 0-1000 milliseconds.";
LOG(LS_ERROR) << "Delay must be in the range of 0-10000 milliseconds.";
return -1;
}
return receiver_.SetMinimumDelay(time_ms);
@ -1104,7 +1104,7 @@ int AudioCodingModuleImpl::SetMinimumPlayoutDelay(int time_ms) {
int AudioCodingModuleImpl::SetMaximumPlayoutDelay(int time_ms) {
if ((time_ms < 0) || (time_ms > 10000)) {
LOG(LS_ERROR) << "Delay must be in the range of 0-1000 milliseconds.";
LOG(LS_ERROR) << "Delay must be in the range of 0-10000 milliseconds.";
return -1;
}
return receiver_.SetMaximumDelay(time_ms);

4
modules/audio_coding/neteq/neteq_impl.cc
View File

@ -282,7 +282,7 @@ void NetEqImpl::RemoveAllPayloadTypes() {
bool NetEqImpl::SetMinimumDelay(int delay_ms) {
rtc::CritScope lock(&crit_sect_);
if (delay_ms >= 0 && delay_ms < 10000) {
if (delay_ms >= 0 && delay_ms <= 10000) {
assert(delay_manager_.get());
return delay_manager_->SetMinimumDelay(delay_ms);
}
@ -291,7 +291,7 @@ bool NetEqImpl::SetMinimumDelay(int delay_ms) {
bool NetEqImpl::SetMaximumDelay(int delay_ms) {
rtc::CritScope lock(&crit_sect_);
if (delay_ms >= 0 && delay_ms < 10000) {
if (delay_ms >= 0 && delay_ms <= 10000) {
assert(delay_manager_.get());
return delay_manager_->SetMaximumDelay(delay_ms);
}