Index: media/capture/video/win/video_capture_device_win.cc |
diff --git a/media/capture/video/win/video_capture_device_win.cc b/media/capture/video/win/video_capture_device_win.cc |
index af34f863ea766440382e732b96af0fcbd4acf2e2..9014876c1d956f5dbb3b39284b34255a953e2e59 100644 |
--- a/media/capture/video/win/video_capture_device_win.cc |
+++ b/media/capture/video/win/video_capture_device_win.cc |
@@ -16,7 +16,7 @@ |
#include "base/win/scoped_co_mem.h" |
#include "base/win/scoped_variant.h" |
#include "media/base/timestamp_constants.h" |
-#include "media/capture/video/blob_utils.h" |
+#include "media/capture/video/video_capture_utils.h" |
using base::win::ScopedCoMem; |
using base::win::ScopedComPtr; |
@@ -175,6 +175,9 @@ VideoCaptureDeviceWin::TranslateMediaSubtypeToPixelFormat( |
if (sub_type == pixel_format.sub_type) |
return pixel_format.format; |
} |
+ if (IsY16FormatFourCc(sub_type.Data1)) { |
+ return PIXEL_FORMAT_Y16; |
+ } |
mcasas
2016/10/21 00:10:51
Here and in the equivalent MF version, I don't lik
aleksandar.stojiljkovic
2016/10/21 22:11:11
No problem - I though it was a good idea to share
aleksandar.stojiljkovic
2016/10/24 14:57:49
Done. Done like for other formats.
|
#ifndef NDEBUG |
WCHAR guid_str[128]; |
StringFromGUID2(sub_type, guid_str, arraysize(guid_str)); |