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

content/renderer/media/video_capture_message_filter.h

 // 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.
 //
 // MessageFilter that handles video capture messages and delegates them to
 // video captures. VideoCaptureMessageFilter is operated on IO thread of
 // render process. It intercepts video capture messages and process them on
 // IO thread since these messages are time critical.
 
 #ifndef CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_MESSAGE_FILTER_H_
 #define CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_MESSAGE_FILTER_H_
 
 #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
 
 namespace content {
 
 class CONTENT_EXPORT VideoCaptureMessageFilter : public IPC::MessageFilter {
  public:
   class CONTENT_EXPORT Delegate {
    public:
     // Called when a video frame buffer is created in the browser process.
     virtual void OnBufferCreated(base::SharedMemoryHandle handle,
                                  int length,
                                  int buffer_id) = 0;
 
     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.
     virtual void OnStateChanged(VideoCaptureState state) = 0;
 
     // Called upon reception of device's supported formats back from browser.
     virtual void OnDeviceSupportedFormatsEnumerated(
         const media::VideoCaptureFormats& supported_formats) = 0;
 
     // Called upon reception of format(s) in use by a device back from browser.
@@ skipping 35 matching lines @@
   void OnBufferCreated(int device_id,
                        base::SharedMemoryHandle handle,
                        int length,
                        int buffer_id);
 
   // Release a buffer received by OnBufferCreated.
   void OnBufferDestroyed(int device_id,
                          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);
 
   // Receive a device's supported formats back from browser process.
   void OnDeviceSupportedFormatsEnumerated(
       int device_id,
       const media::VideoCaptureFormats& supported_formats);
 
   // Receive the formats in-use by a device back from browser process.
@@ skipping 10 matching lines @@
   int32 last_device_id_;
 
   IPC::Sender* sender_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoCaptureMessageFilter);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_MESSAGE_FILTER_H_