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

Unified Diff: talk/media/webrtc/webrtcvideocapturer.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 | « talk/media/webrtc/fakewebrtcvoiceengine.h ('k') | talk/media/webrtc/webrtcvideoengine2.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/media/webrtc/webrtcvideocapturer.cc
diff --git a/talk/media/webrtc/webrtcvideocapturer.cc b/talk/media/webrtc/webrtcvideocapturer.cc
index f8c373db36b3048e458ff58d2e3ecc7d80ca5031..60b84220c49e650fa54f3ab44ea30eb3e6bfe679 100644
--- a/talk/media/webrtc/webrtcvideocapturer.cc
+++ b/talk/media/webrtc/webrtcvideocapturer.cc
@@ -152,7 +152,7 @@ WebRtcVideoCapturer::~WebRtcVideoCapturer() {
}
bool WebRtcVideoCapturer::Init(const Device& device) {
- DCHECK(!start_thread_);
+ RTC_DCHECK(!start_thread_);
if (module_) {
LOG(LS_ERROR) << "The capturer is already initialized";
return false;
@@ -226,7 +226,7 @@ bool WebRtcVideoCapturer::Init(const Device& device) {
}
bool WebRtcVideoCapturer::Init(webrtc::VideoCaptureModule* module) {
- DCHECK(!start_thread_);
+ RTC_DCHECK(!start_thread_);
if (module_) {
LOG(LS_ERROR) << "The capturer is already initialized";
return false;
@@ -263,7 +263,7 @@ bool WebRtcVideoCapturer::SetApplyRotation(bool enable) {
// Can't take lock here as this will cause deadlock with
// OnIncomingCapturedFrame. In fact, the whole method, including methods it
// calls, can't take lock.
- DCHECK(module_);
+ RTC_DCHECK(module_);
const std::string group_name =
webrtc::field_trial::FindFullName("WebRTC-CVO");
@@ -285,13 +285,13 @@ CaptureState WebRtcVideoCapturer::Start(const VideoFormat& capture_format) {
}
if (start_thread_) {
LOG(LS_ERROR) << "The capturer is already running";
- DCHECK(start_thread_->IsCurrent())
+ RTC_DCHECK(start_thread_->IsCurrent())
<< "Trying to start capturer on different threads";
return CS_FAILED;
}
start_thread_ = rtc::Thread::Current();
- DCHECK(!async_invoker_);
+ RTC_DCHECK(!async_invoker_);
async_invoker_.reset(new rtc::AsyncInvoker());
captured_frames_ = 0;
@@ -327,9 +327,9 @@ void WebRtcVideoCapturer::Stop() {
LOG(LS_ERROR) << "The capturer is already stopped";
return;
}
- DCHECK(start_thread_);
- DCHECK(start_thread_->IsCurrent());
- DCHECK(async_invoker_);
+ RTC_DCHECK(start_thread_);
+ RTC_DCHECK(start_thread_->IsCurrent());
+ RTC_DCHECK(async_invoker_);
if (IsRunning()) {
// The module is responsible for OnIncomingCapturedFrame being called, if
// we stop it we will get no further callbacks.
@@ -372,8 +372,8 @@ void WebRtcVideoCapturer::OnIncomingCapturedFrame(
const int32_t id,
const webrtc::VideoFrame& sample) {
// This can only happen between Start() and Stop().
- DCHECK(start_thread_);
- DCHECK(async_invoker_);
+ RTC_DCHECK(start_thread_);
+ RTC_DCHECK(async_invoker_);
if (start_thread_->IsCurrent()) {
SignalFrameCapturedOnStartThread(sample);
} else {
@@ -398,9 +398,9 @@ void WebRtcVideoCapturer::OnCaptureDelayChanged(const int32_t id,
void WebRtcVideoCapturer::SignalFrameCapturedOnStartThread(
const webrtc::VideoFrame frame) {
// This can only happen between Start() and Stop().
- DCHECK(start_thread_);
- DCHECK(start_thread_->IsCurrent());
- DCHECK(async_invoker_);
+ RTC_DCHECK(start_thread_);
+ RTC_DCHECK(start_thread_->IsCurrent());
+ RTC_DCHECK(async_invoker_);
++captured_frames_;
// Log the size and pixel aspect ratio of the first captured frame.
« no previous file with comments | « talk/media/webrtc/fakewebrtcvoiceengine.h ('k') | talk/media/webrtc/webrtcvideoengine2.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698