Chromium Code Reviews| Index: content/renderer/media/media_stream_video_source.h |
| diff --git a/content/renderer/media/media_stream_video_source.h b/content/renderer/media/media_stream_video_source.h |
| index 3e2cbff21f051d8fd8ead5e849b0bec31dad9030..8b30e46deb5612166f29588a3687a9ce1089d3b2 100644 |
| --- a/content/renderer/media/media_stream_video_source.h |
| +++ b/content/renderer/media/media_stream_video_source.h |
| @@ -70,7 +70,7 @@ class CONTENT_EXPORT MediaStreamVideoSource |
| static const char kMinAspectRatio[]; // minAspectRatio |
| static const char kMaxAspectRatio[]; // maxAspectRatio |
| static const char kMaxWidth[]; // maxWidth |
| - static const char kMinWidth[]; // minWidthOnCaptureFormats |
| + static const char kMinWidth[]; // minWidth |
| static const char kMaxHeight[]; // maxHeight |
| static const char kMinHeight[]; // minHeight |
| static const char kMaxFrameRate[]; // maxFrameRate |
| @@ -107,12 +107,15 @@ class CONTENT_EXPORT MediaStreamVideoSource |
| double max_requested_frame_rate, |
| const VideoCaptureDeviceFormatsCB& callback) = 0; |
| - // An implementation must start capture frames using the resolution in |
| - // |params|. When the source has started or the source failed to start |
| - // OnStartDone must be called. An implementation must call |
| - // |frame_callback| on the IO thread with the captured frames. |
| + // An implementation must start to capture frames using the requested |
|
mcasas
2015/05/07 22:10:00
s/start to capture/start capturing/? (Disclaimer:
|
| + // |format|. The fulfilled |constraints| are provided as additional context, |
| + // and may be used to modify the behavior of the source. When the source has |
| + // started or the source failed to start OnStartDone must be called. An |
| + // implementation must call |frame_callback| on the IO thread with the |
| + // captured frames. |
| virtual void StartSourceImpl( |
| const media::VideoCaptureFormat& format, |
| + const blink::WebMediaConstraints& constraints, |
| const VideoCaptureDeliverFrameCB& frame_callback) = 0; |
| void OnStartDone(MediaStreamRequestResult result); |
| @@ -138,7 +141,8 @@ class CONTENT_EXPORT MediaStreamVideoSource |
| // fulfilled. |
|
mcasas
2015/05/07 22:10:00
... and |fulfilled_contraints| is the actual resul
miu
2015/05/08 06:43:34
Fixed comment, and added details about the return
|
| bool FindBestFormatWithConstraints( |
| const media::VideoCaptureFormats& formats, |
| - media::VideoCaptureFormat* best_format); |
| + media::VideoCaptureFormat* best_format, |
| + blink::WebMediaConstraints* fulfilled_constraints); |
| // Trigger all cached callbacks from AddTrack. AddTrack is successful |
| // if the capture delegate has started and the constraints provided in |