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

Unified Diff: trunk/src/content/browser/renderer_host/media/video_capture_device_impl.cc

Issue 132233058: Revert 247164 "Implement browser-side logging to WebRtc log" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 11 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
Index: trunk/src/content/browser/renderer_host/media/video_capture_device_impl.cc
===================================================================
--- trunk/src/content/browser/renderer_host/media/video_capture_device_impl.cc (revision 247547)
+++ trunk/src/content/browser/renderer_host/media/video_capture_device_impl.cc (working copy)
@@ -155,10 +155,10 @@
client_.reset();
}
-void ThreadSafeCaptureOracle::ReportError(const std::string& reason) {
+void ThreadSafeCaptureOracle::ReportError() {
base::AutoLock guard(lock_);
if (client_)
- client_->OnError(reason);
+ client_->OnError();
}
void ThreadSafeCaptureOracle::DidCaptureFrame(
@@ -196,19 +196,16 @@
}
if (params.requested_format.frame_rate <= 0) {
- std::string error_msg = base::StringPrintf(
- "invalid frame_rate: %d", params.requested_format.frame_rate);
- DVLOG(1) << error_msg;
- client->OnError(error_msg);
+ DVLOG(1) << "invalid frame_rate: " << params.requested_format.frame_rate;
+ client->OnError();
return;
}
if (params.requested_format.frame_size.width() < kMinFrameWidth ||
params.requested_format.frame_size.height() < kMinFrameHeight) {
- std::string error_msg =
- "invalid frame size: " + params.requested_format.frame_size.ToString();
- DVLOG(1) << error_msg;
- client->OnError(error_msg);
+ DVLOG(1) << "invalid frame size: "
+ << params.requested_format.frame_size.ToString();
+ client->OnError();
return;
}
@@ -255,9 +252,8 @@
void VideoCaptureDeviceImpl::CaptureStarted(bool success) {
DCHECK(thread_checker_.CalledOnValidThread());
if (!success) {
- std::string reason("Failed to start capture machine.");
- DVLOG(1) << reason;
- Error(reason);
+ DVLOG(1) << "Failed to start capture machine.";
+ Error();
}
}
@@ -295,14 +291,14 @@
state_ = next_state;
}
-void VideoCaptureDeviceImpl::Error(const std::string& reason) {
+void VideoCaptureDeviceImpl::Error() {
DCHECK(thread_checker_.CalledOnValidThread());
if (state_ == kIdle)
return;
if (oracle_proxy_)
- oracle_proxy_->ReportError(reason);
+ oracle_proxy_->ReportError();
StopAndDeAllocate();
TransitionStateTo(kError);

Powered by Google App Engine
This is Rietveld 408576698