Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(422)

Unified Diff: webrtc/test/frame_generator.cc

Issue 1335923002: Add RTC_ prefix to (D)CHECKs and related macros. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase. Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/system_wrappers/source/tick_util.cc ('k') | webrtc/test/layer_filtering_transport.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/test/frame_generator.cc
diff --git a/webrtc/test/frame_generator.cc b/webrtc/test/frame_generator.cc
index 782e39218be49ef192a116c82065c5a3dfd48fa3..db512610532710fa87d30eb4e92702f0d91678df 100644
--- a/webrtc/test/frame_generator.cc
+++ b/webrtc/test/frame_generator.cc
@@ -146,13 +146,13 @@ class ScrollingImageFrameGenerator : public FrameGenerator {
current_frame_num_(num_frames_ - 1),
current_source_frame_(nullptr),
file_generator_(files, source_width, source_height, 1) {
- DCHECK(clock_ != nullptr);
- DCHECK_GT(num_frames_, 0u);
- DCHECK_GE(source_height, target_height);
- DCHECK_GE(source_width, target_width);
- DCHECK_GE(scroll_time_ms, 0);
- DCHECK_GE(pause_time_ms, 0);
- DCHECK_GT(scroll_time_ms + pause_time_ms, 0);
+ RTC_DCHECK(clock_ != nullptr);
+ RTC_DCHECK_GT(num_frames_, 0u);
+ RTC_DCHECK_GE(source_height, target_height);
+ RTC_DCHECK_GE(source_width, target_width);
+ RTC_DCHECK_GE(scroll_time_ms, 0);
+ RTC_DCHECK_GE(pause_time_ms, 0);
+ RTC_DCHECK_GT(scroll_time_ms + pause_time_ms, 0);
current_frame_.CreateEmptyFrame(static_cast<int>(target_width),
static_cast<int>(target_height),
static_cast<int>(target_width),
@@ -187,7 +187,7 @@ class ScrollingImageFrameGenerator : public FrameGenerator {
current_source_frame_ = file_generator_.NextFrame();
current_frame_num_ = (current_frame_num_ + 1) % num_frames_;
}
- DCHECK(current_source_frame_ != nullptr);
+ RTC_DCHECK(current_source_frame_ != nullptr);
}
void CropSourceToScrolledImage(double scroll_factor) {
@@ -247,7 +247,7 @@ FrameGenerator* FrameGenerator::CreateFromYuvFile(
std::vector<FILE*> files;
for (const std::string& filename : filenames) {
FILE* file = fopen(filename.c_str(), "rb");
- DCHECK(file != nullptr);
+ RTC_DCHECK(file != nullptr);
files.push_back(file);
}
@@ -267,7 +267,7 @@ FrameGenerator* FrameGenerator::CreateScrollingInputFromYuvFiles(
std::vector<FILE*> files;
for (const std::string& filename : filenames) {
FILE* file = fopen(filename.c_str(), "rb");
- DCHECK(file != nullptr);
+ RTC_DCHECK(file != nullptr);
files.push_back(file);
}
« no previous file with comments | « webrtc/system_wrappers/source/tick_util.cc ('k') | webrtc/test/layer_filtering_transport.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698