content/renderer/media/video_capture_impl_unittest.cc - Issue 10035054: Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability

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 10035054: Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: rebased code and addressed scherkus's comments 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

« content/browser/renderer_host/media/media_stream_device_settings.h ('K') | « content/renderer/media/video_capture_impl.cc ('k') | content/renderer/media/video_capture_module_impl.cc » ('j') | media/video/capture/win/sink_input_pin_win.h » ('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 d4b50d32dab2867c5ff25ed219d31b61712e24cb..47a76adf17137a64815e77f3d062507d809e71b2 100644

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

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

@@ -12,10 +12,10 @@ using ::testing::_;

using ::testing::AtLeast;

using ::testing::Return;

-#define CAPABILITY_SMALL {176, 144, 30, media::VideoFrame::I420, 0, \

- false }

-#define CAPABILITY_LARGE {320, 240, 30, media::VideoFrame::I420, 0, \

- false }

+#define CAPABILITY_SMALL {176, 144, 30, media::VideoCaptureCapability::kI420, \

+ 0, false }

+#define CAPABILITY_LARGE {320, 240, 30, media::VideoCaptureCapability::kI420, \

+ 0, false }

class MockVideoCaptureMessageFilter : public VideoCaptureMessageFilter {

public: