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 
CL partially auto-generated with:

git grep -l "\bassert(" | grep "\.[c|h]" | \
  xargs sed -i 's/\bassert(/RTC_DCHECK(/g'

And with:

git grep -l "RTC_DCHECK(false)" |  \
  xargs sed -i 's/RTC_DCHECK(false)/RTC_NOTREACHED()/g'

With some manual changes to include "rtc_base/checks.h" where
needed.

A follow-up CL will remove assert() from Obj-C code as well
and remove the #include of <assert.h>.

The choice to replace with RTC_DCHECK is because assert()
is because RTC_DCHECK has similar behavior as assert()
based on NDEBUG.

This CL also contains manual changes to switch from
basic RTC_DCHECK to other (preferred) versions like
RTC_DCHECK_GT (and similar).

Bug: webrtc:6779
Change-Id: I00bed8886e03d685a2f42324e34aef2c9b7a63b0
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/224846
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#34442}
This commit is contained in:
Mirko Bonadei
2021-07-08 20:08:20 +02:00
committed by WebRTC LUCI CQ
parent 9b5d570ae0
commit 25ab3228f3
82 changed files with 407 additions and 392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/audio_coding/codecs/isac/fix/test/isac_speed_test.cc
View File

@ -11,6 +11,7 @@
#include "modules/audio_coding/codecs/isac/fix/include/isacfix.h"
#include "modules/audio_coding/codecs/isac/fix/source/settings.h"
#include "modules/audio_coding/codecs/tools/audio_codec_speed_test.h"
#include "rtc_base/checks.h"
using std::string;
@ -83,7 +84,7 @@ float IsacSpeedTest::EncodeABlock(int16_t* in_data,
}
clocks = clock() - clocks;
*encoded_bytes = static_cast<size_t>(value);
assert(*encoded_bytes <= max_bytes);
RTC_DCHECK_LE(*encoded_bytes, max_bytes);
return 1000.0 * clocks / CLOCKS_PER_SEC;
}

2
modules/audio_coding/codecs/legacy_encoded_audio_frame_unittest.cc
View File

@ -88,7 +88,7 @@ class SplitBySamplesTest : public ::testing::TestWithParam<NetEqDecoder> {
samples_per_ms_ = 8;
break;
default:
assert(false);
RTC_NOTREACHED();
break;
}
}

5
modules/audio_coding/codecs/tools/audio_codec_speed_test.cc
View File

@ -10,6 +10,7 @@
#include "modules/audio_coding/codecs/tools/audio_codec_speed_test.h"
#include "rtc_base/checks.h"
#include "rtc_base/format_macros.h"
#include "test/gtest.h"
#include "test/testsupport/file_utils.h"
@ -43,7 +44,7 @@ void AudioCodecSpeedTest::SetUp() {
save_out_data_ = get<4>(GetParam());
FILE* fp = fopen(in_filename_.c_str(), "rb");
assert(fp != NULL);
RTC_DCHECK(fp);
// Obtain file size.
fseek(fp, 0, SEEK_END);
@ -83,7 +84,7 @@ void AudioCodecSpeedTest::SetUp() {
out_filename = test::OutputPath() + out_filename + ".pcm";
out_file_ = fopen(out_filename.c_str(), "wb");
assert(out_file_ != NULL);
RTC_DCHECK(out_file_);
printf("Output to be saved in %s.\n", out_filename.c_str());
}