| Index: cc/resources/video_resource_updater.cc
|
| diff --git a/cc/resources/video_resource_updater.cc b/cc/resources/video_resource_updater.cc
|
| index 80a9084bf176555dee087ed919b7e8ab6a9c6752..7ba751271c556fb2d87daa17824a0306144812d8 100644
|
| --- a/cc/resources/video_resource_updater.cc
|
| +++ b/cc/resources/video_resource_updater.cc
|
| @@ -38,9 +38,10 @@ VideoFrameExternalResources::ResourceType ResourceTypeForVideoFrame(
|
| case media::PIXEL_FORMAT_ARGB:
|
| case media::PIXEL_FORMAT_XRGB:
|
| case media::PIXEL_FORMAT_UYVY:
|
| + case media::PIXEL_FORMAT_YUY2:
|
| switch (video_frame->mailbox_holder(0).texture_target) {
|
| case GL_TEXTURE_2D:
|
| - return (video_frame->format() == media::PIXEL_FORMAT_XRGB)
|
| + return (video_frame->format() != media::PIXEL_FORMAT_ARGB)
|
| ? VideoFrameExternalResources::RGB_RESOURCE
|
| : VideoFrameExternalResources::RGBA_PREMULTIPLIED_RESOURCE;
|
| case GL_TEXTURE_EXTERNAL_OES:
|
| @@ -75,7 +76,6 @@ VideoFrameExternalResources::ResourceType ResourceTypeForVideoFrame(
|
| case media::PIXEL_FORMAT_YV24:
|
| case media::PIXEL_FORMAT_YV12A:
|
| case media::PIXEL_FORMAT_NV21:
|
| - case media::PIXEL_FORMAT_YUY2:
|
| case media::PIXEL_FORMAT_RGB24:
|
| case media::PIXEL_FORMAT_RGB32:
|
| case media::PIXEL_FORMAT_MJPEG:
|
|
|