Modifying video_frame.cc to copy all metadata values, instead of only END_OF_STREAM, and updating u…

media/base/video_frame.cc

Index: media/base/video_frame.cc
diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc
index 4dedd82d10b20633d091bd24aebd31b203c32719..a1c88a781626f901bd1eb84015bf914fe7421982 100644
--- a/media/base/video_frame.cc
+++ b/media/base/video_frame.cc
@@ -516,10 +516,11 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame(
   scoped_refptr<VideoFrame> wrapping_frame(new VideoFrame(
       frame->format(), frame->storage_type(), frame->coded_size(), visible_rect,
       natural_size, frame->timestamp()));
-  if (frame->metadata()->IsTrue(VideoFrameMetadata::END_OF_STREAM)) {
-    wrapping_frame->metadata()->SetBoolean(VideoFrameMetadata::END_OF_STREAM,
-                                          true);
-  }
+
+  // Copy all metada to the wrapped frame

[watk, 2016/03/02 21:25:16]

s/metada/metadata

Full stop/period at the end of the comment.
(https://google.github.io/styleguide/cppguide.html#Punctuation,_Spelling_and_G...)

[tguilbert, 2016/03/03 21:42:04]

Done.

+  base::DictionaryValue temp_metadata_values;
+  frame->metadata()->MergeInternalValuesInto(&temp_metadata_values);
+  wrapping_frame->metadata()->MergeInternalValuesFrom(temp_metadata_values);

[watk, 2016/03/02 21:25:16]

WDYT about adding a VideoFrameMetadata::MergeMetadataFrom?

[tguilbert, 2016/03/03 21:42:04]

I am fine with the idea. Should I pro-actively modify files that used the
serialization/de-serialization elsewhere in the codebase to use this new method?

[watk, 2016/03/03 22:54:33]

Nice, I think a follow up CL to clean those up makes sense.

 
   for (size_t i = 0; i < NumPlanes(frame->format()); ++i) {
     wrapping_frame->strides_[i] = frame->stride(i);