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

Replace CHECK(x && y) with two separate CHECK() calls

Browse Source 
That way, the debug printout will tell us which of x and y that was false.

BUG=none

Review-Url: https://codereview.webrtc.org/2988153003
Cr-Commit-Position: refs/heads/master@{#19297}
This commit is contained in:
kwiberg 2017-08-09 17:22:01 -07:00 committed by Commit Bot
parent 608e94a03f
commit ee89e7870c
29 changed files with 86 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
webrtc/logging/rtc_event_log/rtc_event_log2stats.cc
View File

@ -54,7 +54,8 @@ std::pair<uint64_t, bool> ParseVarInt(std::istream& stream) {
if (stream.eof()) {
return std::make_pair(varint, false);
}
RTC_DCHECK(0 <= byte && byte <= 255);
RTC_DCHECK_GE(byte, 0);
RTC_DCHECK_LE(byte, 255);
varint |= static_cast<uint64_t>(byte & 0x7F) << (7 * bytes_read);
if ((byte & 0x80) == 0) {
return std::make_pair(varint, true);

3
webrtc/logging/rtc_event_log/rtc_event_log_parser.cc
View File

@ -104,7 +104,8 @@ std::pair<uint64_t, bool> ParseVarInt(std::istream& stream) {
if (stream.eof()) {
return std::make_pair(varint, false);
}
RTC_DCHECK(0 <= byte && byte <= 255);
RTC_DCHECK_GE(byte, 0);
RTC_DCHECK_LE(byte, 255);
varint |= static_cast<uint64_t>(byte & 0x7F) << (7 * bytes_read);
if ((byte & 0x80) == 0) {
return std::make_pair(varint, true);

6
webrtc/modules/audio_coding/codecs/cng/webrtc_cng.cc
View File

@ -218,13 +218,15 @@ ComfortNoiseEncoder::ComfortNoiseEncoder(int fs, int interval, int quality)
enc_reflCoefs_{0},
enc_corrVector_{0},
enc_seed_(7777) /* For debugging only. */ {
RTC_CHECK(quality <= WEBRTC_CNG_MAX_LPC_ORDER && quality > 0);
RTC_CHECK_GT(quality, 0);
RTC_CHECK_LE(quality, WEBRTC_CNG_MAX_LPC_ORDER);
/* Needed to get the right function pointers in SPLIB. */
WebRtcSpl_Init();
}
void ComfortNoiseEncoder::Reset(int fs, int interval, int quality) {
RTC_CHECK(quality <= WEBRTC_CNG_MAX_LPC_ORDER && quality > 0);
RTC_CHECK_GT(quality, 0);
RTC_CHECK_LE(quality, WEBRTC_CNG_MAX_LPC_ORDER);
enc_nrOfCoefs_ = quality;
enc_sampfreq_ = fs;
enc_interval_ = interval;

3
webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.cc
View File

@ -391,7 +391,8 @@ AudioEncoderOpus::AudioEncoderOpus(
? std::move(bitrate_smoother) : std::unique_ptr<SmoothingFilter>(
// We choose 5sec as initial time constant due to empirical data.
new SmoothingFilterImpl(5000))) {
RTC_DCHECK(0 <= payload_type && payload_type <= 127);
RTC_DCHECK_GE(payload_type, 0);
RTC_DCHECK_LE(payload_type, 127);
// Sanity check of the redundant payload type field that we want to get rid
// of. See https://bugs.chromium.org/p/webrtc/issues/detail?id=7847

4
webrtc/modules/audio_device/dummy/file_audio_device_factory.cc
View File

@ -39,8 +39,8 @@ FileAudioDevice* FileAudioDeviceFactory::CreateFileAudioDevice(
void FileAudioDeviceFactory::SetFilenamesToUse(
const char* inputAudioFilename, const char* outputAudioFilename) {
#ifdef WEBRTC_DUMMY_FILE_DEVICES
RTC_DCHECK(strlen(inputAudioFilename) < MAX_FILENAME_LEN &&
strlen(outputAudioFilename) < MAX_FILENAME_LEN);
RTC_DCHECK_LT(strlen(inputAudioFilename), MAX_FILENAME_LEN);
RTC_DCHECK_LT(strlen(outputAudioFilename), MAX_FILENAME_LEN);
// Copy the strings since we don't know the lifetime of the input pointers.
strncpy(_inputAudioFilename, inputAudioFilename, MAX_FILENAME_LEN);

2
webrtc/modules/audio_device/dummy/file_audio_device_factory.h
View File

@ -31,7 +31,7 @@ class FileAudioDeviceFactory {
const char* outputAudioFilename);
private:
static const uint32_t MAX_FILENAME_LEN = 512;
enum : uint32_t { MAX_FILENAME_LEN = 512 };
static bool _isConfigured;
static char _inputAudioFilename[MAX_FILENAME_LEN];
static char _outputAudioFilename[MAX_FILENAME_LEN];

5
webrtc/modules/audio_processing/transient/moving_moments.cc
View File

@ -32,7 +32,10 @@ MovingMoments::~MovingMoments() {}
void MovingMoments::CalculateMoments(const float* in, size_t in_length,
float* first, float* second) {
RTC_DCHECK(in && in_length > 0 && first && second);
RTC_DCHECK(in);
RTC_DCHECK_GT(in_length, 0);
RTC_DCHECK(first);
RTC_DCHECK(second);
for (size_t i = 0; i < in_length; ++i) {
const float old_value = queue_.front();

3
webrtc/modules/desktop_capture/desktop_capturer_differ_wrapper.cc
View File

@ -61,7 +61,8 @@ void CompareRow(const uint8_t* old_buffer,
const int height = bottom - top;
const int block_count = (width - 1) / kBlockSize;
const int last_block_width = width - block_count * kBlockSize;
RTC_DCHECK(last_block_width <= kBlockSize && last_block_width > 0);
RTC_DCHECK_GT(last_block_width, 0);
RTC_DCHECK_LE(last_block_width, kBlockSize);
// The first block-column in a continuous dirty area in current block-row.
int first_dirty_x_block = -1;

4
webrtc/modules/desktop_capture/desktop_frame_generator.cc
View File

@ -64,8 +64,8 @@ void SetUpdatedRegion(DesktopFrame* frame,
void PaintRect(DesktopFrame* frame, DesktopRect rect, RgbaColor rgba_color) {
static_assert(DesktopFrame::kBytesPerPixel == sizeof(uint32_t),
"kBytesPerPixel should be 4.");
RTC_DCHECK(frame->size().width() >= rect.right() &&
frame->size().height() >= rect.bottom());
RTC_DCHECK_GE(frame->size().width(), rect.right());
RTC_DCHECK_GE(frame->size().height(), rect.bottom());
uint32_t color = rgba_color.ToUInt32();
uint8_t* row = frame->GetFrameDataAtPos(rect.top_left());
for (int i = 0; i < rect.height(); i++) {

15
webrtc/modules/desktop_capture/win/dxgi_adapter_duplicator.cc
View File

@ -134,20 +134,22 @@ bool DxgiAdapterDuplicator::Duplicate(Context* context,
bool DxgiAdapterDuplicator::DuplicateMonitor(Context* context,
int monitor_id,
SharedDesktopFrame* target) {
RTC_DCHECK(monitor_id >= 0 &&
monitor_id < static_cast<int>(duplicators_.size()) &&
context->contexts.size() == duplicators_.size());
RTC_DCHECK_GE(monitor_id, 0);
RTC_DCHECK_LT(monitor_id, duplicators_.size());
RTC_DCHECK_EQ(context->contexts.size(), duplicators_.size());
return duplicators_[monitor_id].Duplicate(&context->contexts[monitor_id],
DesktopVector(), target);
}
DesktopRect DxgiAdapterDuplicator::ScreenRect(int id) const {
RTC_DCHECK(id >= 0 && id < static_cast<int>(duplicators_.size()));
RTC_DCHECK_GE(id, 0);
RTC_DCHECK_LT(id, duplicators_.size());
return duplicators_[id].desktop_rect();
}
const std::string& DxgiAdapterDuplicator::GetDeviceName(int id) const {
RTC_DCHECK(id >= 0 && id < static_cast<int>(duplicators_.size()));
RTC_DCHECK_GE(id, 0);
RTC_DCHECK_LT(id, duplicators_.size());
return duplicators_[id].device_name();
}
@ -166,7 +168,8 @@ int64_t DxgiAdapterDuplicator::GetNumFramesCaptured() const {
void DxgiAdapterDuplicator::TranslateRect(const DesktopVector& position) {
desktop_rect_.Translate(position);
RTC_DCHECK(desktop_rect_.left() >= 0 && desktop_rect_.top() >= 0);
RTC_DCHECK_GE(desktop_rect_.left(), 0);
RTC_DCHECK_GE(desktop_rect_.top(), 0);
for (auto& duplicator : duplicators_) {
duplicator.TranslateRect(position);
}

6
webrtc/modules/desktop_capture/win/dxgi_output_duplicator.cc
View File

@ -69,7 +69,8 @@ DxgiOutputDuplicator::DxgiOutputDuplicator(const D3dDevice& device,
desktop_rect_(RECTToDesktopRect(desc.DesktopCoordinates)) {
RTC_DCHECK(output_);
RTC_DCHECK(!desktop_rect_.is_empty());
RTC_DCHECK(desktop_rect_.width() > 0 && desktop_rect_.height() > 0);
RTC_DCHECK_GT(desktop_rect_.width(), 0);
RTC_DCHECK_GT(desktop_rect_.height(), 0);
}
DxgiOutputDuplicator::DxgiOutputDuplicator(DxgiOutputDuplicator&& other) =
@ -385,7 +386,8 @@ int64_t DxgiOutputDuplicator::num_frames_captured() const {
void DxgiOutputDuplicator::TranslateRect(const DesktopVector& position) {
desktop_rect_.Translate(position);
RTC_DCHECK(desktop_rect_.left() >= 0 && desktop_rect_.top() >= 0);
RTC_DCHECK_GE(desktop_rect_.left(), 0);
RTC_DCHECK_GE(desktop_rect_.top(), 0);
}
} // namespace webrtc

3
webrtc/modules/desktop_capture/win/dxgi_texture.cc
View File

@ -42,7 +42,8 @@ DxgiTexture::~DxgiTexture() = default;
bool DxgiTexture::CopyFrom(const DXGI_OUTDUPL_FRAME_INFO& frame_info,
IDXGIResource* resource) {
RTC_DCHECK(resource && frame_info.AccumulatedFrames > 0);
RTC_DCHECK_GT(frame_info.AccumulatedFrames, 0);
RTC_DCHECK(resource);
ComPtr<ID3D11Texture2D> texture;
_com_error error = resource->QueryInterface(
__uuidof(ID3D11Texture2D),

3
webrtc/modules/desktop_capture/win/dxgi_texture_mapping.cc
View File

@ -29,7 +29,8 @@ DxgiTextureMapping::~DxgiTextureMapping() = default;
bool DxgiTextureMapping::CopyFromTexture(
const DXGI_OUTDUPL_FRAME_INFO& frame_info,
ID3D11Texture2D* texture) {
RTC_DCHECK(texture && frame_info.AccumulatedFrames > 0);
RTC_DCHECK_GT(frame_info.AccumulatedFrames, 0);
RTC_DCHECK(texture);
*rect() = {0};
_com_error error = duplication_->MapDesktopSurface(rect());
if (error.Error() != S_OK) {

3
webrtc/modules/desktop_capture/win/dxgi_texture_staging.cc
View File

@ -87,7 +87,8 @@ void DxgiTextureStaging::AssertStageAndSurfaceAreSameObject() {
bool DxgiTextureStaging::CopyFromTexture(
const DXGI_OUTDUPL_FRAME_INFO& frame_info,
ID3D11Texture2D* texture) {
RTC_DCHECK(texture && frame_info.AccumulatedFrames > 0);
RTC_DCHECK_GT(frame_info.AccumulatedFrames, 0);
RTC_DCHECK(texture);
// AcquireNextFrame returns a CPU inaccessible IDXGIResource, so we need to
// copy it to a CPU accessible staging ID3D11Texture2D.

5
webrtc/modules/rtp_rtcp/source/rtp_sender.cc
View File

@ -288,9 +288,8 @@ void RTPSender::SetSendPayloadType(int8_t payload_type) {
}
void RTPSender::SetMaxRtpPacketSize(size_t max_packet_size) {
// Sanity check.
RTC_DCHECK(max_packet_size >= 100 && max_packet_size <= IP_PACKET_SIZE)
<< "Invalid max payload length: " << max_packet_size;
RTC_DCHECK_GE(max_packet_size, 100);
RTC_DCHECK_LE(max_packet_size, IP_PACKET_SIZE);
rtc::CritScope lock(&send_critsect_);
max_packet_size_ = max_packet_size;
}

3
webrtc/modules/video_coding/frame_object.cc
View File

@ -102,7 +102,8 @@ RtpFrameObject::RtpFrameObject(PacketBuffer* packet_buffer,
timestamp = first_packet->timestamp;
VCMPacket* last_packet = packet_buffer_->GetPacket(last_seq_num);
RTC_CHECK(last_packet && last_packet->markerBit);
RTC_CHECK(last_packet);
RTC_CHECK(last_packet->markerBit);
// http://www.etsi.org/deliver/etsi_ts/126100_126199/126114/12.07.00_60/
// ts_126114v120700p.pdf Section 7.4.5.
// The MTSI client shall add the payload bytes as defined in this clause

3
webrtc/p2p/base/p2ptransportchannel_unittest.cc
View File

@ -2179,7 +2179,8 @@ TEST_F(P2PTransportChannelTest, SignalReadyToSendWithPresumedWritable) {
class P2PTransportChannelSameNatTest : public P2PTransportChannelTestBase {
protected:
void ConfigureEndpoints(Config nat_type, Config config1, Config config2) {
RTC_CHECK(nat_type >= NAT_FULL_CONE && nat_type <= NAT_SYMMETRIC);
RTC_CHECK_GE(nat_type, NAT_FULL_CONE);
RTC_CHECK_LE(nat_type, NAT_SYMMETRIC);
rtc::NATSocketServer::Translator* outer_nat =
nat()->AddTranslator(kPublicAddrs[0], kNatAddrs[0],
static_cast<rtc::NATType>(nat_type - NAT_FULL_CONE));

3
webrtc/p2p/client/basicportallocator.cc
View File

@ -1350,7 +1350,8 @@ void AllocationSequence::CreateRelayPorts() {
// If BasicPortAllocatorSession::OnAllocate left relay ports enabled then we
// ought to have a relay list for them here.
RTC_DCHECK(config_ && !config_->relays.empty());
RTC_DCHECK(config_);
RTC_DCHECK(!config_->relays.empty());
if (!(config_ && !config_->relays.empty())) {
LOG(LS_WARNING)
<< "AllocationSequence: No relay server configured, skipping.";

11
webrtc/pc/datachannel.cc
View File

@ -282,8 +282,9 @@ void DataChannel::RemotePeerRequestClose() {
}
void DataChannel::SetSctpSid(int sid) {
RTC_DCHECK(config_.id < 0 && sid >= 0 &&
data_channel_type_ == cricket::DCT_SCTP);
RTC_DCHECK_LT(config_.id, 0);
RTC_DCHECK_GE(sid, 0);
RTC_DCHECK_EQ(data_channel_type_, cricket::DCT_SCTP);
if (config_.id == sid) {
return;
}
@ -618,8 +619,10 @@ void DataChannel::QueueControlMessage(const rtc::CopyOnWriteBuffer& buffer) {
bool DataChannel::SendControlMessage(const rtc::CopyOnWriteBuffer& buffer) {
bool is_open_message = handshake_state_ == kHandshakeShouldSendOpen;
RTC_DCHECK(data_channel_type_ == cricket::DCT_SCTP && writable_ &&
config_.id >= 0 && (!is_open_message || !config_.negotiated));
RTC_DCHECK_EQ(data_channel_type_, cricket::DCT_SCTP);
RTC_DCHECK(writable_);
RTC_DCHECK_GE(config_.id, 0);
RTC_DCHECK(!is_open_message || !config_.negotiated);
cricket::SendDataParams send_params;
send_params.sid = config_.id;

3
webrtc/pc/remoteaudiosource.cc
View File

@ -96,7 +96,8 @@ bool RemoteAudioSource::remote() const {
}
void RemoteAudioSource::SetVolume(double volume) {
RTC_DCHECK(volume >= 0 && volume <= 10);
RTC_DCHECK_GE(volume, 0);
RTC_DCHECK_LE(volume, 10);
for (auto* observer : audio_observers_)
observer->OnSetVolume(volume);
}

3
webrtc/pc/rtpreceiver.cc
View File

@ -53,7 +53,8 @@ void AudioRtpReceiver::OnChanged() {
}
void AudioRtpReceiver::OnSetVolume(double volume) {
RTC_DCHECK(volume >= 0 && volume <= 10);
RTC_DCHECK_GE(volume, 0);
RTC_DCHECK_LE(volume, 10);
cached_volume_ = volume;
if (!channel_) {
LOG(LS_ERROR) << "AudioRtpReceiver::OnSetVolume: No audio channel exists.";

6
webrtc/pc/rtpsender.cc
View File

@ -243,7 +243,8 @@ void AudioRtpSender::Stop() {
}
void AudioRtpSender::SetAudioSend() {
RTC_DCHECK(!stopped_ && can_send_track());
RTC_DCHECK(!stopped_);
RTC_DCHECK(can_send_track());
if (!channel_) {
LOG(LS_ERROR) << "SetAudioSend: No audio channel exists.";
return;
@ -430,7 +431,8 @@ void VideoRtpSender::Stop() {
}
void VideoRtpSender::SetVideoSend() {
RTC_DCHECK(!stopped_ && can_send_track());
RTC_DCHECK(!stopped_);
RTC_DCHECK(can_send_track());
if (!channel_) {
LOG(LS_ERROR) << "SetVideoSend: No video channel exists.";
return;

3
webrtc/pc/test/fakedatachannelprovider.h
View File

@ -26,7 +26,8 @@ class FakeDataChannelProvider : public webrtc::DataChannelProviderInterface {
bool SendData(const cricket::SendDataParams& params,
const rtc::CopyOnWriteBuffer& payload,
cricket::SendDataResult* result) override {
RTC_CHECK(ready_to_send_ && transport_available_);
RTC_CHECK(ready_to_send_);
RTC_CHECK(transport_available_);
if (send_blocked_) {
*result = cricket::SDR_BLOCK;
return false;

8
webrtc/pc/test/fakertccertificategenerator.h
View File

@ -151,12 +151,12 @@ class FakeRTCCertificateGenerator
if (should_fail_) {
msg_id = MSG_FAILURE;
} else if (key_params.type() == rtc::KT_RSA) {
RTC_DCHECK(key_params.rsa_params().mod_size == 1024 &&
key_params.rsa_params().pub_exp == 0x10001);
RTC_DCHECK_EQ(key_params.rsa_params().mod_size, 1024);
RTC_DCHECK_EQ(key_params.rsa_params().pub_exp, 0x10001);
msg_id = MSG_SUCCESS_RSA;
} else {
RTC_DCHECK(key_params.type() == rtc::KT_ECDSA &&
key_params.ec_curve() == rtc::EC_NIST_P256);
RTC_DCHECK_EQ(key_params.type(), rtc::KT_ECDSA);
RTC_DCHECK_EQ(key_params.ec_curve(), rtc::EC_NIST_P256);
msg_id = MSG_SUCCESS_ECDSA;
}
rtc::Thread::Current()->Post(RTC_FROM_HERE, this, msg_id, msg);

4
webrtc/rtc_base/macutils.cc
View File

@ -72,7 +72,9 @@ void DecodeFourChar(UInt32 fc, std::string* out) {
}
static bool GetOSVersion(int* major, int* minor, int* bugfix) {
RTC_DCHECK(major && minor && bugfix);
RTC_DCHECK(major);
RTC_DCHECK(minor);
RTC_DCHECK(bugfix);
struct utsname uname_info;
if (uname(&uname_info) != 0)
return false;

6
webrtc/rtc_base/opensslstreamadapter.cc
View File

@ -555,7 +555,8 @@ StreamResult OpenSSLStreamAdapter::Write(const void* data, size_t data_len,
switch (ssl_error) {
case SSL_ERROR_NONE:
LOG(LS_VERBOSE) << " -- success";
RTC_DCHECK(0 < code && static_cast<unsigned>(code) <= data_len);
RTC_DCHECK_GT(code, 0);
RTC_DCHECK_LE(code, data_len);
if (written)
*written = code;
return SR_SUCCESS;
@ -619,7 +620,8 @@ StreamResult OpenSSLStreamAdapter::Read(void* data, size_t data_len,
switch (ssl_error) {
case SSL_ERROR_NONE:
LOG(LS_VERBOSE) << " -- success";
RTC_DCHECK(0 < code && static_cast<unsigned>(code) <= data_len);
RTC_DCHECK_GT(code, 0);
RTC_DCHECK_LE(code, data_len);
if (read)
*read = code;

6
webrtc/rtc_base/proxyserver.cc
View File

@ -43,7 +43,8 @@ SocketAddress ProxyServer::GetServerAddress() {
}
void ProxyServer::OnAcceptEvent(AsyncSocket* socket) {
RTC_DCHECK(socket != nullptr && socket == server_socket_.get());
RTC_DCHECK(socket);
RTC_DCHECK_EQ(socket, server_socket_.get());
AsyncSocket* int_socket = socket->Accept(nullptr);
AsyncProxyServerSocket* wrapped_socket = WrapSocket(int_socket);
AsyncSocket* ext_socket = ext_factory_->CreateAsyncSocket(ext_ip_.family(),
@ -84,7 +85,8 @@ ProxyBinding::~ProxyBinding() = default;
void ProxyBinding::OnConnectRequest(AsyncProxyServerSocket* socket,
const SocketAddress& addr) {
RTC_DCHECK(!connected_ && ext_socket_.get() != nullptr);
RTC_DCHECK(!connected_);
RTC_DCHECK(ext_socket_);
ext_socket_->Connect(addr);
// TODO: handle errors here
}

4
webrtc/rtc_base/socketaddress.cc
View File

@ -9,6 +9,7 @@
*/
#include "webrtc/rtc_base/socketaddress.h"
#include "webrtc/rtc_base/safe_conversions.h"
#if defined(WEBRTC_POSIX)
#include <sys/types.h>
@ -120,8 +121,7 @@ void SocketAddress::SetResolvedIP(const IPAddress& ip) {
}
void SocketAddress::SetPort(int port) {
RTC_DCHECK((0 <= port) && (port < 65536));
port_ = static_cast<uint16_t>(port);
port_ = rtc::dchecked_cast<uint16_t>(port);
}
uint32_t SocketAddress::ip() const {

6
webrtc/voice_engine/channel.cc
View File

@ -2502,7 +2502,8 @@ void Channel::RegisterSenderCongestionControlObjects(
RTC_DCHECK(rtp_packet_sender);
RTC_DCHECK(transport_feedback_observer);
RTC_DCHECK(packet_router && !packet_router_);
RTC_DCHECK(packet_router);
RTC_DCHECK(!packet_router_);
rtcp_observer_->SetBandwidthObserver(bandwidth_observer);
feedback_observer_proxy_->SetTransportFeedbackObserver(
transport_feedback_observer);
@ -2516,7 +2517,8 @@ void Channel::RegisterSenderCongestionControlObjects(
void Channel::RegisterReceiverCongestionControlObjects(
PacketRouter* packet_router) {
RTC_DCHECK(packet_router && !packet_router_);
RTC_DCHECK(packet_router);
RTC_DCHECK(!packet_router_);
constexpr bool remb_candidate = false;
packet_router->AddReceiveRtpModule(_rtpRtcpModule.get(), remb_candidate);
packet_router_ = packet_router;