content/browser/media/capture/desktop_capture_device_aura_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/media/capture/desktop_capture_device_aura_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: Fix compile error caused by last rebase. 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/media/capture/content_video_capture_device_core.cc ('k') | content/browser/media/capture/desktop_capture_device_unittest.cc » ('j') | content/renderer/media/video_track_adapter.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/media/capture/desktop_capture_device_aura_unittest.cc

diff --git a/content/browser/media/capture/desktop_capture_device_aura_unittest.cc b/content/browser/media/capture/desktop_capture_device_aura_unittest.cc

index fb06dad555822a8253684b91e24f8dc42573ab90..9f259eb5d95279dcf8513334eb60a7e23933beb5 100644

--- a/content/browser/media/capture/desktop_capture_device_aura_unittest.cc

+++ b/content/browser/media/capture/desktop_capture_device_aura_unittest.cc

@@ -44,9 +44,8 @@ class MockDeviceClient : public media::VideoCaptureDevice::Client {

MOCK_METHOD2(ReserveOutputBuffer,

scoped_refptr<Buffer>(media::VideoFrame::Format format,

const gfx::Size& dimensions));

- MOCK_METHOD4(OnIncomingCapturedVideoFrame,

+ MOCK_METHOD3(OnIncomingCapturedVideoFrame,

void(const scoped_refptr<Buffer>& buffer,

- const media::VideoCaptureFormat& buffer_format,

const scoped_refptr<media::VideoFrame>& frame,

const base::TimeTicks& timestamp));

MOCK_METHOD1(OnError, void(const std::string& reason));