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

content/common/media/video_capture_messages.h

Index: content/common/media/video_capture_messages.h
diff --git a/content/common/media/video_capture_messages.h b/content/common/media/video_capture_messages.h
index bebe487a6caa5652f5adb9b1aec64ac6634f1a29..77f95bfd5178e115cdc500eb488a08d3d8147f76 100644
--- a/content/common/media/video_capture_messages.h
+++ b/content/common/media/video_capture_messages.h
@@ -25,6 +25,24 @@ IPC_STRUCT_TRAITS_BEGIN(media::VideoCaptureParams)
   IPC_STRUCT_TRAITS_MEMBER(resolution_change_policy)
 IPC_STRUCT_TRAITS_END()
 
+IPC_STRUCT_BEGIN(VideoCaptureMsg_BufferReady_Params)
+  IPC_STRUCT_MEMBER(int, device_id)
+  IPC_STRUCT_MEMBER(int, buffer_id)
+  IPC_STRUCT_MEMBER(gfx::Size, coded_size)
+  IPC_STRUCT_MEMBER(gfx::Rect, visible_rect)
+  IPC_STRUCT_MEMBER(base::TimeTicks, timestamp)
+  IPC_STRUCT_MEMBER(base::DictionaryValue, metadata)
+IPC_STRUCT_END()
+
+IPC_STRUCT_BEGIN(VideoCaptureMsg_MailboxBufferReady_Params)
+  IPC_STRUCT_MEMBER(int, device_id)
+  IPC_STRUCT_MEMBER(int, buffer_id)
+  IPC_STRUCT_MEMBER(gpu::MailboxHolder, mailbox_holder)
+  IPC_STRUCT_MEMBER(gfx::Size, packed_frame_size)
+  IPC_STRUCT_MEMBER(base::TimeTicks, timestamp)
+  IPC_STRUCT_MEMBER(base::DictionaryValue, metadata)
+IPC_STRUCT_END()
+
 // TODO(nick): device_id in these messages is basically just a route_id. We
 // should shift to IPC_MESSAGE_ROUTED and use MessageRouter in the filter impls.
 
@@ -48,21 +66,13 @@ IPC_MESSAGE_CONTROL2(VideoCaptureMsg_FreeBuffer,
                      int /* buffer_id */)
 
 // Tell the renderer process that a buffer is available from video capture.
-IPC_MESSAGE_CONTROL5(VideoCaptureMsg_BufferReady,
-                     int /* device id */,
-                     int /* buffer_id */,
-                     media::VideoCaptureFormat /* format */,
-                     gfx::Rect /* visible_rect */,
-                     base::TimeTicks /* timestamp */)
+IPC_MESSAGE_CONTROL1(VideoCaptureMsg_BufferReady,
+                     VideoCaptureMsg_BufferReady_Params)
 
 // Tell the renderer process that a texture mailbox buffer is available from
 // video capture.
-IPC_MESSAGE_CONTROL5(VideoCaptureMsg_MailboxBufferReady,
-                     int /* device_id */,
-                     int /* buffer_id */,
-                     gpu::MailboxHolder /* mailbox_holder */,
-                     media::VideoCaptureFormat /* format */,
-                     base::TimeTicks /* timestamp */)
+IPC_MESSAGE_CONTROL1(VideoCaptureMsg_MailboxBufferReady,
+                     VideoCaptureMsg_MailboxBufferReady_Params)
 
 // Notify the renderer about a device's supported formats; this is a response
 // to a VideoCaptureHostMsg_GetDeviceSupportedFormats request.