Chromium Code Reviews| Index: cc/resources/video_resource_updater.cc |
| diff --git a/cc/resources/video_resource_updater.cc b/cc/resources/video_resource_updater.cc |
| index 2ad91ae0674558bb9ad7f5963aa68c50d6554c38..a9e41ddea6941f00479850a460aba31eaccc7408 100644 |
| --- a/cc/resources/video_resource_updater.cc |
| +++ b/cc/resources/video_resource_updater.cc |
| @@ -45,10 +45,12 @@ VideoFrameExternalResources::ResourceType ResourceTypeForVideoFrame( |
| ? VideoFrameExternalResources::RGB_RESOURCE |
| : VideoFrameExternalResources::RGBA_PREMULTIPLIED_RESOURCE; |
| case GL_TEXTURE_EXTERNAL_OES: |
| - return video_frame->metadata()->IsTrue( |
| - media::VideoFrameMetadata::COPY_REQUIRED) |
| - ? VideoFrameExternalResources::RGBA_RESOURCE |
| - : VideoFrameExternalResources::STREAM_TEXTURE_RESOURCE; |
| +#if defined(OS_ANDROID) |
|
danakj
2017/03/22 14:44:23
Please don't write OS defines inside cc. They make
danakj
2017/03/22 14:47:04
Oh, this isn't in the layer tree really. Maybe her
|
| + if (!video_frame->metadata()->IsTrue( |
| + media::VideoFrameMetadata::COPY_REQUIRED)) |
| + return VideoFrameExternalResources::STREAM_TEXTURE_RESOURCE; |
| +#endif |
| + return VideoFrameExternalResources::RGBA_RESOURCE; |
| case GL_TEXTURE_RECTANGLE_ARB: |
| return VideoFrameExternalResources::RGB_RESOURCE; |
| default: |