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

Side by Side Diff: cc/layers/video_layer_impl.cc

Issue 2088273003: Video Color Managament (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use gfx::ColorProfile Created 4 years, 4 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 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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/layers/video_layer_impl.h" 5 #include "cc/layers/video_layer_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/memory/ptr_util.h" 11 #include "base/memory/ptr_util.h"
12 #include "cc/layers/video_frame_provider_client_impl.h" 12 #include "cc/layers/video_frame_provider_client_impl.h"
13 #include "cc/quads/stream_video_draw_quad.h" 13 #include "cc/quads/stream_video_draw_quad.h"
14 #include "cc/quads/texture_draw_quad.h" 14 #include "cc/quads/texture_draw_quad.h"
15 #include "cc/quads/yuv_video_draw_quad.h" 15 #include "cc/quads/yuv_video_draw_quad.h"
16 #include "cc/resources/resource_provider.h" 16 #include "cc/resources/resource_provider.h"
17 #include "cc/resources/single_release_callback_impl.h" 17 #include "cc/resources/single_release_callback_impl.h"
18 #include "cc/trees/layer_tree_impl.h" 18 #include "cc/trees/layer_tree_impl.h"
19 #include "cc/trees/occlusion.h" 19 #include "cc/trees/occlusion.h"
20 #include "cc/trees/task_runner_provider.h" 20 #include "cc/trees/task_runner_provider.h"
21 #include "media/base/video_frame.h" 21 #include "media/base/video_frame.h"
22 #include "ui/gfx/color_space.h"
22 23
23 #if defined(VIDEO_HOLE) 24 #if defined(VIDEO_HOLE)
24 #include "cc/quads/solid_color_draw_quad.h" 25 #include "cc/quads/solid_color_draw_quad.h"
25 #endif // defined(VIDEO_HOLE) 26 #endif // defined(VIDEO_HOLE)
26 27
27 namespace cc { 28 namespace cc {
28 29
29 // static 30 // static
30 std::unique_ptr<VideoLayerImpl> VideoLayerImpl::Create( 31 std::unique_ptr<VideoLayerImpl> VideoLayerImpl::Create(
31 LayerTreeImpl* tree_impl, 32 LayerTreeImpl* tree_impl,
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 DCHECK_EQ(software_resources_.size(), 1u); 212 DCHECK_EQ(software_resources_.size(), 1u);
212 if (software_resources_.size() < 1u) 213 if (software_resources_.size() < 1u)
213 break; 214 break;
214 bool premultiplied_alpha = true; 215 bool premultiplied_alpha = true;
215 gfx::PointF uv_top_left(0.f, 0.f); 216 gfx::PointF uv_top_left(0.f, 0.f);
216 gfx::PointF uv_bottom_right(tex_width_scale, tex_height_scale); 217 gfx::PointF uv_bottom_right(tex_width_scale, tex_height_scale);
217 float opacity[] = {1.0f, 1.0f, 1.0f, 1.0f}; 218 float opacity[] = {1.0f, 1.0f, 1.0f, 1.0f};
218 bool flipped = false; 219 bool flipped = false;
219 bool nearest_neighbor = false; 220 bool nearest_neighbor = false;
220 TextureDrawQuad* texture_quad = 221 TextureDrawQuad* texture_quad =
221 render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>(); 222 render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
ccameron 2016/08/08 18:45:07 FYI, this is the path that Mac takes to draw most
hubbe 2016/08/08 19:45:38 Really? Why doesn't it planar yuv resources when i
222 texture_quad->SetNew(shared_quad_state, quad_rect, opaque_rect, 223 texture_quad->SetNew(shared_quad_state, quad_rect, opaque_rect,
223 visible_quad_rect, software_resources_[0], 224 visible_quad_rect, software_resources_[0],
224 premultiplied_alpha, uv_top_left, uv_bottom_right, 225 premultiplied_alpha, uv_top_left, uv_bottom_right,
225 SK_ColorTRANSPARENT, opacity, flipped, 226 SK_ColorTRANSPARENT, opacity, flipped,
226 nearest_neighbor, false); 227 nearest_neighbor, false);
227 ValidateQuadResources(texture_quad); 228 ValidateQuadResources(texture_quad);
228 break; 229 break;
229 } 230 }
230 case VideoFrameExternalResources::YUV_RESOURCE: { 231 case VideoFrameExternalResources::YUV_RESOURCE: {
231 YUVVideoDrawQuad::ColorSpace color_space = YUVVideoDrawQuad::REC_601; 232 YUVVideoDrawQuad::ColorSpace color_space = YUVVideoDrawQuad::REC_601;
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 278
278 YUVVideoDrawQuad* yuv_video_quad = 279 YUVVideoDrawQuad* yuv_video_quad =
279 render_pass->CreateAndAppendDrawQuad<YUVVideoDrawQuad>(); 280 render_pass->CreateAndAppendDrawQuad<YUVVideoDrawQuad>();
280 yuv_video_quad->SetNew( 281 yuv_video_quad->SetNew(
281 shared_quad_state, quad_rect, opaque_rect, visible_quad_rect, 282 shared_quad_state, quad_rect, opaque_rect, visible_quad_rect,
282 ya_tex_coord_rect, uv_tex_coord_rect, ya_tex_size, uv_tex_size, 283 ya_tex_coord_rect, uv_tex_coord_rect, ya_tex_size, uv_tex_size,
283 frame_resources_[0].id, frame_resources_[1].id, 284 frame_resources_[0].id, frame_resources_[1].id,
284 frame_resources_.size() > 2 ? frame_resources_[2].id 285 frame_resources_.size() > 2 ? frame_resources_[2].id
285 : frame_resources_[1].id, 286 : frame_resources_[1].id,
286 frame_resources_.size() > 3 ? frame_resources_[3].id : 0, color_space, 287 frame_resources_.size() > 3 ? frame_resources_[3].id : 0, color_space,
287 frame_resource_offset_, frame_resource_multiplier_, 288 frame_->ColorSpace(), frame_resource_offset_,
288 frame_bits_per_channel_); 289 frame_resource_multiplier_, frame_bits_per_channel_);
289 ValidateQuadResources(yuv_video_quad); 290 ValidateQuadResources(yuv_video_quad);
290 break; 291 break;
291 } 292 }
292 case VideoFrameExternalResources::RGBA_RESOURCE: 293 case VideoFrameExternalResources::RGBA_RESOURCE:
293 case VideoFrameExternalResources::RGBA_PREMULTIPLIED_RESOURCE: 294 case VideoFrameExternalResources::RGBA_PREMULTIPLIED_RESOURCE:
294 case VideoFrameExternalResources::RGB_RESOURCE: { 295 case VideoFrameExternalResources::RGB_RESOURCE: {
295 DCHECK_EQ(frame_resources_.size(), 1u); 296 DCHECK_EQ(frame_resources_.size(), 1u);
296 if (frame_resources_.size() < 1u) 297 if (frame_resources_.size() < 1u)
297 break; 298 break;
298 bool premultiplied_alpha = 299 bool premultiplied_alpha =
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 void VideoLayerImpl::SetNeedsRedraw() { 401 void VideoLayerImpl::SetNeedsRedraw() {
401 SetUpdateRect(gfx::UnionRects(update_rect(), gfx::Rect(bounds()))); 402 SetUpdateRect(gfx::UnionRects(update_rect(), gfx::Rect(bounds())));
402 layer_tree_impl()->SetNeedsRedraw(); 403 layer_tree_impl()->SetNeedsRedraw();
403 } 404 }
404 405
405 const char* VideoLayerImpl::LayerTypeAsString() const { 406 const char* VideoLayerImpl::LayerTypeAsString() const {
406 return "cc::VideoLayerImpl"; 407 return "cc::VideoLayerImpl";
407 } 408 }
408 409
409 } // namespace cc 410 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698