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

Unified Diff: content/renderer/media/capture_video_decoder_unittest.cc

Issue 10108009: Move VideoCapture::VideoCaptureCapability to video_capture_types.h (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix content_unittests build failure Created 8 years, 8 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/media/capture_video_decoder.cc ('k') | content/renderer/media/media_stream_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/capture_video_decoder_unittest.cc
diff --git a/content/renderer/media/capture_video_decoder_unittest.cc b/content/renderer/media/capture_video_decoder_unittest.cc
index 44bcf3e35bde909505c1239e6390ce8af899c55b..670e6d6d2f5d89921f72ea13667252e31f1ae7e7 100644
--- a/content/renderer/media/capture_video_decoder_unittest.cc
+++ b/content/renderer/media/capture_video_decoder_unittest.cc
@@ -57,7 +57,7 @@ class MockVideoCaptureImpl : public VideoCaptureImpl {
MOCK_METHOD2(StartCapture,
void(media::VideoCapture::EventHandler* handler,
- const VideoCaptureCapability& capability));
+ const media::VideoCaptureCapability& capability));
MOCK_METHOD1(StopCapture, void(media::VideoCapture::EventHandler* handler));
MOCK_METHOD1(FeedBuffer, void(scoped_refptr<VideoFrameBuffer> buffer));
@@ -88,12 +88,12 @@ class CaptureVideoDecoderTest : public ::testing::Test {
message_loop_proxy_ =
base::MessageLoopProxy::current().get();
vc_manager_ = new MockVideoCaptureImplManager();
- media::VideoCapture::VideoCaptureCapability capability;
+ media::VideoCaptureCapability capability;
capability.width = kWidth;
capability.height = kHeight;
- capability.max_fps = kFPS;
+ capability.frame_rate = kFPS;
capability.expected_capture_delay = 0;
- capability.raw_type = media::VideoFrame::I420;
+ capability.color = media::VideoFrame::I420;
capability.interlaced = false;
decoder_ = new CaptureVideoDecoder(message_loop_proxy_,
« no previous file with comments | « content/renderer/media/capture_video_decoder.cc ('k') | content/renderer/media/media_stream_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698