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

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

Issue 2398813002: Cleanup of video capture into GpuMemoryBuffer (Closed)
Patch Set: Rebase Created 4 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
« no previous file with comments | « media/capture/video/fake_video_capture_device.cc ('k') | media/capture/video/video_capture_buffer_pool.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 fa30c4821cca09cb626ec546dfad0ca1911772cc..35b1c4e66227b703411b53099e999739a67462b0 100644
--- a/media/capture/video/fake_video_capture_device_unittest.cc
+++ b/media/capture/video/fake_video_capture_device_unittest.cc
@@ -84,9 +84,7 @@ class MockClient : public VideoCaptureDevice::Client {
media::VideoPixelFormat format,
media::VideoPixelStorage storage) {
EXPECT_TRUE((format == media::PIXEL_FORMAT_ARGB &&
- storage == media::PIXEL_STORAGE_CPU) ||
- (format == media::PIXEL_FORMAT_I420 &&
- storage == media::PIXEL_STORAGE_GPUMEMORYBUFFER));
+ storage == media::PIXEL_STORAGE_CPU));
EXPECT_GT(dimensions.GetArea(), 0);
const VideoCaptureFormat frame_format(dimensions, 0.0, format);
return base::MakeUnique<MockBuffer>(0, frame_format.ImageAllocationSize());
« no previous file with comments | « media/capture/video/fake_video_capture_device.cc ('k') | media/capture/video/video_capture_buffer_pool.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698