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

Unified Diff: media/base/video_capture_types.cc

Issue 1439533004: Remove dead code paths around PIXEL_STORAGE_TEXTURE in capture pipeline. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: mcasas's second round comments REBASE Created 5 years, 1 month 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/base/video_frame.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 0bc6ae639511625fe34fa214aacb01fd65d860d9..f68eeb38a415a2cb108209e7ddfb8369ba176ddc 100644
--- a/media/base/video_capture_types.cc
+++ b/media/base/video_capture_types.cc
@@ -57,8 +57,10 @@ bool VideoCaptureFormat::IsValid() const {
(frame_size.GetArea() < media::limits::kMaxCanvas) &&
(frame_rate >= 0.0f) &&
(frame_rate < media::limits::kMaxFramesPerSecond) &&
- (pixel_storage != PIXEL_STORAGE_TEXTURE ||
- pixel_format == PIXEL_FORMAT_ARGB);
+ (pixel_format >= PIXEL_FORMAT_UNKNOWN &&
+ pixel_format <= PIXEL_FORMAT_MAX) &&
+ (pixel_storage == PIXEL_STORAGE_CPU ||
+ pixel_storage == PIXEL_STORAGE_GPUMEMORYBUFFER);
}
size_t VideoCaptureFormat::ImageAllocationSize() const {
@@ -80,8 +82,6 @@ std::string VideoCaptureFormat::PixelStorageToString(
switch (storage) {
case PIXEL_STORAGE_CPU:
return "CPU";
- case PIXEL_STORAGE_TEXTURE:
- return "TEXTURE";
case PIXEL_STORAGE_GPUMEMORYBUFFER:
return "GPUMEMORYBUFFER";
}
@@ -109,4 +109,12 @@ VideoCaptureParams::VideoCaptureParams()
: resolution_change_policy(RESOLUTION_POLICY_FIXED_RESOLUTION),
power_line_frequency(PowerLineFrequency::FREQUENCY_DEFAULT) {}
+bool VideoCaptureParams::IsValid() const {
+ return requested_format.IsValid() &&
+ resolution_change_policy >= RESOLUTION_POLICY_FIXED_RESOLUTION &&
+ resolution_change_policy <= RESOLUTION_POLICY_LAST &&
+ power_line_frequency >= PowerLineFrequency::FREQUENCY_DEFAULT &&
+ power_line_frequency <= PowerLineFrequency::FREQUENCY_MAX;
+}
+
} // namespace media
« no previous file with comments | « media/base/video_capture_types.h ('k') | media/base/video_frame.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698