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

content/renderer/media/video_capture_impl.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.
 
 // VideoCaptureImpl represents a capture device in renderer process. It provides
 // interfaces for clients to Start/Stop capture. It also communicates to clients
 // when buffer is ready, state of capture device is changed.
 
 // VideoCaptureImpl is also a delegate of VideoCaptureMessageFilter which relays
 // operation of a capture device to the browser process and receives responses
@@ skipping 95 matching lines @@
     VideoCaptureDeliverFrameCB deliver_frame_cb;
   };
   typedef std::map<int, ClientInfo> ClientInfoMap;
 
   // VideoCaptureMessageFilter::Delegate interface.
   void OnBufferCreated(base::SharedMemoryHandle handle,
                        int length,
                        int buffer_id) override;
   void OnBufferDestroyed(int buffer_id) override;
   void OnBufferReceived(int buffer_id,
-                        const media::VideoCaptureFormat& format,
+                        const gfx::Size& coded_size,
                         const gfx::Rect& visible_rect,
-                        base::TimeTicks) override;
+                        base::TimeTicks timestamp,
+                        const base::DictionaryValue& metadata) override;
   void OnMailboxBufferReceived(int buffer_id,
                                const gpu::MailboxHolder& mailbox_holder,
-                               const media::VideoCaptureFormat& format,
-                               base::TimeTicks timestamp) override;
+                               const gfx::Size& packed_frame_size,
+                               base::TimeTicks timestamp,
+                               const base::DictionaryValue& metadata) override;
   void OnStateChanged(VideoCaptureState state) override;
   void OnDeviceSupportedFormatsEnumerated(
       const media::VideoCaptureFormats& supported_formats) override;
   void OnDeviceFormatsInUseReceived(
       const media::VideoCaptureFormats& formats_in_use) override;
   void OnDelegateAdded(int32 device_id) override;
 
   // Sends an IPC message to browser process when all clients are done with the
   // buffer.
   void OnClientBufferFinished(int buffer_id,
@@ skipping 25 matching lines @@
   ClientBufferMap client_buffers_;
 
   ClientInfoMap clients_;
   ClientInfoMap clients_pending_on_filter_;
   ClientInfoMap clients_pending_on_restart_;
 
   // Member params_ represents the video format requested by the
   // client to this class via StartCapture().
   media::VideoCaptureParams params_;
 
-  // The device's video capture format sent from browser process side.
-  media::VideoCaptureFormat last_frame_format_;
-
   // The device's first captured frame timestamp sent from browser process side.
   base::TimeTicks first_frame_timestamp_;
 
   bool suspended_;
   VideoCaptureState state_;
 
   // |weak_factory_| and |thread_checker_| are bound to the IO thread.
   base::ThreadChecker thread_checker_;
 
   // WeakPtrFactory pointing back to |this| object, for use with
   // media::VideoFrames constructed in OnBufferReceived() from buffers cached
   // in |client_buffers_|.
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<VideoCaptureImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoCaptureImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_IMPL_H_