Commit edb3fe56 authored by Saman Sami's avatar Saman Sami Committed by Commit Bot

Add ARGB to VideoCapturePixelFormat enum

http://crrev.com/1cecc36 broke DevTools eyedropper tool.

Bug: 846379
Change-Id: I812b66c32192166b3c34582bf6b63407709ba784
Reviewed-on: https://chromium-review.googlesource.com/1072034Reviewed-by: default avatarTom Sepez <tsepez@chromium.org>
Commit-Queue: Saman Sami <samans@chromium.org>
Cr-Commit-Position: refs/heads/master@{#561600}
parent fbfa5e4d
......@@ -11,7 +11,8 @@ import "ui/gfx/geometry/mojo/geometry.mojom";
enum VideoCapturePixelFormat {
I420,
Y16
Y16,
ARGB
};
enum ResolutionChangePolicy {
......
......@@ -91,6 +91,8 @@ EnumTraits<media::mojom::VideoCapturePixelFormat,
return media::mojom::VideoCapturePixelFormat::I420;
case media::VideoPixelFormat::PIXEL_FORMAT_Y16:
return media::mojom::VideoCapturePixelFormat::Y16;
case media::VideoPixelFormat::PIXEL_FORMAT_ARGB:
return media::mojom::VideoCapturePixelFormat::ARGB;
case media::VideoPixelFormat::PIXEL_FORMAT_UNKNOWN:
case media::VideoPixelFormat::PIXEL_FORMAT_YV12:
case media::VideoPixelFormat::PIXEL_FORMAT_I422:
......@@ -100,7 +102,6 @@ EnumTraits<media::mojom::VideoCapturePixelFormat,
case media::VideoPixelFormat::PIXEL_FORMAT_NV21:
case media::VideoPixelFormat::PIXEL_FORMAT_UYVY:
case media::VideoPixelFormat::PIXEL_FORMAT_YUY2:
case media::VideoPixelFormat::PIXEL_FORMAT_ARGB:
case media::VideoPixelFormat::PIXEL_FORMAT_XRGB:
case media::VideoPixelFormat::PIXEL_FORMAT_RGB24:
case media::VideoPixelFormat::PIXEL_FORMAT_RGB32:
......@@ -136,6 +137,9 @@ bool EnumTraits<media::mojom::VideoCapturePixelFormat,
case media::mojom::VideoCapturePixelFormat::Y16:
*output = media::VideoPixelFormat::PIXEL_FORMAT_Y16;
return true;
case media::mojom::VideoCapturePixelFormat::ARGB:
*output = media::VideoPixelFormat::PIXEL_FORMAT_ARGB;
return true;
}
NOTREACHED();
return false;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment