Index: media/video/capture/win/video_capture_device_factory_win.cc |
diff --git a/media/video/capture/win/video_capture_device_factory_win.cc b/media/video/capture/win/video_capture_device_factory_win.cc |
index 75ee59d3bf495be332468550d2bb9ef22a16ef5d..2ffeb14d2ed41d60addcb41d3d782e8214808ada 100644 |
--- a/media/video/capture/win/video_capture_device_factory_win.cc |
+++ b/media/video/capture/win/video_capture_device_factory_win.cc |
@@ -186,7 +186,8 @@ static void GetDeviceNamesMediaFoundation( |
} |
} |
if (FAILED(hr)) |
- DLOG(WARNING) << "GetAllocatedString failed: " << std::hex << hr; |
+ DPLOG(ERROR) << "Failed to GetAllocatedString"; |
+ |
devices[i]->Release(); |
} |
} |
@@ -216,7 +217,7 @@ static void GetDeviceSupportedFormatsDirectShow( |
hr = VideoCaptureDeviceWin::GetDeviceFilter(device, |
capture_filter.Receive()); |
if (!capture_filter) { |
- DVLOG(2) << "Failed to create capture filter."; |
+ DPLOG(ERROR) << "Failed to create capture filter"; |
return; |
} |
@@ -225,14 +226,14 @@ static void GetDeviceSupportedFormatsDirectShow( |
PINDIR_OUTPUT, |
PIN_CATEGORY_CAPTURE)); |
if (!output_capture_pin) { |
- DVLOG(2) << "Failed to get capture output pin"; |
+ DPLOG(ERROR) << "Failed to get capture output pin"; |
return; |
} |
ScopedComPtr<IAMStreamConfig> stream_config; |
hr = output_capture_pin.QueryInterface(stream_config.Receive()); |
if (FAILED(hr)) { |
- DVLOG(2) << "Failed to get IAMStreamConfig interface from " |
+ DPLOG(ERROR) << "Failed to get IAMStreamConfig interface from " |
"capture device"; |
return; |
} |
@@ -240,7 +241,7 @@ static void GetDeviceSupportedFormatsDirectShow( |
int count = 0, size = 0; |
hr = stream_config->GetNumberOfCapabilities(&count, &size); |
if (FAILED(hr)) { |
- DVLOG(2) << "Failed to GetNumberOfCapabilities"; |
+ DPLOG(ERROR) << "Failed to GetNumberOfCapabilities"; |
return; |
} |
@@ -251,7 +252,7 @@ static void GetDeviceSupportedFormatsDirectShow( |
// GetStreamCaps() may return S_FALSE, so don't use FAILED() or SUCCEED() |
// macros here since they'll trigger incorrectly. |
if (hr != S_OK) { |
- DVLOG(2) << "Failed to GetStreamCaps"; |
+ DPLOG(ERROR) << "Failed to GetStreamCaps"; |
return; |
} |
@@ -293,7 +294,7 @@ static void GetDeviceSupportedFormatsMediaFoundation( |
HRESULT hr = |
MFCreateSourceReaderFromMediaSource(source, NULL, reader.Receive()); |
if (FAILED(hr)) { |
- DLOG(ERROR) << "MFCreateSourceReaderFromMediaSource: " << std::hex << hr; |
+ DPLOG(ERROR) << "Failed to MFCreateSourceReaderFromMediaSource"; |
return; |
} |
@@ -307,7 +308,7 @@ static void GetDeviceSupportedFormatsMediaFoundation( |
UINT32 width, height; |
hr = MFGetAttributeSize(type, MF_MT_FRAME_SIZE, &width, &height); |
if (FAILED(hr)) { |
- DLOG(ERROR) << "MFGetAttributeSize: " << std::hex << hr; |
+ DPLOG(ERROR) << "Failed to MFGetAttributeSize"; |
return; |
} |
VideoCaptureFormat capture_format; |
@@ -316,7 +317,7 @@ static void GetDeviceSupportedFormatsMediaFoundation( |
UINT32 numerator, denominator; |
hr = MFGetAttributeRatio(type, MF_MT_FRAME_RATE, &numerator, &denominator); |
if (FAILED(hr)) { |
- DLOG(ERROR) << "MFGetAttributeSize: " << std::hex << hr; |
+ DPLOG(ERROR) << "Failed to MFGetAttributeSize"; |
return; |
} |
capture_format.frame_rate = denominator |
@@ -325,7 +326,7 @@ static void GetDeviceSupportedFormatsMediaFoundation( |
GUID type_guid; |
hr = type->GetGUID(MF_MT_SUBTYPE, &type_guid); |
if (FAILED(hr)) { |
- DLOG(ERROR) << "GetGUID: " << std::hex << hr; |
+ DPLOG(ERROR) << "Failed ot GetGUID"; |
return; |
} |
VideoCaptureDeviceMFWin::FormatFromGuid(type_guid, |