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

content/browser/media/capture/web_contents_video_capture_device_unittest.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/media/capture/web_contents_video_capture_device.h"
 
 #include "base/bind_helpers.h"
 #include "base/debug/debugger.h"
 #include "base/run_loop.h"
 #include "base/test/test_timeouts.h"
@@ skipping 325 matching lines @@
       return NULL;
     void* data;
     size_t size;
     buffer_pool_->GetBufferInfo(buffer_id, &data, &size);
     return scoped_refptr<media::VideoCaptureDevice::Client::Buffer>(
         new AutoReleaseBuffer(buffer_pool_, buffer_id, data, size));
   }
 
   void OnIncomingCapturedVideoFrame(
       const scoped_refptr<Buffer>& buffer,
-      const media::VideoCaptureFormat& buffer_format,
       const scoped_refptr<media::VideoFrame>& frame,
       const base::TimeTicks& timestamp) override {
-    EXPECT_EQ(gfx::Size(kTestWidth, kTestHeight), buffer_format.frame_size);
-    EXPECT_EQ(media::PIXEL_FORMAT_I420, buffer_format.pixel_format);
+    EXPECT_EQ(gfx::Size(kTestWidth, kTestHeight), frame->visible_rect().size());
     EXPECT_EQ(media::VideoFrame::I420, frame->format());
+    double frame_rate = 0;
+    EXPECT_TRUE(
+        frame->metadata()->GetDouble(media::VideoFrameMetadata::FRAME_RATE,
+                                     &frame_rate));
+    EXPECT_EQ(kTestFramesPerSecond, frame_rate);
     uint8 yuv[3];
     for (int plane = 0; plane < 3; ++plane)
-      yuv[plane] = frame->data(plane)[0];
+      yuv[plane] = frame->visible_data(plane)[0];
     // TODO(nick): We just look at the first pixel presently, because if
     // the analysis is too slow, the backlog of frames will grow without bound
     // and trouble erupts. http://crbug.com/174519
     color_callback_.Run((SkColorSetRGB(yuv[0], yuv[1], yuv[2])));
   }
 
   void OnError(const std::string& reason) override { error_callback_.Run(); }
 
  private:
   class AutoReleaseBuffer : public media::VideoCaptureDevice::Client::Buffer {
@@ skipping 489 matching lines @@
   source()->SetSolidColor(SK_ColorGREEN);
   ASSERT_NO_FATAL_FAILURE(client_observer()->WaitForNextColor(SK_ColorGREEN));
   source()->SetSolidColor(SK_ColorRED);
   ASSERT_NO_FATAL_FAILURE(client_observer()->WaitForNextColor(SK_ColorRED));
 
   device()->StopAndDeAllocate();
 }
 
 }  // namespace
 }  // namespace content