PPAPI: implement GetSupportedPreviewSizes

content/renderer/pepper/pepper_platform_image_capture.cc

Index: content/renderer/pepper/pepper_platform_image_capture.cc
diff --git a/content/renderer/pepper/pepper_platform_video_capture.cc b/content/renderer/pepper/pepper_platform_image_capture.cc
similarity index 50%
copy from content/renderer/pepper/pepper_platform_video_capture.cc
copy to content/renderer/pepper/pepper_platform_image_capture.cc
index 0d011f3fdc4217392897e9975df7cadd9f6eb66e..dd74509f55da72e893f17360379b75400e564d4a 100644
--- a/content/renderer/pepper/pepper_platform_video_capture.cc
+++ b/content/renderer/pepper/pepper_platform_image_capture.cc
@@ -1,15 +1,17 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2015 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.
 
-#include "content/renderer/pepper/pepper_platform_video_capture.h"
+#include "content/renderer/pepper/pepper_platform_image_capture.h"
 
 #include "base/bind.h"
+#include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "content/renderer/media/video_capture_impl_manager.h"
+#include "content/renderer/pepper/gfx_conversion.h"
+#include "content/renderer/pepper/pepper_image_capture_host.h"
 #include "content/renderer/pepper/pepper_media_device_manager.h"
-#include "content/renderer/pepper/pepper_video_capture_host.h"
 #include "content/renderer/render_frame_impl.h"
 #include "content/renderer/render_thread_impl.h"
 #include "media/base/bind_to_current_loop.h"
@@ -17,11 +19,11 @@
 
 namespace content {
 
-PepperPlatformVideoCapture::PepperPlatformVideoCapture(
+PepperPlatformImageCapture::PepperPlatformImageCapture(
     int render_frame_id,
     const std::string& device_id,
     const GURL& document_url,
-    PepperVideoCaptureHost* handler)
+    PepperImageCaptureHost* handler)
     : render_frame_id_(render_frame_id),
       device_id_(device_id),
       session_id_(0),
@@ -34,47 +36,29 @@ PepperPlatformVideoCapture::PepperPlatformVideoCapture(
   PepperMediaDeviceManager* const device_manager = GetMediaDeviceManager();
   if (device_manager) {
     pending_open_device_id_ = device_manager->OpenDevice(
-        PP_DEVICETYPE_DEV_VIDEOCAPTURE,
-        device_id,
-        document_url,
-        base::Bind(&PepperPlatformVideoCapture::OnDeviceOpened,
+        PP_DEVICETYPE_DEV_VIDEOCAPTURE, device_id, document_url,
+        base::Bind(&PepperPlatformImageCapture::OnDeviceOpened,
                    weak_factory_.GetWeakPtr()));
     pending_open_device_ = true;
   }
 }
 
-void PepperPlatformVideoCapture::StartCapture(
-    const media::VideoCaptureParams& params) {
+void PepperPlatformImageCapture::GetPreviewSizes() {
   DCHECK(thread_checker_.CalledOnValidThread());
-  if (!stop_capture_cb_.is_null())
-    return;
   VideoCaptureImplManager* manager =
       RenderThreadImpl::current()->video_capture_impl_manager();
-  stop_capture_cb_ =
-      manager->StartCapture(session_id_,
-                            params,
-                            media::BindToCurrentLoop(base::Bind(
-                                &PepperPlatformVideoCapture::OnStateUpdate,
-                                weak_factory_.GetWeakPtr())),
-                            media::BindToCurrentLoop(base::Bind(
-                                &PepperPlatformVideoCapture::OnFrameReady,
-                                weak_factory_.GetWeakPtr())));
+  manager->GetDeviceSupportedFormats(
+      session_id_,
+      media::BindToCurrentLoop(base::Bind(
+          &PepperPlatformImageCapture::OnDeviceSupportedFormatsEnumerated,
+          weak_factory_.GetWeakPtr())));
 }
 
-void PepperPlatformVideoCapture::StopCapture() {
+void PepperPlatformImageCapture::DetachEventHandler() {
   DCHECK(thread_checker_.CalledOnValidThread());
-  if (stop_capture_cb_.is_null())
-    return;
-  stop_capture_cb_.Run();
-  stop_capture_cb_.Reset();
-}
-
-void PepperPlatformVideoCapture::DetachEventHandler() {
   handler_ = NULL;
-  StopCapture();
   if (!release_device_cb_.is_null()) {
-    release_device_cb_.Run();
-    release_device_cb_.Reset();
+    base::ResetAndReturn(&release_device_cb_).Run();
   }
   if (!label_.empty()) {
     PepperMediaDeviceManager* const device_manager = GetMediaDeviceManager();
@@ -91,16 +75,19 @@ void PepperPlatformVideoCapture::DetachEventHandler() {
   }
 }
 
-PepperPlatformVideoCapture::~PepperPlatformVideoCapture() {
-  DCHECK(stop_capture_cb_.is_null());
+PepperPlatformImageCapture::~PepperPlatformImageCapture() {
+  DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(release_device_cb_.is_null());
   DCHECK(label_.empty());
   DCHECK(!pending_open_device_);
 }
 
-void PepperPlatformVideoCapture::OnDeviceOpened(int request_id,
+void PepperPlatformImageCapture::OnDeviceOpened(int request_id,
                                                 bool succeeded,
                                                 const std::string& label) {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK(handler_);
+
   pending_open_device_ = false;
   pending_open_device_id_ = -1;
 
@@ -108,51 +95,35 @@ void PepperPlatformVideoCapture::OnDeviceOpened(int request_id,
   succeeded = succeeded && device_manager;
   if (succeeded) {
     label_ = label;
-    session_id_ = device_manager->GetSessionID(
-        PP_DEVICETYPE_DEV_VIDEOCAPTURE, label);
+    session_id_ =
+        device_manager->GetSessionID(PP_DEVICETYPE_DEV_VIDEOCAPTURE, label);
     VideoCaptureImplManager* manager =
         RenderThreadImpl::current()->video_capture_impl_manager();
     release_device_cb_ = manager->UseDevice(session_id_);
   }
 
-  if (handler_)
-    handler_->OnInitialized(succeeded);
+  handler_->OnInitialized(succeeded);
 }
 
-void PepperPlatformVideoCapture::OnStateUpdate(VideoCaptureState state) {
-  if (!handler_)
-    return;
-  switch (state) {
-    case VIDEO_CAPTURE_STATE_STARTED:
-      handler_->OnStarted();
-      break;
-    case VIDEO_CAPTURE_STATE_STOPPED:
-      handler_->OnStopped();
-      break;
-    case VIDEO_CAPTURE_STATE_PAUSED:
-      handler_->OnPaused();
-      break;
-    case VIDEO_CAPTURE_STATE_ERROR:
-      handler_->OnError();
-      break;
-    default:
-      NOTREACHED() << "Unexpected state: " << state << ".";
-  }
-}
+void PepperPlatformImageCapture::OnDeviceSupportedFormatsEnumerated(
+    const media::VideoCaptureFormats& formats) {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK(handler_);
 
-void PepperPlatformVideoCapture::OnFrameReady(
-    const scoped_refptr<media::VideoFrame>& frame,
-    const media::VideoCaptureFormat& format,
-    const base::TimeTicks& estimated_capture_time) {
-  if (handler_ && !stop_capture_cb_.is_null())
-    handler_->OnFrameReady(frame, format);
+  std::vector<PP_Size> sizes;
+  for (media::VideoCaptureFormats::const_iterator it = formats.begin();

[dcheng, 2015/02/12 21:47:20]

Consider using a for each?

for (const auto& format : formats)
  sizes.push_back(PP_FromGfxSize(it->frame_size));

[Justin Chuang, 2015/02/16 19:15:24]

Done. Interesting.

+       it != formats.end(); it++) {
+    sizes.push_back(PP_FromGfxSize(it->frame_size));
+  }
+  handler_->OnPreviewSizesEnumerated(sizes);
 }
 
-PepperMediaDeviceManager* PepperPlatformVideoCapture::GetMediaDeviceManager() {
+PepperMediaDeviceManager* PepperPlatformImageCapture::GetMediaDeviceManager() {
   RenderFrameImpl* const render_frame =
       RenderFrameImpl::FromRoutingID(render_frame_id_);
-  return render_frame ?
-      PepperMediaDeviceManager::GetForRenderFrame(render_frame).get() : NULL;
+  return render_frame
+             ? PepperMediaDeviceManager::GetForRenderFrame(render_frame).get()
+             : NULL;
 }
 
 }  // namespace content