Index: content/browser/renderer_host/media/video_capture_controller.cc |
diff --git a/content/browser/renderer_host/media/video_capture_controller.cc b/content/browser/renderer_host/media/video_capture_controller.cc |
index 3a836dd2ff0ed546ed9a165d580a1434ae3b40ee..737a9f8d4a78106f7a254e242722abbaeb605064 100644 |
--- a/content/browser/renderer_host/media/video_capture_controller.cc |
+++ b/content/browser/renderer_host/media/video_capture_controller.cc |
@@ -166,7 +166,9 @@ void VideoCaptureController::AddClient( |
// Check that requested VideoCaptureParams are valid and supported. If not, |
// report an error immediately and punt. |
if (!params.IsValid() || |
- params.requested_format.pixel_format != media::PIXEL_FORMAT_I420 || |
+ !(params.requested_format.pixel_format == media::PIXEL_FORMAT_I420 || |
+ params.requested_format.pixel_format == media::PIXEL_FORMAT_Y8 || |
+ params.requested_format.pixel_format == media::PIXEL_FORMAT_Y16) || |
(params.requested_format.pixel_storage != media::PIXEL_STORAGE_CPU && |
params.requested_format.pixel_storage != |
media::PIXEL_STORAGE_GPUMEMORYBUFFER)) { |
@@ -372,7 +374,9 @@ void VideoCaptureController::DoIncomingCapturedVideoFrameOnIOThread( |
frame->metadata()->MergeInternalValuesInto(metadata.get()); |
// Only I420 pixel format is currently supported. |
- DCHECK_EQ(frame->format(), media::PIXEL_FORMAT_I420) |
+ DCHECK(frame->format() == media::PIXEL_FORMAT_I420 || |
+ frame->format() == media::PIXEL_FORMAT_Y8 || |
+ frame->format() == media::PIXEL_FORMAT_Y16) |
<< "Unsupported pixel format: " |
<< media::VideoPixelFormatToString(frame->format()); |