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

Unified Diff: media/base/video_capture_types.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/base/video_capture_types.h ('k') | media/capture/video/fake_video_capture_device.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/video_capture_types.cc
diff --git a/media/base/video_capture_types.cc b/media/base/video_capture_types.cc
index 875d02dc5939b199776f775b6dea80a009ad60d9..340c25d4d3886726ea2b5f0bc1707136c9e56cf9 100644
--- a/media/base/video_capture_types.cc
+++ b/media/base/video_capture_types.cc
@@ -59,9 +59,7 @@ bool VideoCaptureFormat::IsValid() const {
(frame_rate >= 0.0f) &&
(frame_rate < media::limits::kMaxFramesPerSecond) &&
(pixel_format >= PIXEL_FORMAT_UNKNOWN &&
- pixel_format <= PIXEL_FORMAT_MAX) &&
- (pixel_storage == PIXEL_STORAGE_CPU ||
- pixel_storage == PIXEL_STORAGE_GPUMEMORYBUFFER);
+ pixel_format <= PIXEL_FORMAT_MAX);
}
size_t VideoCaptureFormat::ImageAllocationSize() const {
@@ -85,8 +83,6 @@ std::string VideoCaptureFormat::PixelStorageToString(
switch (storage) {
case PIXEL_STORAGE_CPU:
return "CPU";
- case PIXEL_STORAGE_GPUMEMORYBUFFER:
- return "GPUMEMORYBUFFER";
}
NOTREACHED() << "Invalid VideoPixelStorage provided: "
<< static_cast<int>(storage);
« no previous file with comments | « media/base/video_capture_types.h ('k') | media/capture/video/fake_video_capture_device.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698