content/renderer/pepper/pepper_platform_video_capture.h - Issue 287313002: Pass a TimeTicks along video capture pipeline to represent capture time

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/pepper/pepper_platform_video_capture.h

Issue 287313002: Pass a TimeTicks along video capture pipeline to represent capture time (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merged and land Created 6 years, 7 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/pepper/pepper_media_stream_video_track_host.cc ('k') | content/renderer/pepper/pepper_platform_video_capture.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/pepper/pepper_platform_video_capture.h

diff --git a/content/renderer/pepper/pepper_platform_video_capture.h b/content/renderer/pepper/pepper_platform_video_capture.h

index 14d1ee681f98433e62588734942ed7163e984739..e31b8c7d6a9b21a36c80502d788dcf074a15ae80 100644

--- a/content/renderer/pepper/pepper_platform_video_capture.h

+++ b/content/renderer/pepper/pepper_platform_video_capture.h

@@ -13,6 +13,7 @@

#include "base/memory/scoped_ptr.h"

#include "base/memory/weak_ptr.h"

#include "base/threading/thread_checker.h"

+#include "base/time/time.h"

#include "content/common/media/video_capture.h"

#include "media/video/capture/video_capture_types.h"

@@ -42,7 +43,8 @@ class PepperPlatformVideoCapture {

void OnDeviceOpened(int request_id, bool succeeded, const std::string& label);

void OnStateUpdate(VideoCaptureState state);

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

- const media::VideoCaptureFormat& format);

+ const media::VideoCaptureFormat& format,

+ const base::TimeTicks& estimated_capture_time);

PepperMediaDeviceManager* GetMediaDeviceManager();