Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1475)

Unified Diff: content/browser/renderer_host/media/video_capture_controller.h

Issue 83793004: Implement IPCs and VideoCapture::Client interfaces for texture capture (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: e296ac98 Win32 bits. Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 9eed94ddb551d27c7726d08cc5a20e1a98bfc16e..24b13355577a77ccc717690fc6063a238b1e4de9 100644
--- a/content/browser/renderer_host/media/video_capture_controller.h
+++ b/content/browser/renderer_host/media/video_capture_controller.h
@@ -98,11 +98,15 @@ class CONTENT_EXPORT VideoCaptureController {
// prematurely closed.
void StopSession(int session_id);
- // Return a buffer previously given in
- // VideoCaptureControllerEventHandler::OnBufferReady.
+ // Return a buffer with id |buffer_id| previously given in
+ // VideoCaptureControllerEventHandler::OnBufferReady. In the case that the
+ // buffer was backed by a texture, |sync_point| will be waited on before
+ // destroying or recycling the texture, to synchronize with texture users in
+ // the renderer process.
void ReturnBuffer(const VideoCaptureControllerID& id,
VideoCaptureControllerEventHandler* event_handler,
- int buffer_id);
+ int buffer_id,
+ uint32 sync_point);
const media::VideoCaptureFormat& GetVideoCaptureFormat() const;
@@ -113,10 +117,10 @@ class CONTENT_EXPORT VideoCaptureController {
typedef std::list<ControllerClient*> ControllerClients;
// Worker functions on IO thread. Called by the VideoCaptureDeviceClient.
- void DoIncomingCapturedI420BufferOnIOThread(
- scoped_refptr<media::VideoCaptureDevice::Client::Buffer> buffer,
- const gfx::Size& dimensions,
- int frame_rate,
+ void DoIncomingCapturedVideoFrameOnIOThread(
+ const scoped_refptr<media::VideoCaptureDevice::Client::Buffer>& buffer,
+ const media::VideoCaptureFormat& format,
+ const scoped_refptr<media::VideoFrame>& frame,
base::TimeTicks timestamp);
void DoErrorOnIOThread();
void DoDeviceStoppedOnIOThread();

Powered by Google App Engine
This is Rietveld 408576698