summaryrefslogtreecommitdiffstats
path: root/media/video/capture/win
diff options
context:
space:
mode:
authorvrk@chromium.org <vrk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-29 00:55:43 +0000
committervrk@chromium.org <vrk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-29 00:55:43 +0000
commitd95595eb5145e310baf692f359f9488faf73750d (patch)
tree41e2e610d8c3856acf1f747891509dcd12abbd65 /media/video/capture/win
parentb3c1b3b66d1c720172e731d1bfc44cfb44c992a3 (diff)
downloadchromium_src-d95595eb5145e310baf692f359f9488faf73750d.zip
chromium_src-d95595eb5145e310baf692f359f9488faf73750d.tar.gz
chromium_src-d95595eb5145e310baf692f359f9488faf73750d.tar.bz2
Revert 247164 "Implement browser-side logging to WebRtc log"
Need to revert this because it's causing crashes on Canary. BUG=338848 > Implement browser-side logging to WebRtc log > > This adds a logging callback to RenderProcessHost and also adds logging > for device enumeration in the browser process. > > BUG=332261 > > Review URL: https://codereview.chromium.org/140843007 TBR=vrk@chromium.org Review URL: https://codereview.chromium.org/132233058 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247548 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/video/capture/win')
-rw-r--r--media/video/capture/win/video_capture_device_mf_win.cc6
-rw-r--r--media/video/capture/win/video_capture_device_win.cc4
-rw-r--r--media/video/capture/win/video_capture_device_win.h2
3 files changed, 5 insertions, 7 deletions
diff --git a/media/video/capture/win/video_capture_device_mf_win.cc b/media/video/capture/win/video_capture_device_mf_win.cc
index de199c2..f4007fa 100644
--- a/media/video/capture/win/video_capture_device_mf_win.cc
+++ b/media/video/capture/win/video_capture_device_mf_win.cc
@@ -9,7 +9,6 @@
#include "base/lazy_instance.h"
#include "base/memory/ref_counted.h"
-#include "base/strings/stringprintf.h"
#include "base/strings/sys_string_conversions.h"
#include "base/synchronization/waitable_event.h"
#include "base/win/scoped_co_mem.h"
@@ -433,10 +432,9 @@ void VideoCaptureDeviceMFWin::OnIncomingCapturedFrame(
}
void VideoCaptureDeviceMFWin::OnError(HRESULT hr) {
- std::string log_msg = base::StringPrintf("VideoCaptureDeviceMFWin: %x", hr);
- DLOG(ERROR) << log_msg;
+ DLOG(ERROR) << "VideoCaptureDeviceMFWin: " << std::hex << hr;
if (client_.get())
- client_->OnError(log_msg);
+ client_->OnError();
}
} // namespace media
diff --git a/media/video/capture/win/video_capture_device_win.cc b/media/video/capture/win/video_capture_device_win.cc
index 13d4d48..48dd3da 100644
--- a/media/video/capture/win/video_capture_device_win.cc
+++ b/media/video/capture/win/video_capture_device_win.cc
@@ -590,10 +590,10 @@ bool VideoCaptureDeviceWin::CreateCapabilityMap() {
return !capabilities_.empty();
}
-void VideoCaptureDeviceWin::SetErrorState(const std::string& reason) {
+void VideoCaptureDeviceWin::SetErrorState(const char* reason) {
DCHECK(CalledOnValidThread());
DVLOG(1) << reason;
state_ = kError;
- client_->OnError(reason);
+ client_->OnError();
}
} // namespace media
diff --git a/media/video/capture/win/video_capture_device_win.h b/media/video/capture/win/video_capture_device_win.h
index 8c9e546..164c01c 100644
--- a/media/video/capture/win/video_capture_device_win.h
+++ b/media/video/capture/win/video_capture_device_win.h
@@ -59,7 +59,7 @@ class VideoCaptureDeviceWin
virtual void FrameReceived(const uint8* buffer, int length);
bool CreateCapabilityMap();
- void SetErrorState(const std::string& reason);
+ void SetErrorState(const char* reason);
Name device_name_;
InternalState state_;