| Index: media/video/capture/video_capture_types.h
|
| diff --git a/media/video/capture/video_capture_types.h b/media/video/capture/video_capture_types.h
|
| index 003dc4e998bf3d7635ba2a5104c186189e68b0e1..8facdd97947dd2436c3259a74adea294cc03b40a 100644
|
| --- a/media/video/capture/video_capture_types.h
|
| +++ b/media/video/capture/video_capture_types.h
|
| @@ -51,15 +51,18 @@ class MEDIA_EXPORT VideoCaptureFormat {
|
| VideoCaptureResolutionType frame_size_type;
|
| };
|
|
|
| -// Parameters for starting video capture and device information.
|
| -class MEDIA_EXPORT VideoCaptureParams : public VideoCaptureFormat {
|
| +// Parameters for starting video capture.
|
| +class MEDIA_EXPORT VideoCaptureParams {
|
| public:
|
| VideoCaptureParams();
|
| - // TODO(mcasas): http://crbug.com/297597, investigate if session_id is in use.
|
| + // Identifies which device is to be started.
|
| VideoCaptureSessionId session_id;
|
| +
|
| + // Requests a resolution and format at which the capture will occur.
|
| + VideoCaptureFormat requested_format;
|
| };
|
|
|
| -// Capabilities describe the format a camera capture video in.
|
| +// Capabilities describe the format a camera captures video in.
|
| class MEDIA_EXPORT VideoCaptureCapability : public VideoCaptureFormat {
|
| public:
|
| VideoCaptureCapability();
|
|
|