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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 23551011: From Video Capture, abolish OnFrameInfo and enable resolution changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add assert to vcbp unittest Created 7 years, 2 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
« content/browser/renderer_host/media/video_capture_controller.cc ('K') | « content/browser/renderer_host/media/video_capture_controller_unittest.cc ('k') | content/browser/renderer_host/media/video_capture_host.cc » ('j') | content/browser/renderer_host/media/web_contents_video_capture_device.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/media/video_capture_host.h
diff --git a/content/browser/renderer_host/media/video_capture_host.h b/content/browser/renderer_host/media/video_capture_host.h
index 6ce395631ebf8b04fb36de810e5c2532b64dafc4..4648466cdefac5edb4018923526af2d0e34900e0 100644
--- a/content/browser/renderer_host/media/video_capture_host.h
+++ b/content/browser/renderer_host/media/video_capture_host.h
@@ -5,33 +5,48 @@
// VideoCaptureHost serves video capture related messages from
// VideoCaptureMessageFilter which lives inside the render process.
//
-// This class is owned by BrowserRenderProcessHost, and instantiated on UI
+// This class is owned by RenderProcessHostImpl, and instantiated on UI
// thread, but all other operations and method calls happen on IO thread.
//
// Here's an example of a typical IPC dialog for video capture:
//
-// Renderer VideoCaptureHost
-// | |
-// | VideoCaptureHostMsg_Start > |
-// | < VideoCaptureMsg_DeviceInfo |
-// | |
-// | < VideoCaptureMsg_StateChanged |
-// | (kStarted) |
-// | < VideoCaptureMsg_BufferReady |
-// | ... |
-// | < VideoCaptureMsg_BufferReady |
-// | ... |
-// | VideoCaptureHostMsg_BufferReady > |
-// | VideoCaptureHostMsg_BufferReady > |
-// | |
-// | ... |
-// | |
-// | < VideoCaptureMsg_BufferReady |
-// | VideoCaptureHostMsg_Stop > |
-// | VideoCaptureHostMsg_BufferReady > |
-// | < VideoCaptureMsg_StateChanged |
-// | (kStopped) |
-// v v
+// Renderer VideoCaptureHost
+// | |
+// | VideoCaptureHostMsg_Start > |
+// | < VideoCaptureMsg_StateChanged |
+// | (VIDEO_CAPTURE_STATE_STARTED) |
+// | < VideoCaptureMsg_NewBuffer(1) |
+// | < VideoCaptureMsg_NewBuffer(2) |
+// | < VideoCaptureMsg_NewBuffer(3) |
+// | |
+// | < VideoCaptureMsg_BufferReady(1) |
+// | < VideoCaptureMsg_BufferReady(2) |
+// | VideoCaptureHostMsg_BufferReady(1) > |
+// | < VideoCaptureMsg_BufferReady(3) |
+// | VideoCaptureHostMsg_BufferReady(2) > |
+// | < VideoCaptureMsg_BufferReady(1) |
+// | VideoCaptureHostMsg_BufferReady(3) > |
+// | < VideoCaptureMsg_BufferReady(2) |
+// | VideoCaptureHostMsg_BufferReady(1) > |
+// | ... |
+// | < VideoCaptureMsg_BufferReady(3) |
+// | |
+// | ... (resolution change) |
+// | < VideoCaptureMsg_FreeBuffer(1) | Buffers are re-allocated
+// | < VideoCaptureMsg_NewBuffer(4) | at a larger size, as
+// | < VideoCaptureMsg_BufferReady(4) | needed.
+// | VideoCaptureHostMsg_BufferReady(2) > |
+// | < VideoCaptureMsg_FreeBuffer(2) |
+// | < VideoCaptureMsg_NewBuffer(5) |
+// | < VideoCaptureMsg_BufferReady(5) |
+// | ... |
+// | |
+// | < VideoCaptureMsg_BufferReady |
+// | VideoCaptureHostMsg_Stop > |
+// | VideoCaptureHostMsg_BufferReady > |
+// | < VideoCaptureMsg_StateChanged |
+// | (VIDEO_CAPTURE_STATE_STOPPED) |
+// v v
#ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_HOST_H_
#define CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_HOST_H_
@@ -69,17 +84,15 @@ class CONTENT_EXPORT VideoCaptureHost
virtual void OnError(const VideoCaptureControllerID& id) OVERRIDE;
virtual void OnBufferCreated(const VideoCaptureControllerID& id,
base::SharedMemoryHandle handle,
- int length, int buffer_id) OVERRIDE;
- virtual void OnBufferReady(const VideoCaptureControllerID& id,
- int buffer_id,
- base::Time timestamp) OVERRIDE;
- virtual void OnFrameInfo(
+ int length,
+ int buffer_id) OVERRIDE;
+ virtual void OnBufferDestroyed(const VideoCaptureControllerID& id,
+ int buffer_id) OVERRIDE;
+ virtual void OnBufferReady(
const VideoCaptureControllerID& id,
- const media::VideoCaptureCapability& format) OVERRIDE;
- virtual void OnFrameInfoChanged(const VideoCaptureControllerID& id,
- int width,
- int height,
- int frame_per_second) OVERRIDE;
+ int buffer_id,
+ base::Time timestamp,
+ const media::VideoCaptureFormat& format) OVERRIDE;
virtual void OnEnded(const VideoCaptureControllerID& id) OVERRIDE;
private:
@@ -100,7 +113,7 @@ class CONTENT_EXPORT VideoCaptureHost
int device_id, const media::VideoCaptureParams& params,
const base::WeakPtr<VideoCaptureController>& controller);
void DoControllerAddedOnIOThread(
- int device_id, const media::VideoCaptureParams params,
+ int device_id, const media::VideoCaptureParams& params,
const base::WeakPtr<VideoCaptureController>& controller);
// IPC message: Stop capture on device referenced by |device_id|.
@@ -120,24 +133,16 @@ class CONTENT_EXPORT VideoCaptureHost
int length,
int buffer_id);
+ void DoSendFreeBufferOnIOThread(
+ const VideoCaptureControllerID& controller_id,
+ int buffer_id);
+
// Send a filled buffer to the VideoCaptureMessageFilter.
void DoSendFilledBufferOnIOThread(
const VideoCaptureControllerID& controller_id,
int buffer_id,
- base::Time timestamp);
-
- // Send information about the capture parameters (resolution, frame rate etc)
- // to the VideoCaptureMessageFilter.
- void DoSendFrameInfoOnIOThread(const VideoCaptureControllerID& controller_id,
- const media::VideoCaptureCapability& format);
-
- // Send newly changed information about frame resolution and frame rate
- // to the VideoCaptureMessageFilter.
- void DoSendFrameInfoChangedOnIOThread(
- const VideoCaptureControllerID& controller_id,
- int width,
- int height,
- int frame_per_second);
+ base::Time timestamp,
+ const media::VideoCaptureFormat& format);
// Handle error coming from VideoCaptureDevice.
void DoHandleErrorOnIOThread(const VideoCaptureControllerID& controller_id);
« content/browser/renderer_host/media/video_capture_controller.cc ('K') | « content/browser/renderer_host/media/video_capture_controller_unittest.cc ('k') | content/browser/renderer_host/media/video_capture_host.cc » ('j') | content/browser/renderer_host/media/web_contents_video_capture_device.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698