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

content/browser/renderer_host/media/video_capture_host.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.
 //
 // VideoCaptureHost serves video capture related messages from
 // VideoCaptureMessageFilter which lives inside the render process.
 //
 // This class is owned by RenderProcessHostImpl, and instantiated on UI
 // thread, but all other operations and method calls happen on IO thread.
 //
@@ skipping 67 matching lines @@
   // VideoCaptureControllerEventHandler implementation.
   void OnError(const VideoCaptureControllerID& id) override;
   void OnBufferCreated(const VideoCaptureControllerID& id,
                        base::SharedMemoryHandle handle,
                        int length,
                        int buffer_id) override;
   void OnBufferDestroyed(const VideoCaptureControllerID& id,
                          int buffer_id) override;
   void OnBufferReady(const VideoCaptureControllerID& id,
                      int buffer_id,
-                     const media::VideoCaptureFormat& format,
+                     const gfx::Size& coded_size,
                      const gfx::Rect& visible_rect,
-                     base::TimeTicks timestamp) override;
-  void OnMailboxBufferReady(const VideoCaptureControllerID& id,
-                            int buffer_id,
-                            const gpu::MailboxHolder& mailbox_holder,
-                            const media::VideoCaptureFormat& format,
-                            base::TimeTicks timestamp) override;
+                     base::TimeTicks timestamp,
+                     scoped_ptr<base::DictionaryValue> metadata) override;
+  void OnMailboxBufferReady(
+      const VideoCaptureControllerID& id,
+      int buffer_id,
+      const gpu::MailboxHolder& mailbox_holder,
+      const gfx::Size& packed_frame_size,
+      base::TimeTicks timestamp,
+      scoped_ptr<base::DictionaryValue> metadata) override;
   void OnEnded(const VideoCaptureControllerID& id) override;
 
  private:
   friend class BrowserThread;
   friend class base::DeleteHelper<VideoCaptureHost>;
   friend class MockVideoCaptureHost;
   friend class VideoCaptureHostTest;
 
   ~VideoCaptureHost() override;
 
@@ skipping 46 matching lines @@
       int buffer_id);
 
   void DoSendFreeBufferOnIOThread(
       const VideoCaptureControllerID& controller_id,
       int buffer_id);
 
   // Sends a filled buffer to the VideoCaptureMessageFilter.
   void DoSendFilledBufferOnIOThread(
       const VideoCaptureControllerID& controller_id,
       int buffer_id,
-      const media::VideoCaptureFormat& format,
+      const gfx::Size& coded_size,
       const gfx::Rect& visible_rect,
-      base::TimeTicks timestamp);
+      base::TimeTicks timestamp,
+      scoped_ptr<base::DictionaryValue> metadata);
 
   // Sends a filled texture mailbox buffer to the VideoCaptureMessageFilter.
   void DoSendFilledMailboxBufferOnIOThread(
       const VideoCaptureControllerID& controller_id,
       int buffer_id,
       const gpu::MailboxHolder& mailbox_holder,
-      const media::VideoCaptureFormat& format,
-      base::TimeTicks timestamp);
+      const gfx::Size& packed_frame_size,
+      base::TimeTicks timestamp,
+      scoped_ptr<base::DictionaryValue> metadata);
 
   // Handles error coming from VideoCaptureDevice.
   void DoHandleErrorOnIOThread(const VideoCaptureControllerID& controller_id);
 
   void DoEndedOnIOThread(const VideoCaptureControllerID& controller_id);
 
   // Deletes the controller and notifies the VideoCaptureManager. |on_error| is
   // true if this is triggered by VideoCaptureControllerEventHandler::OnError.
   void DeleteVideoCaptureControllerOnIOThread(
       const VideoCaptureControllerID& controller_id, bool on_error);
 
   MediaStreamManager* media_stream_manager_;
 
   typedef std::map<VideoCaptureControllerID,
                    base::WeakPtr<VideoCaptureController> > EntryMap;
 
   // A map of VideoCaptureControllerID to the VideoCaptureController to which it
   // is connected. An entry in this map holds a null controller while it is in
   // the process of starting.
   EntryMap entries_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoCaptureHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_HOST_H_