Add metadata to media::VideoFrame and plumb it through IPC/MediaStream.

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 311bcbad3addb66b26115c7fc3a920e6c93608ac..31712373fd73d1adeae251556cfa4e4cf4ecbb35 100644
--- a/content/renderer/media/video_capture_message_filter.h
+++ b/content/renderer/media/video_capture_message_filter.h
@@ -13,11 +13,15 @@
 #include <map>
 
 #include "base/memory/shared_memory.h"
+#include "base/values.h"
 #include "content/common/content_export.h"
 #include "content/common/media/video_capture.h"
 #include "ipc/message_filter.h"
 #include "media/base/video_capture_types.h"
 
+struct VideoCaptureMsg_BufferReady_Params;
+struct VideoCaptureMsg_MailboxBufferReady_Params;
+
 namespace gpu {
 struct MailboxHolder;
 }  // namespace gpu
@@ -36,17 +40,20 @@ class CONTENT_EXPORT VideoCaptureMessageFilter : public IPC::MessageFilter {
     virtual void OnBufferDestroyed(int buffer_id) = 0;
 
     // Called when a video frame buffer is received from the browser process.
-    virtual void OnBufferReceived(int buffer_id,
-                                  const media::VideoCaptureFormat& format,
-                                  const gfx::Rect& visible_rect,
-                                  base::TimeTicks timestamp) = 0;
+    virtual void OnBufferReceived(
+        int buffer_id,
+        const gfx::Size& coded_size,
+        const gfx::Rect& visible_rect,
+        base::TimeTicks timestamp,
+        const base::DictionaryValue& metadata) = 0;
 
     // Called when a video mailbox buffer is received from the browser process.
     virtual void OnMailboxBufferReceived(
         int buffer_id,
         const gpu::MailboxHolder& mailbox_holder,
-        const media::VideoCaptureFormat& format,
-        base::TimeTicks timestamp) = 0;
+        const gfx::Size& packed_frame_size,
+        base::TimeTicks timestamp,
+        const base::DictionaryValue& metadata) = 0;
 
     // Called when state of a video capture device has changed in the browser
     // process.
@@ -102,18 +109,11 @@ class CONTENT_EXPORT VideoCaptureMessageFilter : public IPC::MessageFilter {
                          int buffer_id);
 
   // Receive a filled buffer from browser process.
-  void OnBufferReceived(int device_id,
-                        int buffer_id,
-                        const media::VideoCaptureFormat& format,
-                        const gfx::Rect& visible_rect,
-                        base::TimeTicks timestamp);
+  void OnBufferReceived(const VideoCaptureMsg_BufferReady_Params& params);
 
   // Receive a filled texture mailbox buffer from browser process.
-  void OnMailboxBufferReceived(int device_id,
-                               int buffer_id,
-                               const gpu::MailboxHolder& mailbox_holder,
-                               const media::VideoCaptureFormat& format,
-                               base::TimeTicks timestamp);
+  void OnMailboxBufferReceived(
+      const VideoCaptureMsg_MailboxBufferReady_Params& params);
 
   // State of browser process' video capture device has changed.
   void OnDeviceStateChanged(int device_id, VideoCaptureState state);