Index: media/video/capture/video_capture_types.cc |
diff --git a/media/video/capture/video_capture_types.cc b/media/video/capture/video_capture_types.cc |
index 590b016d998c0c8acd42f191fd7f5029660a3c1c..d4fb51a576972dfd56c6008e535c5e6e975ca1e2 100644 |
--- a/media/video/capture/video_capture_types.cc |
+++ b/media/video/capture/video_capture_types.cc |
@@ -75,9 +75,28 @@ VideoCaptureParams::VideoCaptureParams() |
ImageCaptureFormat::ImageCaptureFormat() : pixel_format(PIXEL_FORMAT_UNKNOWN) { |
} |
+bool ImageCaptureFormat::IsValid() const { |
+ return (frame_size.width() < media::limits::kMaxDimension) && |
+ (frame_size.height() < media::limits::kMaxDimension) && |
wuchengli
2015/01/19 14:05:03
This is the limit for video. Image capture shouldn
Justin Chuang
2015/01/26 15:00:50
Removed the class completely.
|
+ (frame_size.GetArea() >= 0) && |
+ (frame_size.GetArea() < media::limits::kMaxCanvas) && |
+ (pixel_format >= PIXEL_FORMAT_UNKNOWN) && |
+ (pixel_format < PIXEL_FORMAT_MAX); |
+} |
+ |
+std::string ImageCaptureFormat::ToString() const { |
+ return base::StringPrintf( |
+ "resolution: %s, pixel format: %s", |
+ frame_size.ToString().c_str(), |
+ VideoCaptureFormat::PixelFormatToString(pixel_format).c_str()); |
+} |
+ |
ImageCaptureFormat::ImageCaptureFormat(const gfx::Size& frame_size, |
VideoPixelFormat pixel_format) |
: frame_size(frame_size), pixel_format(pixel_format) { |
} |
+ImageCaptureParams::ImageCaptureParams() { |
+} |
+ |
} // namespace media |