Define EncodedVideoSource and RtcCapturedEncodingVideoCapturer.

content/renderer/media/video_capture_impl.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/renderer/media/video_capture_impl.h"
 
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "content/common/child_process.h"
 #include "content/common/media/video_capture_messages.h"
@@ skipping 40 matching lines @@
     base::MessageLoopProxy* capture_message_loop_proxy,
     VideoCaptureMessageFilter* filter)
     : VideoCapture(),
       message_filter_(filter),
       capture_message_loop_proxy_(capture_message_loop_proxy),
       io_message_loop_proxy_(ChildProcess::current()->io_message_loop_proxy()),
       device_id_(0),
       video_type_(media::VideoCaptureCapability::kI420),
       device_info_available_(false),
       suspended_(false),
+      encoding_supported_(false),
       state_(VIDEO_CAPTURE_STATE_STOPPED) {
   DCHECK(filter);
   memset(&current_params_, 0, sizeof(current_params_));
   memset(&device_info_, 0, sizeof(device_info_));
   current_params_.session_id = id;
 }
 
 VideoCaptureImpl::~VideoCaptureImpl() {
   STLDeleteValues(&cached_dibs_);
 }
@@ skipping 23 matching lines @@
       base::Bind(&VideoCaptureImpl::DoStartCaptureOnCaptureThread,
                  base::Unretained(this), handler, capability));
 }
 
 void VideoCaptureImpl::StopCapture(media::VideoCapture::EventHandler* handler) {
   capture_message_loop_proxy_->PostTask(FROM_HERE,
       base::Bind(&VideoCaptureImpl::DoStopCaptureOnCaptureThread,
                  base::Unretained(this), handler));
 }
 
+media::EncodedVideoSource* VideoCaptureImpl::GetEncodedVideoSource() {
+  return this;

[Ami GONE FROM CHROMIUM, 2013/06/08 00:18:01]

shouldn't this be conditionalized on encoding_supported_?
Further, I don't see where encoding_supported_ is set to anything but false; is
that supposed to be a flag?

[hshi1, 2013/06/11 19:51:22]

Got rid of this.

+}
+
+void VideoCaptureImpl::OnCapabilityAvailable(
+    const media::VideoEncodingCapability& capability) {
+  CapturedEncodedVideoSourceImpl::OnCapabilityAvailable(capability);

[Ami GONE FROM CHROMIUM, 2013/06/08 00:18:01]

having to write l.109-139 is usually a code smell of over-inheritance.  Is it
required?  Why?

[hshi1, 2013/06/11 19:51:22]

I've flattened the VCImpl - CapturedEncodedVideoCaptureImpl hierarchy, and hence
got rid of this extra level of indirection.

+}
+
+void VideoCaptureImpl::OnBitstreamCreated(
+    int stream_id,
+    const media::VideoEncodingParameters& params,
+    const std::map<int, base::SharedMemoryHandle>& buffers) {
+  CapturedEncodedVideoSourceImpl::OnBitstreamCreated(
+      stream_id, params, buffers);
+}
+
+void VideoCaptureImpl::OnBitstreamDestroyed(int stream_id) {
+  CapturedEncodedVideoSourceImpl::OnBitstreamDestroyed(stream_id);
+}
+
+void VideoCaptureImpl::OnBitstreamConfigChanged(
+      int stream_id,
+      const media::RuntimeVideoEncodingParameters& params) {
+  CapturedEncodedVideoSourceImpl::OnBitstreamConfigChanged(stream_id, params);
+}
+
+void VideoCaptureImpl::OnBitstreamReady(
+    int stream_id,
+    int buffer_id,
+    size_t size,
+    const media::BufferEncodingMetadata& metadata) {
+  CapturedEncodedVideoSourceImpl::OnBitstreamReady(
+      stream_id, buffer_id, size, metadata);
+}
+
+int VideoCaptureImpl::device_id() {
+  return device_id_;
+}
+
+scoped_refptr<base::MessageLoopProxy> VideoCaptureImpl::app_loop_proxy() {
+  return capture_message_loop_proxy_;
+}
+
+scoped_refptr<base::MessageLoopProxy> VideoCaptureImpl::io_loop_proxy() {
+  return io_message_loop_proxy_;
+}
+
 void VideoCaptureImpl::FeedBuffer(scoped_refptr<VideoFrameBuffer> buffer) {
   capture_message_loop_proxy_->PostTask(FROM_HERE,
       base::Bind(&VideoCaptureImpl::DoFeedBufferOnCaptureThread,
                  base::Unretained(this), buffer));
 }
 
 void VideoCaptureImpl::OnBufferCreated(
     base::SharedMemoryHandle handle,
     int length, int buffer_id) {
   capture_message_loop_proxy_->PostTask(FROM_HERE,
@@ skipping 185 matching lines @@
     it->first->OnBufferReady(this, buffer);
   }
   cached_dibs_[buffer_id]->references = clients_.size();
 }
 
 void VideoCaptureImpl::DoStateChangedOnCaptureThread(VideoCaptureState state) {
   DCHECK(capture_message_loop_proxy_->BelongsToCurrentThread());
 
   switch (state) {
     case VIDEO_CAPTURE_STATE_STARTED:
+      CapturedEncodedVideoSourceImpl::StartFetchCapabilities();

[Ami GONE FROM CHROMIUM, 2013/06/08 00:18:01]

why "CapturedEncodedVideoSourceImpl::"?

[hshi1, 2013/06/11 19:51:22]

No longer needed.

       break;
     case VIDEO_CAPTURE_STATE_STOPPED:
       state_ = VIDEO_CAPTURE_STATE_STOPPED;
       DVLOG(1) << "OnStateChanged: stopped!, device_id = " << device_id_;
       STLDeleteValues(&cached_dibs_);
       if (!clients_.empty() || !clients_pending_on_restart_.empty())
         RestartCapture();
       break;
     case VIDEO_CAPTURE_STATE_PAUSED:
       for (ClientInfo::iterator it = clients_.begin();
@@ skipping 142 matching lines @@
   if (it != clients->end()) {
     handler->OnStopped(this);
     handler->OnRemoved(this);
     clients->erase(it);
     found = true;
   }
   return found;
 }
 
 }  // namespace content