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

Unified Diff: content/renderer/pepper/pepper_video_capture_host.h

Issue 263323003: Revert of Refactor video capturing code in the render process (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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/renderer/pepper/pepper_video_capture_host.h
diff --git a/content/renderer/pepper/pepper_video_capture_host.h b/content/renderer/pepper/pepper_video_capture_host.h
index 8326c5ec1aa4c4d9cd72b769c754489f0fb85872..8f5b77ad3b1778894631d1f45ea7544eb20243eb 100644
--- a/content/renderer/pepper/pepper_video_capture_host.h
+++ b/content/renderer/pepper/pepper_video_capture_host.h
@@ -7,25 +7,21 @@
#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 {
+class PepperVideoCaptureHost : public ppapi::host::ResourceHost,
+ public media::VideoCapture::EventHandler {
public:
PepperVideoCaptureHost(RendererPpapiHostImpl* host,
PP_Instance instance,
@@ -39,28 +35,17 @@
const IPC::Message& msg,
ppapi::host::HostMessageContext* context) OVERRIDE;
- // These methods are called by PepperPlatformVideoCapture only.
+ void OnInitialized(media::VideoCapture* capture, bool succeeded);
- // Called when video capture is initialized. We can start
- // video capture if |succeeded| is true.
- void OnInitialized(bool succeeded);
-
- // Called when video capture has started successfully.
- void OnStarted();
-
- // Called when video capture has stopped. There will be no more
- // frames delivered.
- void OnStopped();
-
- // Called when video capture has paused.
- void OnPaused();
-
- // Called when video capture cannot be started because of an error.
- void OnError();
-
- // Called when a video frame is ready.
- void OnFrameReady(const scoped_refptr<media::VideoFrame>& frame,
- media::VideoCaptureFormat format);
+ // 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;
private:
int32_t OnOpen(ppapi::host::HostMessageContext* context,
@@ -87,7 +72,7 @@
bool SetStatus(PP_VideoCaptureStatus_Dev status, bool forced);
- scoped_ptr<PepperPlatformVideoCapture> platform_video_capture_;
+ scoped_refptr<PepperPlatformVideoCapture> platform_video_capture_;
// Buffers of video frame.
struct BufferInfo {
« no previous file with comments | « content/renderer/pepper/pepper_platform_video_capture.cc ('k') | content/renderer/pepper/pepper_video_capture_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698