summaryrefslogtreecommitdiffstats
path: root/media/video/capture/win
diff options
context:
space:
mode:
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_;