| Index: media/base/video_capture_types.cc
|
| diff --git a/media/base/video_capture_types.cc b/media/base/video_capture_types.cc
|
| index 1528017456a35c43dde6abe8ee752c2e8a4156d6..cc5f8408f5ed111f073d7535c7b163f52566fc6c 100644
|
| --- a/media/base/video_capture_types.cc
|
| +++ b/media/base/video_capture_types.cc
|
| @@ -49,6 +49,9 @@ size_t VideoCaptureFormat::ImageAllocationSize() const {
|
| break;
|
| case PIXEL_FORMAT_RGB32:
|
| case PIXEL_FORMAT_ARGB:
|
| + // GpuMemoryBuffer is an endianness-agnostic 32bpp pixel format until
|
| + // http://crbug.com/439520 is closed.
|
| + case PIXEL_FORMAT_GPUMEMORYBUFFER:
|
| result_frame_size *= 4;
|
| break;
|
| case PIXEL_FORMAT_MJPEG:
|
| @@ -95,6 +98,8 @@ std::string VideoCaptureFormat::PixelFormatToString(VideoPixelFormat format) {
|
| return "YV12";
|
| case PIXEL_FORMAT_TEXTURE:
|
| return "TEXTURE";
|
| + case PIXEL_FORMAT_GPUMEMORYBUFFER:
|
| + return "GPUMEMORYBUFFER";
|
| case PIXEL_FORMAT_MAX:
|
| break;
|
| }
|
|
|