Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(761)

Side by Side Diff: cc/resources/video_resource_updater.cc

Issue 1993463002: Fix overlay computation in GpuMemoryBufferVideoFramePool (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove comment Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/resources/video_resource_updater.h" 5 #include "cc/resources/video_resource_updater.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 case GL_TEXTURE_2D: 45 case GL_TEXTURE_2D:
46 return (video_frame->format() == media::PIXEL_FORMAT_XRGB) 46 return (video_frame->format() == media::PIXEL_FORMAT_XRGB)
47 ? VideoFrameExternalResources::RGB_RESOURCE 47 ? VideoFrameExternalResources::RGB_RESOURCE
48 : VideoFrameExternalResources::RGBA_PREMULTIPLIED_RESOURCE; 48 : VideoFrameExternalResources::RGBA_PREMULTIPLIED_RESOURCE;
49 case GL_TEXTURE_EXTERNAL_OES: 49 case GL_TEXTURE_EXTERNAL_OES:
50 return video_frame->metadata()->IsTrue( 50 return video_frame->metadata()->IsTrue(
51 media::VideoFrameMetadata::COPY_REQUIRED) 51 media::VideoFrameMetadata::COPY_REQUIRED)
52 ? VideoFrameExternalResources::RGBA_RESOURCE 52 ? VideoFrameExternalResources::RGBA_RESOURCE
53 : VideoFrameExternalResources::STREAM_TEXTURE_RESOURCE; 53 : VideoFrameExternalResources::STREAM_TEXTURE_RESOURCE;
54 case GL_TEXTURE_RECTANGLE_ARB: 54 case GL_TEXTURE_RECTANGLE_ARB:
55 return VideoFrameExternalResources::IO_SURFACE; 55 return VideoFrameExternalResources::RGB_RESOURCE;
56 default: 56 default:
57 NOTREACHED(); 57 NOTREACHED();
58 break; 58 break;
59 } 59 }
60 break; 60 break;
61 case media::PIXEL_FORMAT_I420: 61 case media::PIXEL_FORMAT_I420:
62 return VideoFrameExternalResources::YUV_RESOURCE; 62 return VideoFrameExternalResources::YUV_RESOURCE;
63 break; 63 break;
64 case media::PIXEL_FORMAT_NV12: 64 case media::PIXEL_FORMAT_NV12:
65 switch (video_frame->mailbox_holder(0).texture_target) { 65 switch (video_frame->mailbox_holder(0).texture_target) {
66 case GL_TEXTURE_EXTERNAL_OES: 66 case GL_TEXTURE_EXTERNAL_OES:
67 return VideoFrameExternalResources::YUV_RESOURCE; 67 return VideoFrameExternalResources::YUV_RESOURCE;
68 case GL_TEXTURE_RECTANGLE_ARB: 68 case GL_TEXTURE_RECTANGLE_ARB:
69 return VideoFrameExternalResources::IO_SURFACE; 69 return VideoFrameExternalResources::RGB_RESOURCE;
70 default: 70 default:
71 NOTREACHED(); 71 NOTREACHED();
72 break; 72 break;
73 } 73 }
74 break; 74 break;
75 case media::PIXEL_FORMAT_YV12: 75 case media::PIXEL_FORMAT_YV12:
76 case media::PIXEL_FORMAT_YV16: 76 case media::PIXEL_FORMAT_YV16:
77 case media::PIXEL_FORMAT_YV24: 77 case media::PIXEL_FORMAT_YV24:
78 case media::PIXEL_FORMAT_YV12A: 78 case media::PIXEL_FORMAT_YV12A:
79 case media::PIXEL_FORMAT_NV21: 79 case media::PIXEL_FORMAT_NV21:
(...skipping 685 matching lines...) Expand 10 before | Expand all | Expand 10 after
765 plane_resource.plane_index == 0; 765 plane_resource.plane_index == 0;
766 }); 766 });
767 if (resource_it == updater->all_resources_.end()) 767 if (resource_it == updater->all_resources_.end())
768 return; 768 return;
769 769
770 resource_it->destructed = true; 770 resource_it->destructed = true;
771 } 771 }
772 #endif 772 #endif
773 773
774 } // namespace cc 774 } // namespace cc
OLDNEW
« no previous file with comments | « cc/resources/video_resource_updater.h ('k') | media/video/gpu_memory_buffer_video_frame_pool.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698