Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 // | 4 // |
| 5 // This file contains commonly used definitions of video capture. | 5 // This file contains commonly used definitions of video capture. |
| 6 | 6 |
| 7 #ifndef CONTENT_COMMON_MEDIA_VIDEO_CAPTURE_H_ | 7 #ifndef CONTENT_COMMON_MEDIA_VIDEO_CAPTURE_H_ |
| 8 #define CONTENT_COMMON_MEDIA_VIDEO_CAPTURE_H_ | 8 #define CONTENT_COMMON_MEDIA_VIDEO_CAPTURE_H_ |
| 9 | 9 |
| 10 #include "base/time/time.h" | 10 #include "base/time/time.h" |
| (...skipping 14 matching lines...) Expand all Loading... | |
| 25 VIDEO_CAPTURE_STATE_STOPPED, | 25 VIDEO_CAPTURE_STATE_STOPPED, |
| 26 VIDEO_CAPTURE_STATE_ERROR, | 26 VIDEO_CAPTURE_STATE_ERROR, |
| 27 VIDEO_CAPTURE_STATE_ENDED, | 27 VIDEO_CAPTURE_STATE_ENDED, |
| 28 VIDEO_CAPTURE_STATE_LAST = VIDEO_CAPTURE_STATE_ENDED | 28 VIDEO_CAPTURE_STATE_LAST = VIDEO_CAPTURE_STATE_ENDED |
| 29 }; | 29 }; |
| 30 | 30 |
| 31 typedef base::Callback<void(VideoCaptureState)> | 31 typedef base::Callback<void(VideoCaptureState)> |
| 32 VideoCaptureStateUpdateCB; | 32 VideoCaptureStateUpdateCB; |
| 33 typedef base::Callback<void(const media::VideoCaptureFormats&)> | 33 typedef base::Callback<void(const media::VideoCaptureFormats&)> |
| 34 VideoCaptureDeviceFormatsCB; | 34 VideoCaptureDeviceFormatsCB; |
| 35 | |
|
Alpha Left Google
2014/05/31 00:34:50
I have moved the definition of this callback to me
| |
| 36 // This callback is used to deliver video frames. | |
| 37 // |video_frame| - An object of a video frame. | |
| 38 // |format| - Format and additional information such as frame rate. | |
|
Ami GONE FROM CHROMIUM
2014/05/19 19:01:46
neither of these 2 lines are adding value.
Alpha Left Google
2014/05/31 00:34:50
Done.
| |
| 39 // |start_ticks| - An optional field to provide additional timing | |
| 40 // information for the beginning of this stream of video frames. | |
|
Ami GONE FROM CHROMIUM
2014/05/19 19:01:46
These 2 lines would be clearer as:
The time at the
| |
| 41 // This field usually means the local time when the first video frame of | |
| 42 // this stream is generated. It is possible for this value to be null if | |
|
Ami GONE FROM CHROMIUM
2014/05/19 19:01:46
s/stream is/stream was/
Alpha Left Google
2014/05/31 00:34:50
Done.
| |
| 43 // this timing information cannot be determined. There is no gurantee that | |
|
Ami GONE FROM CHROMIUM
2014/05/19 19:01:46
typo: gurantee
Alpha Left Google
2014/05/31 00:34:50
Done.
| |
| 44 // this value is accurate. For example video frames from a remote source | |
| 45 // can only provide this timing information as an estimation. | |
|
Ami GONE FROM CHROMIUM
2014/05/19 19:01:46
estimation -> estimate
Alpha Left Google
2014/05/31 00:34:50
Done.
| |
| 46 // This field is used for synchronization with other audio or video streams. | |
| 47 // |video_frame->timestamp() + start_ticks| will give an estimation in local | |
|
Ami GONE FROM CHROMIUM
2014/05/19 19:01:46
estimation -> estimate
Alpha Left Google
2014/05/31 00:34:50
Done.
| |
| 48 // time when the frame is generated. | |
|
Ami GONE FROM CHROMIUM
2014/05/19 19:01:46
s/is/was/
| |
| 35 typedef base::Callback< | 49 typedef base::Callback< |
| 36 void(const scoped_refptr<media::VideoFrame>&, | 50 void(const scoped_refptr<media::VideoFrame>& video_frame, |
| 37 const media::VideoCaptureFormat&)> | 51 const media::VideoCaptureFormat& format, |
| 52 const base::TimeTicks& start_ticks)> | |
| 38 VideoCaptureDeliverFrameCB; | 53 VideoCaptureDeliverFrameCB; |
| 39 | 54 |
| 40 } // namespace content | 55 } // namespace content |
| 41 | 56 |
| 42 #endif // CONTENT_COMMON_MEDIA_VIDEO_CAPTURE_H_ | 57 #endif // CONTENT_COMMON_MEDIA_VIDEO_CAPTURE_H_ |
| OLD | NEW |