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

NetEq: Removing two asserts

Browse Source 
These asserts cover error cases that are also handled by the code
after the assert. Should not have both assert and error handling.

BUG=webrtc:4840

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

Cr-Commit-Position: refs/heads/master@{#9804}
This commit is contained in:
henrik.lundin
2015-08-28 01:12:21 -07:00
committed by Commit bot
parent 1e346b20c4
commit 98f3cc54da
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/modules/audio_coding/neteq/neteq_impl.cc
View File

@ -712,7 +712,6 @@ int NetEqImpl::GetAudioInternal(size_t max_length,
int return_value = GetDecision(&operation, &packet_list, &dtmf_event, int return_value = GetDecision(&operation, &packet_list, &dtmf_event,
&play_dtmf); &play_dtmf);
if (return_value != 0) { if (return_value != 0) {
assert(false);
last_mode_ = kModeError; last_mode_ = kModeError;
return return_value; return return_value;
} }
@ -980,7 +979,6 @@ int NetEqImpl::GetDecision(Operations* operation,
if (*play_dtmf && !header) { if (*play_dtmf && !header) {
timestamp_ = dtmf_event->timestamp; timestamp_ = dtmf_event->timestamp;
} else { } else {
assert(header);
if (!header) { if (!header) {
LOG(LS_ERROR) << "Packet missing where it shouldn't."; LOG(LS_ERROR) << "Packet missing where it shouldn't.";
return -1; return -1;