content/browser/renderer_host/media/video_capture_controller.cc - Issue 175223003: HW Video: Make media::VideoFrame handle the sync point of the compositor as well as webgl

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/media/video_capture_controller.cc

Issue 175223003: HW Video: Make media::VideoFrame handle the sync point of the compositor as well as webgl (Closed) Base URL: https://git.chromium.org/chromium/src.git@master

Patch Set: rebase to ToT Created 6 years, 8 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/renderer_host/media/video_capture_controller.h ('k') | content/browser/renderer_host/media/video_capture_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/media/video_capture_controller.cc

diff --git a/content/browser/renderer_host/media/video_capture_controller.cc b/content/browser/renderer_host/media/video_capture_controller.cc

index fb1ff7a8cbbe4face019442fbd28a74b40acb20d..9c708067a0b85603b8783bbe1bd3cb41eae09d2a 100644

--- a/content/browser/renderer_host/media/video_capture_controller.cc

+++ b/content/browser/renderer_host/media/video_capture_controller.cc

@@ -251,7 +251,7 @@ void VideoCaptureController::ReturnBuffer(

const VideoCaptureControllerID& id,

VideoCaptureControllerEventHandler* event_handler,

int buffer_id,

- uint32 sync_point) {

+ const std::vector<uint32>& sync_points) {

DCHECK_CURRENTLY_ON(BrowserThread::IO);

ControllerClient* client = FindClient(id, event_handler, controller_clients_);

@@ -267,8 +267,10 @@ void VideoCaptureController::ReturnBuffer(

scoped_refptr<media::VideoFrame> frame = iter->second;

client->active_buffers.erase(iter);

- if (frame->format() == media::VideoFrame::NATIVE_TEXTURE)

- frame->mailbox_holder()->sync_point = sync_point;

+ if (frame->format() == media::VideoFrame::NATIVE_TEXTURE) {

+ for (size_t i = 0; i < sync_points.size(); i++)

+ frame->AppendReleaseSyncPoint(sync_points[i]);

+ }

buffer_pool_->RelinquishConsumerHold(buffer_id, 1);

}