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

Unified Diff: content/renderer/pepper_plugin_delegate_impl.cc

Issue 7553003: Video Capture Pepper API (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Make Clang happy Created 9 years, 4 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
« no previous file with comments | « content/renderer/pepper_plugin_delegate_impl.h ('k') | ppapi/c/dev/pp_video_capture_dev.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/pepper_plugin_delegate_impl.cc
diff --git a/content/renderer/pepper_plugin_delegate_impl.cc b/content/renderer/pepper_plugin_delegate_impl.cc
index 2ce107673d65b8443f3cec912732753a5f433ec5..c061b80df3ec0e18cc24074ef9436566d2e9d721 100644
--- a/content/renderer/pepper_plugin_delegate_impl.cc
+++ b/content/renderer/pepper_plugin_delegate_impl.cc
@@ -36,6 +36,7 @@
#include "content/renderer/gpu/renderer_gl_context.h"
#include "content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h"
#include "content/renderer/media/audio_message_filter.h"
+#include "content/renderer/media/video_capture_impl_manager.h"
#include "content/renderer/p2p/p2p_transport_impl.h"
#include "content/renderer/pepper_platform_context_3d_impl.h"
#include "content/renderer/pepper_platform_video_decoder_impl.h"
@@ -44,6 +45,7 @@
#include "content/renderer/render_widget_fullscreen_pepper.h"
#include "content/renderer/webplugin_delegate_proxy.h"
#include "ipc/ipc_channel_handle.h"
+#include "media/video/capture/video_capture_proxy.h"
#include "ppapi/c/dev/pp_video_dev.h"
#include "ppapi/c/pp_errors.h"
#include "ppapi/c/private/ppb_flash.h"
@@ -73,8 +75,6 @@ using WebKit::WebView;
namespace {
-const int32 kDefaultCommandBufferSize = 1024 * 1024;
-
int32_t PlatformFileToInt(base::PlatformFile handle) {
#if defined(OS_WIN)
return static_cast<int32_t>(reinterpret_cast<intptr_t>(handle));
@@ -376,6 +376,64 @@ class QuotaCallbackTranslator : public QuotaDispatcher::Callback {
scoped_ptr<PluginCallback> callback_;
};
+class PlatformVideoCaptureImpl
+ : public webkit::ppapi::PluginDelegate::PlatformVideoCapture {
+ public:
+ PlatformVideoCaptureImpl(media::VideoCapture::EventHandler* handler)
+ : handler_proxy_(new media::VideoCaptureHandlerProxy(
+ handler, base::MessageLoopProxy::CreateForCurrentThread())) {
+ VideoCaptureImplManager* manager =
+ RenderThread::current()->video_capture_impl_manager();
+ // 1 means the "default" video capture device.
+ // TODO(piman): Add a way to enumerate devices and pass them through the
+ // API.
+ video_capture_ = manager->AddDevice(1, handler_proxy_.get());
+ }
+
+ // Overrides from media::VideoCapture::EventHandler
+ virtual ~PlatformVideoCaptureImpl() {
+ VideoCaptureImplManager* manager =
+ RenderThread::current()->video_capture_impl_manager();
+ manager->RemoveDevice(1, handler_proxy_.get());
+ }
+
+ virtual void StartCapture(
+ EventHandler* handler,
+ const VideoCaptureCapability& capability) OVERRIDE {
+ DCHECK(handler == handler_proxy_->proxied());
+ video_capture_->StartCapture(handler_proxy_.get(), capability);
+ }
+
+ virtual void StopCapture(EventHandler* handler) OVERRIDE {
+ DCHECK(handler == handler_proxy_->proxied());
+ video_capture_->StopCapture(handler_proxy_.get());
+ }
+
+ virtual void FeedBuffer(scoped_refptr<VideoFrameBuffer> buffer) OVERRIDE {
+ video_capture_->FeedBuffer(buffer);
+ }
+
+ virtual bool CaptureStarted() OVERRIDE {
+ return handler_proxy_->state().started;
+ }
+
+ virtual int CaptureWidth() OVERRIDE {
+ return handler_proxy_->state().width;
+ }
+
+ virtual int CaptureHeight() OVERRIDE {
+ return handler_proxy_->state().height;
+ }
+
+ virtual int CaptureFrameRate() OVERRIDE {
+ return handler_proxy_->state().frame_rate;
+ }
+
+ private:
+ scoped_ptr<media::VideoCaptureHandlerProxy> handler_proxy_;
+ media::VideoCapture* video_capture_;
+};
+
} // namespace
bool DispatcherWrapper::Init(
@@ -854,6 +912,12 @@ webkit::ppapi::PluginDelegate::PlatformContext3D*
#endif
}
+webkit::ppapi::PluginDelegate::PlatformVideoCapture*
+PepperPluginDelegateImpl::CreateVideoCapture(
+ media::VideoCapture::EventHandler* handler) {
+ return new PlatformVideoCaptureImpl(handler);
+}
+
webkit::ppapi::PluginDelegate::PlatformVideoDecoder*
PepperPluginDelegateImpl::CreateVideoDecoder(
media::VideoDecodeAccelerator::Client* client,
« no previous file with comments | « content/renderer/pepper_plugin_delegate_impl.h ('k') | ppapi/c/dev/pp_video_capture_dev.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698