Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2520)

Unified Diff: media/video/capture/video_capture_device_unittest.cc

Issue 48113011: Remove media::VideoFrame from media::VideoCaptureDevice::Client interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@git-svn
Patch Set: 4969ee91 Initial. Created 7 years, 2 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
Index: media/video/capture/video_capture_device_unittest.cc
diff --git a/media/video/capture/video_capture_device_unittest.cc b/media/video/capture/video_capture_device_unittest.cc
index f9d0ab2cb8abe84fbf7f06419b973d628b1e6c98..a9ec50ec8b8d6db75a5bf89e48094689ec611f2d 100644
--- a/media/video/capture/video_capture_device_unittest.cc
+++ b/media/video/capture/video_capture_device_unittest.cc
@@ -64,8 +64,10 @@ namespace media {
class MockClient : public media::VideoCaptureDevice::Client {
public:
- MOCK_METHOD1(ReserveOutputBuffer,
- scoped_refptr<media::VideoFrame>(const gfx::Size&));
+ MOCK_METHOD1(
+ ReserveOutputBuffer,
+ scoped_refptr<media::VideoFrame>(media::VideoFrame::Format format,
+ const gfx::Size&));
MOCK_METHOD0(OnErr, void());
MOCK_METHOD1(OnFrameInfo, void(const VideoCaptureCapability&));
MOCK_METHOD1(OnFrameInfoChanged, void(const VideoCaptureCapability&));
@@ -89,9 +91,9 @@ class MockClient : public media::VideoCaptureDevice::Client {
main_thread_->PostTask(FROM_HERE, frame_cb_);
}
- virtual void OnIncomingCapturedVideoFrame(
- const scoped_refptr<media::VideoFrame>& frame,
- base::Time timestamp) OVERRIDE {
+ virtual void OnIncomingCapturedI420Buffer(scoped_ptr<Buffer> buffer,
ncarter (slow) 2013/10/29 18:42:17 This method doesn't seem to match anything in Vide
sheu 2013/11/05 20:02:10 Apparently not :-P I didn't realize I had to buil
+ const gfx::Size& dimensions,
+ base::Time timestamp) OVERRIDE {
main_thread_->PostTask(FROM_HERE, frame_cb_);
}
« media/video/capture/video_capture_device.h ('K') | « media/video/capture/video_capture_device.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698