| Index: media/base/video_capture_types.h
|
| diff --git a/media/base/video_capture_types.h b/media/base/video_capture_types.h
|
| index d6ad5e3a736812f2d8f6ad8d0a275566402bcdaa..fa631a091e94496cb7494f163270a57d0a814e71 100644
|
| --- a/media/base/video_capture_types.h
|
| +++ b/media/base/video_capture_types.h
|
| @@ -24,7 +24,6 @@ typedef int VideoCaptureSessionId;
|
| // TODO(mcasas): http://crbug.com/504160 Consider making this an enum class.
|
| enum VideoPixelStorage {
|
| PIXEL_STORAGE_CPU,
|
| - PIXEL_STORAGE_TEXTURE,
|
| PIXEL_STORAGE_GPUMEMORYBUFFER,
|
| PIXEL_STORAGE_MAX = PIXEL_STORAGE_GPUMEMORYBUFFER,
|
| };
|
| @@ -126,6 +125,10 @@ typedef std::vector<VideoCaptureFormat> VideoCaptureFormats;
|
| struct MEDIA_EXPORT VideoCaptureParams {
|
| VideoCaptureParams();
|
|
|
| + // Returns true if requested_format.IsValid() and all other values are within
|
| + // their expected ranges.
|
| + bool IsValid() const;
|
| +
|
| bool operator==(const VideoCaptureParams& other) const {
|
| return requested_format == other.requested_format &&
|
| resolution_change_policy == other.resolution_change_policy &&
|
|
|