Index: media/capture/video/fake_video_capture_device_unittest.cc |
diff --git a/media/capture/video/fake_video_capture_device_unittest.cc b/media/capture/video/fake_video_capture_device_unittest.cc |
index 5a6974caa8c4d863d71119f426a5920221e60cc9..1c3bc09be083ac89fdd6186f0fdba27b74a28bdd 100644 |
--- a/media/capture/video/fake_video_capture_device_unittest.cc |
+++ b/media/capture/video/fake_video_capture_device_unittest.cc |
@@ -273,6 +273,13 @@ class FakeVideoCaptureDeviceTest |
// Tests that a frame is delivered with the expected settings. |
// Sweeps through a fixed set of requested/expected resolutions. |
TEST_P(FakeVideoCaptureDeviceTest, CaptureUsing) { |
+ if (testing::get<1>(GetParam()) == FakeVideoCaptureDeviceMaker::DeliveryMode:: |
+ USE_CLIENT_PROVIDED_BUFFERS && |
+ testing::get<0>(GetParam()) == media::PIXEL_FORMAT_MJPEG) { |
+ // Unsupported case |
+ return; |
+ } |
mcasas
2017/02/17 18:35:47
If you add a TODO to add support for Client
buffe
chfremer
2017/02/22 17:28:42
Currently not planning a TODO. See my other commen
|
+ |
const std::unique_ptr<VideoCaptureDeviceDescriptors> descriptors( |
EnumerateDevices()); |
ASSERT_FALSE(descriptors->empty()); |
@@ -312,7 +319,10 @@ TEST_P(FakeVideoCaptureDeviceTest, CaptureUsing) { |
INSTANTIATE_TEST_CASE_P( |
, |
FakeVideoCaptureDeviceTest, |
- Combine(Values(PIXEL_FORMAT_I420, PIXEL_FORMAT_Y16, PIXEL_FORMAT_ARGB), |
+ Combine(Values(PIXEL_FORMAT_I420, |
+ PIXEL_FORMAT_Y16, |
+ PIXEL_FORMAT_ARGB, |
+ PIXEL_FORMAT_MJPEG), |
Values(FakeVideoCaptureDeviceMaker::DeliveryMode:: |
USE_DEVICE_INTERNAL_BUFFERS, |
FakeVideoCaptureDeviceMaker::DeliveryMode:: |
@@ -321,19 +331,19 @@ INSTANTIATE_TEST_CASE_P( |
TEST_F(FakeVideoCaptureDeviceTest, GetDeviceSupportedFormats) { |
base::CommandLine::ForCurrentProcess()->AppendSwitchASCII( |
- switches::kUseFakeDeviceForMediaStream, "device-count=3"); |
+ switches::kUseFakeDeviceForMediaStream, "device-count=4"); |
std::unique_ptr<VideoCaptureDeviceDescriptors> descriptors( |
EnumerateDevices()); |
- ASSERT_EQ(3u, descriptors->size()); |
+ ASSERT_EQ(4u, descriptors->size()); |
for (const auto& descriptors_iterator : *descriptors) { |
VideoCaptureFormats supported_formats; |
video_capture_device_factory_->GetSupportedFormats(descriptors_iterator, |
&supported_formats); |
ASSERT_EQ(5u, supported_formats.size()); |
- const std::string device_id = descriptors_iterator.device_id; |
VideoPixelFormat expected_format = |
- (device_id == "/dev/video1") ? PIXEL_FORMAT_Y16 : PIXEL_FORMAT_I420; |
+ FakeVideoCaptureDeviceFactory::GetPixelFormatFromDeviceId( |
+ descriptors_iterator.device_id); |
EXPECT_EQ(96, supported_formats[0].frame_size.width()); |
EXPECT_EQ(96, supported_formats[0].frame_size.height()); |
EXPECT_EQ(expected_format, supported_formats[0].pixel_format); |
@@ -578,15 +588,17 @@ INSTANTIATE_TEST_CASE_P( |
60, |
1u, |
{PIXEL_FORMAT_I420}}, |
- CommandLineTestData{ |
- "device-count=3", |
- 20, |
- 3u, |
- {PIXEL_FORMAT_I420, PIXEL_FORMAT_Y16, PIXEL_FORMAT_I420}}, |
- CommandLineTestData{ |
- "device-count=3,ownership=client", |
- 20, |
- 3u, |
- {PIXEL_FORMAT_I420, PIXEL_FORMAT_Y16, PIXEL_FORMAT_I420}}, |
+ CommandLineTestData{"device-count=4", |
+ 20, |
+ 4u, |
+ |
+ {PIXEL_FORMAT_I420, PIXEL_FORMAT_Y16, |
+ PIXEL_FORMAT_MJPEG, PIXEL_FORMAT_I420}}, |
+ CommandLineTestData{"device-count=4,ownership=client", |
+ 20, |
+ 4u, |
+ |
+ {PIXEL_FORMAT_I420, PIXEL_FORMAT_Y16, |
+ PIXEL_FORMAT_MJPEG, PIXEL_FORMAT_I420}}, |
CommandLineTestData{"device-count=0", 20, 1u, {PIXEL_FORMAT_I420}})); |
}; // namespace media |