Define EncodedVideoSource and RtcCapturedEncodingVideoCapturer.

content/renderer/media/video_capture_message_filter.h

Index: content/renderer/media/video_capture_message_filter.h
diff --git a/content/renderer/media/video_capture_message_filter.h b/content/renderer/media/video_capture_message_filter.h
index 1418208e35e773fa5120c566d84dd66fab4e0817..aa861d3158f3e3afe75bb7c41ac6cbf12a9a5205 100644
--- a/content/renderer/media/video_capture_message_filter.h
+++ b/content/renderer/media/video_capture_message_filter.h
@@ -16,15 +16,19 @@
 #include "base/shared_memory.h"
 #include "content/common/content_export.h"
 #include "content/common/media/video_capture.h"
+#include "content/renderer/media/encoding_video_capture_message_filter.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "media/video/capture/video_capture.h"
+#include "media/video/encoded_video_source.h"
 
 namespace content {
 
 class CONTENT_EXPORT VideoCaptureMessageFilter
-    : public IPC::ChannelProxy::MessageFilter {
+    : public EncodingVideoCaptureMessageFilter,

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

This is a logical reversal; it implies that all VCMF's expect to handle EVS's
messages, even though while all EVS's are related to a VC, it's not true that
all VC's are related to an EVS.

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

I agree it is wrong. I think it is really not necessary to have this separate
EncodingVideoCaptureMessageFilter interface; just move the encoded message
handling here.

+      public IPC::ChannelProxy::MessageFilter {
  public:
-  class CONTENT_EXPORT Delegate {
+  class CONTENT_EXPORT Delegate :
+      public EncodingVideoCaptureMessageFilter::Delegate {
    public:
     // Called when a video frame buffer is created in the browser process.
     virtual void OnBufferCreated(base::SharedMemoryHandle handle,
@@ -70,12 +74,18 @@ class CONTENT_EXPORT VideoCaptureMessageFilter
  protected:
   virtual ~VideoCaptureMessageFilter();
 
+  virtual EncodingVideoCaptureMessageFilter::Delegate* delegate(int device_id)
+      OVERRIDE;
+  // A map of device ids to delegates.
+  typedef std::map<int32, Delegate*> Delegates;
+  Delegates delegates_;
+  Delegates pending_delegates_;
+  int32 last_device_id_;

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

Why are l.79-83 not private?

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

Now that I've gotten rid of the encoded VC message filter, I'm restoring this to
the way it used to be.

+
  private:
   FRIEND_TEST_ALL_PREFIXES(VideoCaptureMessageFilterTest, Basic);
   FRIEND_TEST_ALL_PREFIXES(VideoCaptureMessageFilterTest, Delegates);
 
-  typedef std::map<int32, Delegate*> Delegates;
-
   // Receive a newly created buffer from browser process.
   void OnBufferCreated(int device_id,
                        base::SharedMemoryHandle handle,
@@ -92,11 +102,6 @@ class CONTENT_EXPORT VideoCaptureMessageFilter
   void OnDeviceInfoReceived(int device_id,
                             const media::VideoCaptureParams& params);
 
-  // A map of device ids to delegates.
-  Delegates delegates_;
-  Delegates pending_delegates_;
-  int32 last_device_id_;
-
   IPC::Channel* channel_;
 
   scoped_refptr<base::MessageLoopProxy> message_loop_proxy_;