diff --git a/modules/audio_coding/neteq/tools/packet.cc b/modules/audio_coding/neteq/tools/packet.cc index 6ed6f98755..48959e4f62 100644 --- a/modules/audio_coding/neteq/tools/packet.cc +++ b/modules/audio_coding/neteq/tools/packet.cc @@ -77,7 +77,7 @@ bool Packet::ExtractRedHeaders(std::list* 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* 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; diff --git a/modules/desktop_capture/cropping_window_capturer_win.cc b/modules/desktop_capture/cropping_window_capturer_win.cc index 86c9ba7167..6e53ca3522 100644 --- a/modules/desktop_capture/cropping_window_capturer_win.cc +++ b/modules/desktop_capture/cropping_window_capturer_win.cc @@ -95,7 +95,7 @@ struct TopWindowVerifierContext : public SelectedWindowContext { // window (which may have been closed). RTC_LOG(LS_WARNING) << "Failed to find selected window (only expected " "if it was closed)"; - assert(!IsWindow(selected_window())); + RTC_DCHECK(!IsWindow(selected_window())); return false; } else if (lastError == ERROR_INVALID_WINDOW_HANDLE) { // This error may occur if a window is closed around the time it's @@ -118,7 +118,7 @@ struct TopWindowVerifierContext : public SelectedWindowContext { // firing an assert when enabled, report that the selected window isn't // topmost to avoid inadvertent capture of other windows. RTC_LOG(LS_ERROR) << "Failed to enumerate windows: " << lastError; - assert(false); + RTC_DCHECK(false); return false; } }