content/browser/renderer_host/media/video_capture_manager_unittest.cc - Issue 955253002: Add metadata to media::VideoFrame and plumb it through IPC/MediaStream.

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_manager_unittest.cc

Issue 955253002: Add metadata to media::VideoFrame and plumb it through IPC/MediaStream. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: tommi's nits addressed Created 5 years, 10 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_host_unittest.cc ('k') | content/common/media/video_capture_messages.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index f41984bd5a073c21e45941928f46539809bdf81c..126186cb59cdf354a054b76bf58b9a575dd8b4eb 100644

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

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

@@ -51,16 +51,20 @@ class MockFrameObserver : public VideoCaptureControllerEventHandler {

int length, int buffer_id) override {}

virtual void OnBufferDestroyed(const VideoCaptureControllerID& id,

int buffer_id) override {}

- virtual void OnBufferReady(const VideoCaptureControllerID& id,

- int buffer_id,

- const media::VideoCaptureFormat& format,

- const gfx::Rect& visible_rect,

- base::TimeTicks timestamp) override {}

- virtual void OnMailboxBufferReady(const VideoCaptureControllerID& id,

- int buffer_id,

- const gpu::MailboxHolder& mailbox_holder,

- const media::VideoCaptureFormat& format,

- base::TimeTicks timestamp) override {}

+ virtual void OnBufferReady(

+ const VideoCaptureControllerID& id,

+ int buffer_id,

+ const gfx::Size& coded_size,

+ const gfx::Rect& visible_rect,

+ base::TimeTicks timestamp,

+ scoped_ptr<base::DictionaryValue> metadata) override {}

+ virtual void OnMailboxBufferReady(

+ const VideoCaptureControllerID& id,

+ int buffer_id,

+ const gpu::MailboxHolder& mailbox_holder,

+ const gfx::Size& packed_frame_size,

+ base::TimeTicks timestamp,

+ scoped_ptr<base::DictionaryValue> metadata) override {}

virtual void OnEnded(const VideoCaptureControllerID& id) override {}

void OnGotControllerCallback(VideoCaptureControllerID) {}