Refactor video capturing code in the render process

content/renderer/media/video_capture_impl.h

Index: content/renderer/media/video_capture_impl.h
diff --git a/content/renderer/media/video_capture_impl.h b/content/renderer/media/video_capture_impl.h
index 7988669b9def53d82a2c4f5852b8ccdc19953273..74880e653a284901623e8bafcd506b89b9d18812 100644
--- a/content/renderer/media/video_capture_impl.h
+++ b/content/renderer/media/video_capture_impl.h
@@ -10,20 +10,11 @@
 // operation of a capture device to the browser process and receives responses
 // from browser process.
 //
-// All public methods of VideoCaptureImpl can be called on any thread.
-// Internally it runs on the IO thread. Clients of this class implement
-// interface media::VideoCapture::EventHandler which is called only on the IO
-// thread.
+// VideoCaptureImpl is a IO thread only object. See the comments in

[Ami GONE FROM CHROMIUM, 2014/04/21 23:42:53]

s/a IO/an IO/

[Alpha Left Google, 2014/04/23 18:48:33]

Done.

+// video_capture_impl_manager.cc for the lifetime of this object.
 //
-// Implementation note: tasks are posted bound to Unretained(this) to the I/O
-// thread and this is safe (even though the I/O thread is scoped to the renderer
-// process) because VideoCaptureImplManager only triggers deletion of its
-// VideoCaptureImpl's by calling DeInit which detours through the I/O thread, so
-// as long as nobody posts tasks after the DeInit() call is made, it is
-// guaranteed none of these Unretained posted tasks will dangle after the delete
-// goes through. The "as long as" is guaranteed by clients of
-// VideoCaptureImplManager not using devices after they've released
-// VideoCaptureHandle, which is a wrapper of this object.
+// This is an internal class used by VideoCaptureImplManager only. Do not access
+// this directly.
 
 #ifndef CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_IMPL_H_
 #define CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_IMPL_H_
@@ -32,10 +23,10 @@
 #include <map>
 
 #include "base/memory/weak_ptr.h"
+#include "base/threading/thread_checker.h"
 #include "content/common/content_export.h"
 #include "content/common/media/video_capture.h"
 #include "content/renderer/media/video_capture_message_filter.h"
-#include "media/video/capture/video_capture.h"
 #include "media/video/capture/video_capture_types.h"
 
 namespace base {
@@ -46,58 +37,66 @@ namespace gpu {
 struct MailboxHolder;
 }  // namespace gpu
 
+namespace media {
+class VideoFrame;
+}  // namespace media
+
 namespace content {
 
 class CONTENT_EXPORT VideoCaptureImpl
-    : public media::VideoCapture, public VideoCaptureMessageFilter::Delegate {
+    : public VideoCaptureMessageFilter::Delegate {
  public:
+  virtual ~VideoCaptureImpl();
+
+ private:
+  friend class VideoCaptureImplManager;

[Ami GONE FROM CHROMIUM, 2014/04/21 23:42:53]

why this?

[Alpha Left Google, 2014/04/23 18:48:33]

Probably excessive. Changed it to a more public interface.

+  friend class VideoCaptureImplTest;
+  friend class MockVideoCaptureImpl;
+
+  class ClientBuffer;

[Ami GONE FROM CHROMIUM, 2014/04/21 23:42:53]

please doco all structs/classes.

[Alpha Left Google, 2014/04/23 18:48:33]

Done.

+  struct ClientInfo {
+    ClientInfo();
+    ~ClientInfo();
+    media::VideoCaptureParams params;
+    VideoCaptureStateUpdateCB state_update_cb;
+    VideoCaptureDeliverFrameCB deliver_frame_cb;
+  };
+  typedef std::map<int, ClientInfo> ClientInfoMap;
+
   VideoCaptureImpl(media::VideoCaptureSessionId session_id,
                    VideoCaptureMessageFilter* filter);
-  virtual ~VideoCaptureImpl();
 
   // Start listening to IPC messages.
   void Init();
 
-  // Stop listening to IPC messages. Call |done_cb| when done.
-  void DeInit(base::Closure done_cb);
+  // Stop listening to IPC messages.
+  void DeInit();
 
   // Stop/resume delivering video frames to clients, based on flag |suspend|.
   void SuspendCapture(bool suspend);
 
-  // media::VideoCapture interface.
-  virtual void StartCapture(
-      media::VideoCapture::EventHandler* handler,
-      const media::VideoCaptureParams& params) OVERRIDE;
-  virtual void StopCapture(media::VideoCapture::EventHandler* handler) OVERRIDE;
-  virtual bool CaptureStarted() OVERRIDE;
-  virtual int CaptureFrameRate() OVERRIDE;
-  virtual void GetDeviceSupportedFormats(
-      const DeviceFormatsCallback& callback) OVERRIDE;
-  virtual void GetDeviceFormatsInUse(
-      const DeviceFormatsInUseCallback& callback) OVERRIDE;
+  // Start capturing using the provided parameters.
+  // |client_id| must be unique to this object. It is used later to

[Ami GONE FROM CHROMIUM, 2014/04/21 23:42:53]

"unique" in the tab/renderer/browser ?

[Alpha Left Google, 2014/04/23 18:48:33]

renderer. Documented.

+  // stop receiving video frames.
+  // |status_update_cb| will be called when state changes.

[Ami GONE FROM CHROMIUM, 2014/04/21 23:42:53]

s/status/state/

[Alpha Left Google, 2014/04/23 18:48:33]

Done.

+  // |deliver_frame_cb| will be called when a frame is ready.
+  void StartCapture(
+      int client_id,
+      const media::VideoCaptureParams& params,
+      const VideoCaptureStateUpdateCB& state_update_cb,
+      const VideoCaptureDeliverFrameCB& deliver_frame_cb);
+
+  // Stop capturing. |client_id| is an identifier used to call StartCapture.

[Ami GONE FROM CHROMIUM, 2014/04/21 23:42:53]

s/an/the/

[Alpha Left Google, 2014/04/23 18:48:33]

Done.

+  void StopCapture(int client_id);
+  bool CaptureStarted();

[Ami GONE FROM CHROMIUM, 2014/04/21 23:42:53]

why is this needed, given the state_updated_cb?

[Ami GONE FROM CHROMIUM, 2014/04/21 23:42:53]

\n between methods, and doco all methods that aren't interface impls.

[Alpha Left Google, 2014/04/23 18:48:33]

Removed.

+  int CaptureFrameRate();

[Alpha Left Google, 2014/04/23 18:48:33]

Removed too.

+  void GetDeviceSupportedFormats(
+      const VideoCaptureDeviceFormatsCB& callback);
+  void GetDeviceFormatsInUse(
+      const VideoCaptureDeviceFormatsCB& callback);
 
   media::VideoCaptureSessionId session_id() const { return session_id_; }
 
- private:
-  friend class VideoCaptureImplTest;
-  friend class MockVideoCaptureImpl;
-
-  class ClientBuffer;
-  typedef std::map<media::VideoCapture::EventHandler*,
-                   media::VideoCaptureParams> ClientInfo;
-
-  void InitOnIOThread();
-  void DeInitOnIOThread(base::Closure done_cb);
-  void SuspendCaptureOnIOThread(bool suspend);
-  void StartCaptureOnIOThread(
-      media::VideoCapture::EventHandler* handler,
-      const media::VideoCaptureParams& params);
-  void StopCaptureOnIOThread(media::VideoCapture::EventHandler* handler);
-  void GetDeviceSupportedFormatsOnIOThread(
-      const DeviceFormatsCallback& callback);
-  void GetDeviceFormatsInUseOnIOThread(
-      const DeviceFormatsInUseCallback& callback);
-
   // VideoCaptureMessageFilter::Delegate interface.
   virtual void OnBufferCreated(base::SharedMemoryHandle handle,
                                int length,
@@ -130,28 +129,26 @@ class CONTENT_EXPORT VideoCaptureImpl
   virtual void Send(IPC::Message* message);
 
   // Helpers.
-  bool RemoveClient(media::VideoCapture::EventHandler* handler,
-                    ClientInfo* clients);
+  bool RemoveClient(int client_id, ClientInfoMap* clients);
 
   const scoped_refptr<VideoCaptureMessageFilter> message_filter_;
-  const scoped_refptr<base::MessageLoopProxy> io_message_loop_proxy_;
   int device_id_;
   const int session_id_;
 
   // Vector of callbacks to be notified of device format enumerations, used only
   // on IO Thread.
-  std::vector<DeviceFormatsCallback> device_formats_callback_queue_;
+  std::vector<VideoCaptureDeviceFormatsCB> device_formats_cb_queue_;
   // Vector of callbacks to be notified of a device's in use capture format(s),
   // used only on IO Thread.
-  std::vector<DeviceFormatsInUseCallback> device_formats_in_use_callback_queue_;
+  std::vector<VideoCaptureDeviceFormatsCB> device_formats_in_use_cb_queue_;
 
   // Buffers available for sending to the client.
   typedef std::map<int32, scoped_refptr<ClientBuffer> > ClientBufferMap;
   ClientBufferMap client_buffers_;
 
-  ClientInfo clients_;
-  ClientInfo clients_pending_on_filter_;
-  ClientInfo clients_pending_on_restart_;
+  ClientInfoMap clients_;
+  ClientInfoMap clients_pending_on_filter_;
+  ClientInfoMap clients_pending_on_restart_;
 
   // Member params_ represents the video format requested by the
   // client to this class via StartCapture().
@@ -172,6 +169,9 @@ class CONTENT_EXPORT VideoCaptureImpl
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<VideoCaptureImpl> weak_factory_;
 
+  // Bound to the thread where Init() is called. It should be the IO thread.

[Ami GONE FROM CHROMIUM, 2014/04/21 23:42:53]

should go above the weakptrfactory above (see the NOTE)

[Alpha Left Google, 2014/04/23 18:48:33]

Done.

+  base::ThreadChecker thread_checker_;
+
   DISALLOW_COPY_AND_ASSIGN(VideoCaptureImpl);
 };