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

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

Issue 1195473003: cc: Set read lock fences required for YUV native video frames. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove flag in FrameResource. Created 5 years, 6 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
« no previous file with comments | « cc/resources/video_resource_updater.h ('k') | cc/resources/video_resource_updater_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/trace_event/trace_event.h" 10 #include "base/trace_event/trace_event.h"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 78
79 void VideoResourceUpdater::SetPlaneResourceUniqueId( 79 void VideoResourceUpdater::SetPlaneResourceUniqueId(
80 const media::VideoFrame* video_frame, 80 const media::VideoFrame* video_frame,
81 size_t plane_index, 81 size_t plane_index,
82 PlaneResource* plane_resource) { 82 PlaneResource* plane_resource) {
83 plane_resource->frame_ptr = video_frame; 83 plane_resource->frame_ptr = video_frame;
84 plane_resource->plane_index = plane_index; 84 plane_resource->plane_index = plane_index;
85 plane_resource->timestamp = video_frame->timestamp(); 85 plane_resource->timestamp = video_frame->timestamp();
86 } 86 }
87 87
88 VideoFrameExternalResources::VideoFrameExternalResources() : type(NONE) {} 88 VideoFrameExternalResources::VideoFrameExternalResources()
89 : type(NONE), read_lock_fences_enabled(false) {
90 }
89 91
90 VideoFrameExternalResources::~VideoFrameExternalResources() {} 92 VideoFrameExternalResources::~VideoFrameExternalResources() {}
91 93
92 VideoResourceUpdater::VideoResourceUpdater(ContextProvider* context_provider, 94 VideoResourceUpdater::VideoResourceUpdater(ContextProvider* context_provider,
93 ResourceProvider* resource_provider) 95 ResourceProvider* resource_provider)
94 : context_provider_(context_provider), 96 : context_provider_(context_provider),
95 resource_provider_(resource_provider) { 97 resource_provider_(resource_provider) {
96 } 98 }
97 99
98 VideoResourceUpdater::~VideoResourceUpdater() { 100 VideoResourceUpdater::~VideoResourceUpdater() {
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 case GL_TEXTURE_RECTANGLE_ARB: 393 case GL_TEXTURE_RECTANGLE_ARB:
392 external_resources.type = VideoFrameExternalResources::IO_SURFACE; 394 external_resources.type = VideoFrameExternalResources::IO_SURFACE;
393 break; 395 break;
394 default: 396 default:
395 NOTREACHED(); 397 NOTREACHED();
396 return VideoFrameExternalResources(); 398 return VideoFrameExternalResources();
397 } 399 }
398 break; 400 break;
399 case media::VideoFrame::I420: 401 case media::VideoFrame::I420:
400 external_resources.type = VideoFrameExternalResources::YUV_RESOURCE; 402 external_resources.type = VideoFrameExternalResources::YUV_RESOURCE;
403 external_resources.read_lock_fences_enabled = true;
reveman 2015/06/17 16:59:02 We'll need this for all formats. Maybe just set it
Daniele Castagna 2015/06/17 17:02:25 Done.
401 break; 404 break;
402 #if defined(OS_MACOSX) || defined(OS_CHROMEOS) 405 #if defined(OS_MACOSX) || defined(OS_CHROMEOS)
403 case media::VideoFrame::NV12: 406 case media::VideoFrame::NV12:
404 #endif 407 #endif
405 case media::VideoFrame::YV12: 408 case media::VideoFrame::YV12:
406 case media::VideoFrame::YV16: 409 case media::VideoFrame::YV16:
407 case media::VideoFrame::YV24: 410 case media::VideoFrame::YV24:
408 case media::VideoFrame::YV12A: 411 case media::VideoFrame::YV12A:
409 case media::VideoFrame::UNKNOWN: 412 case media::VideoFrame::UNKNOWN:
410 DLOG(ERROR) << "Unsupported Texture format" 413 DLOG(ERROR) << "Unsupported Texture format"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
455 resource_it->ref_count = 0; 458 resource_it->ref_count = 0;
456 updater->DeleteResource(resource_it); 459 updater->DeleteResource(resource_it);
457 return; 460 return;
458 } 461 }
459 462
460 --resource_it->ref_count; 463 --resource_it->ref_count;
461 DCHECK_GE(resource_it->ref_count, 0); 464 DCHECK_GE(resource_it->ref_count, 0);
462 } 465 }
463 466
464 } // namespace cc 467 } // namespace cc
OLDNEW
« no previous file with comments | « cc/resources/video_resource_updater.h ('k') | cc/resources/video_resource_updater_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698