| 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..de38541b83f766bc5679ffa591c49e3e435e8459 100644
|
| --- a/content/browser/renderer_host/media/video_capture_controller.h
|
| +++ b/content/browser/renderer_host/media/video_capture_controller.h
|
| @@ -68,6 +68,8 @@ class CONTENT_EXPORT VideoCaptureController
|
| 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 +110,10 @@ 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
|
| + // as well as pointers to its color planes. Returns true if successful.
|
| + bool ReserveSharedMemory(
|
| + int* buffer_id_out, uint8** yplane, uint8** uplane, uint8** vplane);
|
|
|
| // Lock to protect free_dibs_ and owned_dibs_.
|
| base::Lock lock_;
|
|
|