content/renderer/media/video_capture_impl_unittest.cc - Issue 23587018: Replace media::VideoCapture::VideoFrameBuffer with media::VideoFrame.

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/video_capture_impl_unittest.cc

Issue 23587018: Replace media::VideoCapture::VideoFrameBuffer with media::VideoFrame. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@git-svn

Patch Set: 727f973e fischman@ comments Created 7 years, 3 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

« content/renderer/media/video_capture_impl.cc ('K') | « content/renderer/media/video_capture_impl.cc ('k') | content/renderer/media/video_capture_message_filter.h » ('j') | content/renderer/pepper/pepper_video_capture_host.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/video_capture_impl_unittest.cc

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

index d45b600f063311c0220fcbb3c9efc29b6a4383a0..986106bf1bdacd7cbdb3d5a8b03760df7866f4ec 100644

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

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

@@ -40,9 +40,9 @@ class MockVideoCaptureClient : public media::VideoCapture::EventHandler {

MOCK_METHOD1(OnPaused, void(media::VideoCapture* capture));

MOCK_METHOD2(OnError, void(media::VideoCapture* capture, int error_code));

MOCK_METHOD1(OnRemoved, void(media::VideoCapture* capture));

- MOCK_METHOD2(OnBufferReady,

+ MOCK_METHOD2(OnFrameReady,

void(media::VideoCapture* capture,

- scoped_refptr<media::VideoCapture::VideoFrameBuffer> buf));

+ const scoped_refptr<media::VideoFrame>& frame));

MOCK_METHOD2(OnDeviceInfoReceived,

void(media::VideoCapture* capture,

const media::VideoCaptureParams& device_info));