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

content/renderer/media/media_stream_video_capture_source_unittest.cc

 // Copyright 2014 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 "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/child/child_process.h"
@@ skipping 154 matching lines @@
   message_loop_.RunUntilIdle();
   EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateEnded,
             webkit_source_.readyState());
   // Verify that MediaStreamSource::SourceStoppedCallback has been triggered.
   EXPECT_TRUE(source_stopped_);
 }
 
 class FakeMediaStreamVideoSink : public MediaStreamVideoSink {
  public:
   FakeMediaStreamVideoSink(base::TimeTicks* capture_time,
+                           base::DictionaryValue* metadata,
                            base::Closure got_frame_cb)
       : capture_time_(capture_time),
+        metadata_(metadata),
         got_frame_cb_(got_frame_cb) {
   }
 
   void OnVideoFrame(const scoped_refptr<media::VideoFrame>& frame,
-                    const media::VideoCaptureFormat& format,
                     const base::TimeTicks& capture_time) {
     *capture_time_ = capture_time;
+    metadata_->Clear();
+    metadata_->MergeDictionary(&(frame->metadata()));
     base::ResetAndReturn(&got_frame_cb_).Run();
   }
 
  private:
-  base::TimeTicks* capture_time_;
+  base::TimeTicks* const capture_time_;
+  base::DictionaryValue* const metadata_;
   base::Closure got_frame_cb_;
 };
 
-TEST_F(MediaStreamVideoCapturerSourceTest, CaptureTime) {
+TEST_F(MediaStreamVideoCapturerSourceTest, CaptureTimeAndMetadataPlumbing) {
   StreamDeviceInfo device_info;
   device_info.device.type = MEDIA_DESKTOP_VIDEO_CAPTURE;
   InitWithDeviceInfo(device_info);
 
   VideoCaptureDeliverFrameCB deliver_frame_cb;
   VideoCapturerDelegate::RunningCallback running_cb;
 
   EXPECT_CALL(mock_delegate(), StartCapture(
       testing::_,
       testing::_,
       testing::_,
       testing::_))
       .Times(1)
       .WillOnce(testing::DoAll(testing::SaveArg<1>(&deliver_frame_cb),
                                testing::SaveArg<3>(&running_cb)));
   EXPECT_CALL(mock_delegate(), StopCapture());
   blink::WebMediaStreamTrack track = StartSource();
   running_cb.Run(true);
 
   base::RunLoop run_loop;
   base::TimeTicks reference_capture_time =
       base::TimeTicks::FromInternalValue(60013);
   base::TimeTicks capture_time;
+  base::DictionaryValue metadata;
   FakeMediaStreamVideoSink fake_sink(
       &capture_time,
+      &metadata,
       media::BindToCurrentLoop(run_loop.QuitClosure()));
   FakeMediaStreamVideoSink::AddToVideoTrack(
       &fake_sink,
       base::Bind(&FakeMediaStreamVideoSink::OnVideoFrame,
                  base::Unretained(&fake_sink)),
       track);
+  const scoped_refptr<media::VideoFrame> frame =
+      media::VideoFrame::CreateBlackFrame(gfx::Size(2, 2));
+  frame->metadata().SetString("foo", "bar");
   child_process_->io_message_loop()->PostTask(
-      FROM_HERE,
-      base::Bind(deliver_frame_cb,
-                 media::VideoFrame::CreateBlackFrame(gfx::Size(2, 2)),
-                 media::VideoCaptureFormat(),
-                 reference_capture_time));
+      FROM_HERE, base::Bind(deliver_frame_cb, frame, reference_capture_time));
   run_loop.Run();
   FakeMediaStreamVideoSink::RemoveFromVideoTrack(&fake_sink, track);
   EXPECT_EQ(reference_capture_time, capture_time);
+  std::string metadata_value;
+  EXPECT_TRUE(metadata.GetString("foo", &metadata_value));
+  EXPECT_EQ(std::string("bar"), metadata_value);
 }
 
 }  // namespace content