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

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: bugfix Created 4 years, 5 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_color_space.h"
21 #include "media/base/video_frame.h" 22 #include "media/base/video_frame.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(
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 275
275 YUVVideoDrawQuad* yuv_video_quad = 276 YUVVideoDrawQuad* yuv_video_quad =
276 render_pass->CreateAndAppendDrawQuad<YUVVideoDrawQuad>(); 277 render_pass->CreateAndAppendDrawQuad<YUVVideoDrawQuad>();
277 yuv_video_quad->SetNew( 278 yuv_video_quad->SetNew(
278 shared_quad_state, quad_rect, opaque_rect, visible_quad_rect, 279 shared_quad_state, quad_rect, opaque_rect, visible_quad_rect,
279 ya_tex_coord_rect, uv_tex_coord_rect, ya_tex_size, uv_tex_size, 280 ya_tex_coord_rect, uv_tex_coord_rect, ya_tex_size, uv_tex_size,
280 frame_resources_[0].id, frame_resources_[1].id, 281 frame_resources_[0].id, frame_resources_[1].id,
281 frame_resources_.size() > 2 ? frame_resources_[2].id 282 frame_resources_.size() > 2 ? frame_resources_[2].id
282 : frame_resources_[1].id, 283 : frame_resources_[1].id,
283 frame_resources_.size() > 3 ? frame_resources_[3].id : 0, color_space, 284 frame_resources_.size() > 3 ? frame_resources_[3].id : 0, color_space,
284 frame_resource_offset_, frame_resource_multiplier_); 285 media::VideoColorSpace(frame_.get()), frame_resource_offset_,
286 frame_resource_multiplier_);
285 ValidateQuadResources(yuv_video_quad); 287 ValidateQuadResources(yuv_video_quad);
286 break; 288 break;
287 } 289 }
288 case VideoFrameExternalResources::RGBA_RESOURCE: 290 case VideoFrameExternalResources::RGBA_RESOURCE:
289 case VideoFrameExternalResources::RGBA_PREMULTIPLIED_RESOURCE: 291 case VideoFrameExternalResources::RGBA_PREMULTIPLIED_RESOURCE:
290 case VideoFrameExternalResources::RGB_RESOURCE: { 292 case VideoFrameExternalResources::RGB_RESOURCE: {
291 DCHECK_EQ(frame_resources_.size(), 1u); 293 DCHECK_EQ(frame_resources_.size(), 1u);
292 if (frame_resources_.size() < 1u) 294 if (frame_resources_.size() < 1u)
293 break; 295 break;
294 bool premultiplied_alpha = 296 bool premultiplied_alpha =
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
397 void VideoLayerImpl::SetNeedsRedraw() { 399 void VideoLayerImpl::SetNeedsRedraw() {
398 SetUpdateRect(gfx::UnionRects(update_rect(), gfx::Rect(bounds()))); 400 SetUpdateRect(gfx::UnionRects(update_rect(), gfx::Rect(bounds())));
399 layer_tree_impl()->SetNeedsRedraw(); 401 layer_tree_impl()->SetNeedsRedraw();
400 } 402 }
401 403
402 const char* VideoLayerImpl::LayerTypeAsString() const { 404 const char* VideoLayerImpl::LayerTypeAsString() const {
403 return "cc::VideoLayerImpl"; 405 return "cc::VideoLayerImpl";
404 } 406 }
405 407
406 } // namespace cc 408 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698