[Mojo Video Capture] Decouple VCController from VCBufferPool and VCDeviceClient

content/browser/renderer_host/media/video_capture_controller.cc

 // 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.
 
 #include "content/browser/renderer_host/media/video_capture_controller.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
 #include <set>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/sparse_histogram.h"
 #include "build/build_config.h"
 #include "components/display_compositor/gl_helper.h"
 #include "content/browser/renderer_host/media/media_stream_manager.h"
-#include "content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.h"
 #include "content/browser/renderer_host/media/video_capture_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/content_switches.h"
 #include "media/base/video_frame.h"
 #include "media/capture/video/video_capture_buffer_pool_impl.h"

[mcasas, 2016/12/06 20:02:24]

Not needed anymore?

[chfremer, 2016/12/06 21:07:41]

Good catch!
Hmm, seems we still need at least video_capture_buffer_pool.h, since there is a
DCHECK that checks against VideoCaptureBufferPool::kInvalidId.

Done.

 #include "media/capture/video/video_capture_buffer_tracker_factory_impl.h"
 #include "media/capture/video/video_capture_device_client.h"
 
 #if !defined(OS_ANDROID)
 #include "content/browser/compositor/image_transport_factory.h"
 #endif
 
 using media::VideoCaptureFormat;
 using media::VideoFrame;
 using media::VideoFrameMetadata;
 
 namespace content {
 
 namespace {
 
 static const int kInfiniteRatio = 99999;
 
 #define UMA_HISTOGRAM_ASPECT_RATIO(name, width, height) \
     UMA_HISTOGRAM_SPARSE_SLOWLY( \
         name, \
         (height) ? ((width) * 100) / (height) : kInfiniteRatio);
 
-std::unique_ptr<media::VideoCaptureJpegDecoder> CreateGpuJpegDecoder(
-    const media::VideoCaptureJpegDecoder::DecodeDoneCB& decode_done_cb) {
-  return base::MakeUnique<VideoCaptureGpuJpegDecoder>(decode_done_cb);
-}
-
-// Decorator for media::VideoFrameReceiver that forwards all incoming calls
-// to the Browser IO thread.
-class VideoFrameReceiverOnIOThread : public media::VideoFrameReceiver {
- public:
-  explicit VideoFrameReceiverOnIOThread(
-      const base::WeakPtr<VideoFrameReceiver>& receiver)
-      : receiver_(receiver) {}
-
-  void OnIncomingCapturedVideoFrame(
-      std::unique_ptr<media::VideoCaptureDevice::Client::Buffer> buffer,
-      scoped_refptr<media::VideoFrame> frame) override {
-    BrowserThread::PostTask(
-        BrowserThread::IO, FROM_HERE,
-        base::Bind(&VideoFrameReceiver::OnIncomingCapturedVideoFrame, receiver_,
-                   base::Passed(&buffer), std::move(frame)));
-  }
-
-  void OnError() override {
-    BrowserThread::PostTask(
-        BrowserThread::IO, FROM_HERE,
-        base::Bind(&VideoFrameReceiver::OnError, receiver_));
-  }
-
-  void OnLog(const std::string& message) override {
-    BrowserThread::PostTask(
-        BrowserThread::IO, FROM_HERE,
-        base::Bind(&VideoFrameReceiver::OnLog, receiver_, message));
-  }
-
-  void OnBufferDestroyed(int buffer_id_to_drop) override {
-    BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
-                            base::Bind(&VideoFrameReceiver::OnBufferDestroyed,
-                                       receiver_, buffer_id_to_drop));
-  }
-
- private:
-  base::WeakPtr<VideoFrameReceiver> receiver_;
-};
-
 }  // anonymous namespace
 
 struct VideoCaptureController::ControllerClient {
   ControllerClient(VideoCaptureControllerID id,
                    VideoCaptureControllerEventHandler* handler,
                    media::VideoCaptureSessionId session_id,
                    const media::VideoCaptureParams& params)
       : controller_id(id),
         event_handler(handler),
         session_id(session_id),
@@ skipping 30 matching lines @@
 
   // Indicates whether the client is paused, if true, VideoCaptureController
   // stops updating its buffer.
   bool paused;
 };
 
 VideoCaptureController::BufferState::BufferState(
     int buffer_id,
     int frame_feedback_id,
     media::VideoFrameConsumerFeedbackObserver* consumer_feedback_observer,
-    scoped_refptr<media::VideoCaptureBufferPool> buffer_pool,
+    media::FrameBufferHost* frame_buffer_host,
     scoped_refptr<media::VideoFrame> frame)
     : buffer_id_(buffer_id),
       frame_feedback_id_(frame_feedback_id),
       consumer_feedback_observer_(consumer_feedback_observer),
-      buffer_pool_(std::move(buffer_pool)),
+      frame_buffer_host_(frame_buffer_host),
       frame_(std::move(frame)),
       max_consumer_utilization_(
           media::VideoFrameConsumerFeedbackObserver::kNoUtilizationRecorded),
       consumer_hold_count_(0) {}
 
 VideoCaptureController::BufferState::~BufferState() = default;
 
 VideoCaptureController::BufferState::BufferState(
     const VideoCaptureController::BufferState& other) = default;
 
 void VideoCaptureController::BufferState::RecordConsumerUtilization(
     double utilization) {
   if (std::isfinite(utilization) && utilization >= 0.0) {
     max_consumer_utilization_ =
         std::max(max_consumer_utilization_, utilization);
   }
 }
 
 void VideoCaptureController::BufferState::IncreaseConsumerCount() {
   if (consumer_hold_count_ == 0)
-    buffer_pool_->HoldForConsumers(buffer_id_, 1);
+    if (frame_buffer_host_ != nullptr)
+      frame_buffer_host_->SetBufferHold(buffer_id_);
   consumer_hold_count_++;
 }
 
 void VideoCaptureController::BufferState::DecreaseConsumerCount() {
   consumer_hold_count_--;
   if (consumer_hold_count_ == 0) {
     if (consumer_feedback_observer_ != nullptr &&
         max_consumer_utilization_ !=
             media::VideoFrameConsumerFeedbackObserver::kNoUtilizationRecorded) {
       consumer_feedback_observer_->OnUtilizationReport(
           frame_feedback_id_, max_consumer_utilization_);
     }
-    buffer_pool_->RelinquishConsumerHold(buffer_id_, 1);
+    if (frame_buffer_host_ != nullptr)
+      frame_buffer_host_->ReleaseBufferHold(buffer_id_);
     max_consumer_utilization_ =
         media::VideoFrameConsumerFeedbackObserver::kNoUtilizationRecorded;
   }
 }
 
 bool VideoCaptureController::BufferState::HasZeroConsumerHoldCount() {
   return consumer_hold_count_ == 0;
 }
 
 void VideoCaptureController::BufferState::SetConsumerFeedbackObserver(
     media::VideoFrameConsumerFeedbackObserver* consumer_feedback_observer) {
   consumer_feedback_observer_ = consumer_feedback_observer;
 }
 
-VideoCaptureController::VideoCaptureController(int max_buffers)
-    : buffer_pool_(new media::VideoCaptureBufferPoolImpl(
-          base::MakeUnique<media::VideoCaptureBufferTrackerFactoryImpl>(),
-          max_buffers)),
+void VideoCaptureController::BufferState::SetFrameBufferHost(
+    media::FrameBufferHost* frame_buffer_host) {
+  frame_buffer_host_ = frame_buffer_host;
+}
+
+VideoCaptureController::VideoCaptureController()
+    : frame_buffer_host_(nullptr),
       consumer_feedback_observer_(nullptr),
       state_(VIDEO_CAPTURE_STATE_STARTED),
       has_received_frames_(false),
       weak_ptr_factory_(this) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 }
 
+VideoCaptureController::~VideoCaptureController() = default;
+
 base::WeakPtr<VideoCaptureController>
 VideoCaptureController::GetWeakPtrForIOThread() {
   return weak_ptr_factory_.GetWeakPtr();
 }
 
+void VideoCaptureController::SetFrameBufferHost(
+    std::unique_ptr<media::FrameBufferHost> frame_buffer_host) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  frame_buffer_host_ = std::move(frame_buffer_host);
+  // Update existing BufferState entries.
+  for (auto& entry : buffer_id_to_state_map_)
+    entry.second.SetFrameBufferHost(frame_buffer_host_.get());
+}
+
 void VideoCaptureController::SetConsumerFeedbackObserver(
     std::unique_ptr<media::VideoFrameConsumerFeedbackObserver>
         consumer_feedback_observer) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   consumer_feedback_observer_ = std::move(consumer_feedback_observer);
   // Update existing BufferState entries.
   for (auto& entry : buffer_id_to_state_map_)
     entry.second.SetConsumerFeedbackObserver(consumer_feedback_observer_.get());
 }
 
-std::unique_ptr<media::VideoCaptureDevice::Client>
-VideoCaptureController::NewDeviceClient() {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  return base::MakeUnique<media::VideoCaptureDeviceClient>(
-      base::MakeUnique<VideoFrameReceiverOnIOThread>(
-          this->GetWeakPtrForIOThread()),
-      buffer_pool_,
-      base::Bind(&CreateGpuJpegDecoder,
-                 base::Bind(&VideoFrameReceiver::OnIncomingCapturedVideoFrame,
-                            this->GetWeakPtrForIOThread())));
-}
-
 void VideoCaptureController::AddClient(
     VideoCaptureControllerID id,
     VideoCaptureControllerEventHandler* event_handler,
     media::VideoCaptureSessionId session_id,
     const media::VideoCaptureParams& params) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DVLOG(1) << "VideoCaptureController::AddClient() -- id=" << id
            << ", session_id=" << session_id
            << ", params.requested_format="
            << media::VideoCaptureFormat::ToString(params.requested_format);
@@ skipping 158 matching lines @@
   buffer_state.DecreaseConsumerCount();
   client->buffers_in_use.erase(buffers_in_use_entry_iter);
 }
 
 const media::VideoCaptureFormat&
 VideoCaptureController::GetVideoCaptureFormat() const {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   return video_capture_format_;
 }
 
-VideoCaptureController::~VideoCaptureController() {
-}
-
 void VideoCaptureController::OnIncomingCapturedVideoFrame(
     std::unique_ptr<media::VideoCaptureDevice::Client::Buffer> buffer,
     scoped_refptr<VideoFrame> frame) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  DCHECK(frame_buffer_host_);
   const int buffer_id = buffer->id();
   DCHECK_NE(buffer_id, media::VideoCaptureBufferPool::kInvalidId);
 
   // Insert if not exists.
   const auto it =
       buffer_id_to_state_map_
           .insert(std::make_pair(
               buffer_id, BufferState(buffer_id, buffer->frame_feedback_id(),
                                      consumer_feedback_observer_.get(),
-                                     buffer_pool_, frame)))
+                                     frame_buffer_host_.get(), frame)))
           .first;
   BufferState& buffer_state = it->second;
   DCHECK(buffer_state.HasZeroConsumerHoldCount());
 
   if (state_ == VIDEO_CAPTURE_STATE_STARTED) {
     if (!frame->metadata()->HasKey(VideoFrameMetadata::FRAME_RATE)) {
       frame->metadata()->SetDouble(VideoFrameMetadata::FRAME_RATE,
                                    video_capture_format_.frame_rate);
     }
     std::unique_ptr<base::DictionaryValue> metadata(
@@ skipping 73 matching lines @@
   }
 }
 
 void VideoCaptureController::OnLog(const std::string& message) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   MediaStreamManager::SendMessageToNativeLog("Video capture: " + message);
 }
 
 void VideoCaptureController::OnBufferDestroyed(int buffer_id_to_drop) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  DCHECK(frame_buffer_host_);
 
   for (const auto& client : controller_clients_) {
     if (client->session_closed)
       continue;
 
     auto known_buffers_entry_iter =
         std::find(std::begin(client->known_buffers),
                   std::end(client->known_buffers), buffer_id_to_drop);
     if (known_buffers_entry_iter != std::end(client->known_buffers)) {
       client->known_buffers.erase(known_buffers_entry_iter);
       client->event_handler->OnBufferDestroyed(client->controller_id,
                                                buffer_id_to_drop);
     }
   }
 
   buffer_id_to_state_map_.erase(buffer_id_to_drop);
 }
 
 void VideoCaptureController::DoNewBufferOnIOThread(
     ControllerClient* client,
     media::VideoCaptureDevice::Client::Buffer* buffer,
     const scoped_refptr<media::VideoFrame>& frame) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK_EQ(media::VideoFrame::STORAGE_SHMEM, frame->storage_type());
+  CHECK(frame_buffer_host_);
 
   const int buffer_id = buffer->id();
   mojo::ScopedSharedBufferHandle handle =
-      buffer_pool_->GetHandleForTransit(buffer_id);
+      frame_buffer_host_->GetHandleForTransit(buffer_id);
   client->event_handler->OnBufferCreated(client->controller_id,
                                          std::move(handle),
                                          buffer->mapped_size(), buffer_id);
 }
 
 VideoCaptureController::ControllerClient* VideoCaptureController::FindClient(
     VideoCaptureControllerID id,
     VideoCaptureControllerEventHandler* handler,
     const ControllerClients& clients) {
   for (const auto& client : clients) {
     if (client->controller_id == id && client->event_handler == handler)
       return client.get();
   }
   return nullptr;
 }
 
 VideoCaptureController::ControllerClient* VideoCaptureController::FindClient(
     int session_id,
     const ControllerClients& clients) {
   for (const auto& client : clients) {
     if (client->session_id == session_id)
       return client.get();
   }
   return nullptr;
 }
 
 }  // namespace content