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

media/base/video_frame.h

Index: media/base/video_frame.h
diff --git a/media/base/video_frame.h b/media/base/video_frame.h
index 366a356735ab9ab1e8c57039321d779202005022..21e24efb899f43e5946a4ad85a6d4d98a070ec5e 100644
--- a/media/base/video_frame.h
+++ b/media/base/video_frame.h
@@ -12,6 +12,7 @@
 #include "base/memory/shared_memory.h"
 #include "base/synchronization/lock.h"
 #include "media/base/buffers.h"
+#include "media/base/video_frame_metadata.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 
@@ -288,6 +289,15 @@ class MEDIA_EXPORT VideoFrame : public base::RefCountedThreadSafe<VideoFrame> {
   // Returns the offset into the shared memory where the frame data begins.
   size_t shared_memory_offset() const;
 
+  // Returns a dictionary of optional metadata.  This contains information
+  // associated with the frame that downstream clients might use for frame-level
+  // logging, quality/performance optimizations, signaling, etc.
+  //
+  // TODO(miu): Move some of the "extra" members of VideoFrame (below) into
+  // here as a later clean-up step.
+  const VideoFrameMetadata& metadata() const { return metadata_; }
+  VideoFrameMetadata& metadata() { return metadata_; }

[DaleCurtis, 2015/03/02 23:23:28]

We don't typically return non-const refs. Use a pointer?

[miu, 2015/03/03 04:31:05]

Oh, that's right.  Done.

+
   bool allow_overlay() const { return allow_overlay_; }
 
 #if defined(OS_POSIX)
@@ -403,6 +413,8 @@ class MEDIA_EXPORT VideoFrame : public base::RefCountedThreadSafe<VideoFrame> {
 
   const bool end_of_stream_;
 
+  VideoFrameMetadata metadata_;
+
   bool allow_overlay_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(VideoFrame);