content/renderer/media/media_stream_video_track.cc - Issue 1315993003: Reland: Change VideoCaptureDeliverFrameCB's signature

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/renderer/media/media_stream_video_track.cc

Issue 1315993003: Reland: Change VideoCaptureDeliverFrameCB's signature (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: address new changes Created 5 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/renderer/media/media_stream_video_capture_source_unittest.cc ('k') | content/renderer/media/media_stream_video_track_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/media_stream_video_track.cc

diff --git a/content/renderer/media/media_stream_video_track.cc b/content/renderer/media/media_stream_video_track.cc

index 725218f93ca6ff04a643755bcbbe0aee9f0b5a77..1da51c12d3d18632b02ef93c8bc466f4ba8e92cb 100644

--- a/content/renderer/media/media_stream_video_track.cc

+++ b/content/renderer/media/media_stream_video_track.cc

@@ -55,7 +55,7 @@ class MediaStreamVideoTrack::FrameDeliverer

// Triggers all registered callbacks with |frame|, |format| and

// |estimated_capture_time| as parameters. Must be called on the IO-thread.

void DeliverFrameOnIO(const scoped_refptr<media::VideoFrame>& frame,

- const base::TimeTicks& estimated_capture_time);

+ base::TimeTicks estimated_capture_time);

private:

friend class base::RefCountedThreadSafe<FrameDeliverer>;

@@ -154,7 +154,7 @@ void MediaStreamVideoTrack::FrameDeliverer::SetEnabledOnIO(bool enabled) {

void MediaStreamVideoTrack::FrameDeliverer::DeliverFrameOnIO(

const scoped_refptr<media::VideoFrame>& frame,

- const base::TimeTicks& estimated_capture_time) {

+ base::TimeTicks estimated_capture_time) {

DCHECK(io_task_runner_->BelongsToCurrentThread());

const scoped_refptr<media::VideoFrame>& video_frame =

enabled_ ? frame : GetBlackFrame(frame);