Chromium Code Reviews| Index: content/browser/renderer_host/media/video_capture_controller.h |
| diff --git a/content/browser/renderer_host/media/video_capture_controller.h b/content/browser/renderer_host/media/video_capture_controller.h |
| index fae1cc7a2f635291f6cc657e026508bbc17b4ed0..c040ce34a1d4a4f4a1200ef8a7f2545aea8199b0 100644 |
| --- a/content/browser/renderer_host/media/video_capture_controller.h |
| +++ b/content/browser/renderer_host/media/video_capture_controller.h |
| @@ -65,9 +65,10 @@ class CONTENT_EXPORT VideoCaptureController |
| int buffer_id); |
| // Implement media::VideoCaptureDevice::EventHandler. |
| - virtual void OnIncomingCapturedFrame(const uint8* data, |
| - int length, |
| + virtual void OnIncomingCapturedFrame(const uint8* data, int length, |
| base::Time timestamp) OVERRIDE; |
| + virtual void OnIncomingCapturedVideoFrame(media::VideoFrame* frame, |
| + base::Time timestamp) OVERRIDE; |
| virtual void OnError() OVERRIDE; |
| virtual void OnFrameInfo( |
| const media::VideoCaptureCapability& info) OVERRIDE; |
| @@ -108,6 +109,12 @@ class CONTENT_EXPORT VideoCaptureController |
| void PostStopping(); |
| // Check if any DIB is used by client. |
| bool ClientHasDIB(); |
| + // DIB allocator. Locate a free DIB object, reserve it, and return its id |
|
scherkus (not reviewing)
2013/02/05 22:40:44
nit: can you add blank lines before each of these
ncarter (slow)
2013/02/06 23:54:44
Done.
|
| + // as well as pointers to its color planes. Returns true if successful. |
| + bool ReserveSharedMemory(int* buffer_id_out, |
|
scherkus (not reviewing)
2013/02/05 22:40:44
nit: the comment is a bit misleading as there is n
ncarter (slow)
2013/02/06 23:54:44
I see what you mean. Fixed the comment language.
|
| + uint8** yplane, |
| + uint8** uplane, |
| + uint8** vplane); |
| // Lock to protect free_dibs_ and owned_dibs_. |
| base::Lock lock_; |