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

Replace assert() with RTC_DCHECK

Browse Source 
Remove some uses of assert() breaking MSVC compiling, use RTC_DCHECK
instead.

Bug: webrtc:11201
Change-Id: Ie6c3607e422ea17d3393352b4915da3fa24779f9
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/161949
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Reviewed-by: Patrik Höglund <phoglund@google.com>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30081}
This commit is contained in:
Jerome Humbert
2019-12-12 20:49:33 +00:00
committed by Commit Bot
parent 0808a8c690
commit 9338bbcd90
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/audio_coding/neteq/tools/packet.cc
View File

@ -77,7 +77,7 @@ bool Packet::ExtractRedHeaders(std::list<RTPHeader*>* headers) const {
// +-+-+-+-+-+-+-+-+
//
assert(payload_);
RTC_DCHECK(payload_);
const uint8_t* payload_ptr = payload_;
const uint8_t* payload_end_ptr = payload_ptr + payload_length_bytes_;
@ -93,7 +93,7 @@ bool Packet::ExtractRedHeaders(std::list<RTPHeader*>* headers) const {
payload_ptr += 4;
}
// Last header.
assert(payload_ptr < payload_end_ptr);
RTC_DCHECK_LT(payload_ptr, payload_end_ptr);
if (payload_ptr >= payload_end_ptr) {
return false; // Payload too short.
}
@ -124,12 +124,12 @@ bool Packet::ParseHeader(const RtpHeaderParser& parser,
if (!valid_header && !header_only_with_padding) {
return false;
}
assert(header_.headerLength <= packet_length_bytes_);
RTC_DCHECK_LE(header_.headerLength, packet_length_bytes_);
payload_ = &payload_memory_[header_.headerLength];
assert(packet_length_bytes_ >= header_.headerLength);
RTC_DCHECK_GE(packet_length_bytes_, header_.headerLength);
payload_length_bytes_ = packet_length_bytes_ - header_.headerLength;
RTC_CHECK_GE(virtual_packet_length_bytes_, packet_length_bytes_);
assert(virtual_packet_length_bytes_ >= header_.headerLength);
RTC_DCHECK_GE(virtual_packet_length_bytes_, header_.headerLength);
virtual_payload_length_bytes_ =
virtual_packet_length_bytes_ - header_.headerLength;
return true;