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

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

Issue 1090273006: Revert of VideoCapture: add support for GpuMemoryBuffer allocation and lifetime mgmt in VideoCaptureBufferPool (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
Index: media/video/capture/fake_video_capture_device_factory.cc
diff --git a/media/video/capture/fake_video_capture_device_factory.cc b/media/video/capture/fake_video_capture_device_factory.cc
index 76de761c8fc71210efbbc126cfe459b28971085d..aea1909b26610dac67a7cf16279d69e2d9b9c6a5 100644
--- a/media/video/capture/fake_video_capture_device_factory.cc
+++ b/media/video/capture/fake_video_capture_device_factory.cc
@@ -26,12 +26,10 @@
FakeVideoCaptureDevice::FakeVideoCaptureDeviceType fake_vcd_type;
if (option.empty())
fake_vcd_type = FakeVideoCaptureDevice::USING_OWN_BUFFERS;
- else if (base:: strcasecmp(option.c_str(), "triplanar") == 0)
- fake_vcd_type = FakeVideoCaptureDevice::USING_OWN_BUFFERS_TRIPLANAR;
else if (base:: strcasecmp(option.c_str(), "gpu") == 0)
- fake_vcd_type = FakeVideoCaptureDevice::USING_CLIENT_BUFFERS_GPU;
+ fake_vcd_type = FakeVideoCaptureDevice::USING_GPU_MEMORY_BUFFERS;
else
- fake_vcd_type = FakeVideoCaptureDevice::USING_CLIENT_BUFFERS_I420;
+ fake_vcd_type = FakeVideoCaptureDevice::USING_CLIENT_BUFFERS;
for (int n = 0; n < number_of_devices_; ++n) {
std::string possible_id = base::StringPrintf("/dev/video%d", n);
@@ -75,8 +73,9 @@
gfx::Size(1920, 1080)};
supported_formats->clear();
for (const auto& size : supported_sizes) {
- supported_formats->push_back(
- VideoCaptureFormat(size, frame_rate, media::PIXEL_FORMAT_I420));
+ supported_formats->push_back(VideoCaptureFormat(size,
+ frame_rate,
+ media::PIXEL_FORMAT_I420));
}
}
« no previous file with comments | « media/video/capture/fake_video_capture_device.cc ('k') | media/video/capture/fake_video_capture_device_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698