Refactor video capturing code in the render process

content/renderer/pepper/pepper_video_capture_host.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_PEPPER_PEPPER_VIDEO_CAPTURE_HOST_H_
 #define CONTENT_RENDERER_PEPPER_PEPPER_VIDEO_CAPTURE_HOST_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
+#include "content/common/media/video_capture.h"
 #include "content/public/renderer/renderer_ppapi_host.h"
 #include "content/renderer/pepper/pepper_device_enumeration_host_helper.h"
 #include "content/renderer/pepper/ppb_buffer_impl.h"
-#include "media/video/capture/video_capture.h"
 #include "media/video/capture/video_capture_types.h"
 #include "ppapi/c/dev/ppp_video_capture_dev.h"
 #include "ppapi/host/host_message_context.h"
 #include "ppapi/host/resource_host.h"
 
+namespace media {
+class VideoFrame;
+}  // namespace media
+
 namespace content {
 class PepperPlatformVideoCapture;
 class RendererPpapiHostImpl;
 
-class PepperVideoCaptureHost : public ppapi::host::ResourceHost,
-                               public media::VideoCapture::EventHandler {
+class PepperVideoCaptureHost : public ppapi::host::ResourceHost {
  public:
   PepperVideoCaptureHost(RendererPpapiHostImpl* host,
                          PP_Instance instance,
                          PP_Resource resource);
 
   virtual ~PepperVideoCaptureHost();
 
   bool Init();
 
   virtual int32_t OnResourceMessageReceived(
       const IPC::Message& msg,
       ppapi::host::HostMessageContext* context) OVERRIDE;
 
-  void OnInitialized(media::VideoCapture* capture, bool succeeded);
+  // These methods are called by PepperPlatformVideoCapture only.
 
-  // media::VideoCapture::EventHandler
-  virtual void OnStarted(media::VideoCapture* capture) OVERRIDE;
-  virtual void OnStopped(media::VideoCapture* capture) OVERRIDE;
-  virtual void OnPaused(media::VideoCapture* capture) OVERRIDE;
-  virtual void OnError(media::VideoCapture* capture, int error_code) OVERRIDE;
-  virtual void OnRemoved(media::VideoCapture* capture) OVERRIDE;
-  virtual void OnFrameReady(media::VideoCapture* capture,
-                            const scoped_refptr<media::VideoFrame>& frame)
-      OVERRIDE;
+  // Called when video capturing is initialized. We can start

[bbudge, 2014/04/25 23:18:58]

s/capturing/capture
here and below

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

Done.

+  // video capturing if |succeeded| is true.
+  void OnInitialized(bool succeeded);
+
+  // Called when video capturing has started successfully.
+  void OnStarted();
+
+  // Called when video capturing has stopped. There will be no more
+  // frame delivered.

[bbudge, 2014/04/25 23:18:58]

s/frame/frames

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

Done.

+  void OnStopped();
+
+  // Called when video capturing has paused.
+  void OnPaused();
+
+  // Called when video capturing cannot be start because of an error.

[bbudge, 2014/04/25 23:18:58]

s/start/started

Is this comment true? It seems like it can be called whenever there is an error,
not just when starting.

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

Realistically error only happens during start.

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

Done.

+  void OnError();
+
+  // Called when a video frame is ready.
+  void OnFrameReady(const scoped_refptr<media::VideoFrame>& frame,
+                    media::VideoCaptureFormat format);
 
  private:
   int32_t OnOpen(ppapi::host::HostMessageContext* context,
                  const std::string& device_id,
                  const PP_VideoCaptureDeviceInfo_Dev& requested_info,
                  uint32_t buffer_count);
   int32_t OnStartCapture(ppapi::host::HostMessageContext* context);
   int32_t OnReuseBuffer(ppapi::host::HostMessageContext* context,
                         uint32_t buffer);
   int32_t OnStopCapture(ppapi::host::HostMessageContext* context);
   int32_t OnClose(ppapi::host::HostMessageContext* context);
 
   int32_t StopCapture();
   int32_t Close();
   void PostErrorReply();
   void AllocBuffers(const gfx::Size& resolution, int frame_rate);
   void ReleaseBuffers();
   void SendStatus();
 
   void SetRequestedInfo(const PP_VideoCaptureDeviceInfo_Dev& device_info,
                         uint32_t buffer_count);
 
   void DetachPlatformVideoCapture();
 
   bool SetStatus(PP_VideoCaptureStatus_Dev status, bool forced);
 
-  scoped_refptr<PepperPlatformVideoCapture> platform_video_capture_;
+  scoped_ptr<PepperPlatformVideoCapture> platform_video_capture_;
 
   // Buffers of video frame.
   struct BufferInfo {
     BufferInfo();
     ~BufferInfo();
 
     bool in_use;
     void* data;
     scoped_refptr<PPB_Buffer_Impl> buffer;
   };
@@ skipping 11 matching lines @@
   ppapi::host::ReplyMessageContext open_reply_context_;
 
   PepperDeviceEnumerationHostHelper enumeration_helper_;
 
   DISALLOW_COPY_AND_ASSIGN(PepperVideoCaptureHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_PEPPER_PEPPER_VIDEO_CAPTURE_HOST_H_