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

content/browser/renderer_host/media/video_capture_host.cc

 // 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.
 
 #include "content/browser/renderer_host/media/video_capture_host.h"
 
 #include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/browser_main_loop.h"
 #include "content/browser/renderer_host/media/media_stream_manager.h"
 #include "content/browser/renderer_host/media/video_capture_manager.h"
 #include "content/common/media/video_capture_messages.h"
 
 namespace content {
 
 VideoCaptureHost::VideoCaptureHost(MediaStreamManager* media_stream_manager)
     : BrowserMessageFilter(VideoCaptureMsgStart),
@@ skipping 51 matching lines @@
     int buffer_id) {
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&VideoCaptureHost::DoSendFreeBufferOnIOThread,
                  this, controller_id, buffer_id));
 }
 
 void VideoCaptureHost::OnBufferReady(
     const VideoCaptureControllerID& controller_id,
     int buffer_id,
-    const media::VideoCaptureFormat& frame_format,
+    const gfx::Size& coded_size,
     const gfx::Rect& visible_rect,
-    base::TimeTicks timestamp) {
+    base::TimeTicks timestamp,
+    scoped_ptr<base::DictionaryValue> metadata) {
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(&VideoCaptureHost::DoSendFilledBufferOnIOThread,
                  this,
                  controller_id,
                  buffer_id,
-                 frame_format,
+                 coded_size,
                  visible_rect,
-                 timestamp));
+                 timestamp,
+                 base::Passed(&metadata)));
 }
 
 void VideoCaptureHost::OnMailboxBufferReady(
     const VideoCaptureControllerID& controller_id,
     int buffer_id,
     const gpu::MailboxHolder& mailbox_holder,
-    const media::VideoCaptureFormat& frame_format,
-    base::TimeTicks timestamp) {
+    const gfx::Size& packed_frame_size,
+    base::TimeTicks timestamp,
+    scoped_ptr<base::DictionaryValue> metadata) {
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(&VideoCaptureHost::DoSendFilledMailboxBufferOnIOThread,
                  this,
                  controller_id,
                  buffer_id,
                  mailbox_holder,
-                 frame_format,
-                 timestamp));
+                 packed_frame_size,
+                 timestamp,
+                 base::Passed(&metadata)));
 }
 
 void VideoCaptureHost::OnEnded(const VideoCaptureControllerID& controller_id) {
   DVLOG(1) << "VideoCaptureHost::OnEnded";
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&VideoCaptureHost::DoEndedOnIOThread, this, controller_id));
 }
 
 void VideoCaptureHost::DoSendNewBufferOnIOThread(
@@ skipping 17 matching lines @@
 
   if (entries_.find(controller_id) == entries_.end())
     return;
 
   Send(new VideoCaptureMsg_FreeBuffer(controller_id.device_id, buffer_id));
 }
 
 void VideoCaptureHost::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) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   if (entries_.find(controller_id) == entries_.end())
     return;
 
-  Send(new VideoCaptureMsg_BufferReady(
-      controller_id.device_id, buffer_id, format, visible_rect, timestamp));
+  VideoCaptureMsg_BufferReady_Params params;
+  params.device_id = controller_id.device_id;
+  params.buffer_id = buffer_id;
+  params.coded_size = coded_size;
+  params.visible_rect = visible_rect;
+  params.timestamp = timestamp;
+  if (metadata)
+    params.metadata.Swap(metadata.get());
+  Send(new VideoCaptureMsg_BufferReady(params));
 }
 
 void VideoCaptureHost::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) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   if (entries_.find(controller_id) == entries_.end())
     return;
 
-  Send(new VideoCaptureMsg_MailboxBufferReady(
-      controller_id.device_id, buffer_id, mailbox_holder, format, timestamp));
+  VideoCaptureMsg_MailboxBufferReady_Params params;
+  params.device_id = controller_id.device_id;
+  params.buffer_id = buffer_id;
+  params.mailbox_holder = mailbox_holder;
+  params.packed_frame_size = packed_frame_size;
+  params.timestamp = timestamp;
+  if (metadata)
+    params.metadata.Swap(metadata.get());
+  Send(new VideoCaptureMsg_MailboxBufferReady(params));
 }
 
 void VideoCaptureHost::DoHandleErrorOnIOThread(
     const VideoCaptureControllerID& controller_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   if (entries_.find(controller_id) == entries_.end())
     return;
 
   Send(new VideoCaptureMsg_StateChanged(controller_id.device_id,
@@ skipping 201 matching lines @@
     return;
 
   if (it->second) {
     media_stream_manager_->video_capture_manager()->StopCaptureForClient(
         it->second.get(), controller_id, this, on_error);
   }
   entries_.erase(it);
 }
 
 }  // namespace content