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

media/base/video_frame_metadata.cc

 // Copyright 2015 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 "media/base/video_frame_metadata.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "base/logging.h"
@@ skipping 127 matching lines @@
 void VideoFrameMetadata::MergeInternalValuesInto(
     base::DictionaryValue* out) const {
   out->MergeDictionary(&dictionary_);
 }
 
 void VideoFrameMetadata::MergeInternalValuesFrom(
     const base::DictionaryValue& in) {
   dictionary_.MergeDictionary(&in);
 }
 
+void VideoFrameMetadata::MergeMetadataFrom(

[DaleCurtis, 2016/03/03 21:44:51]

After this lands there are a few places you can cleanup too:

https://code.google.com/p/chromium/codesearch#search/&q=base::DictionaryValue...

(not all of those are valid, but some are)

[tguilbert, 2016/03/03 23:40:28]

Will do!

+    const VideoFrameMetadata* metadata_source) {
+  base::DictionaryValue temp_metadata_values;
+  metadata_source->MergeInternalValuesInto(&temp_metadata_values);
+  MergeInternalValuesFrom(temp_metadata_values);

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

I think you can simplify this to:

dictionary_.MergeDictionary(&metadata_source->dictionary_);

[tguilbert, 2016/03/03 23:40:28]

Done.

+}
+
 const base::BinaryValue* VideoFrameMetadata::GetBinaryValue(Key key) const {
   const base::Value* internal_value = nullptr;
   if (dictionary_.GetWithoutPathExpansion(ToInternalKey(key),
                                           &internal_value) &&
       internal_value->GetType() == base::Value::TYPE_BINARY) {
     return static_cast<const base::BinaryValue*>(internal_value);
   }
   return nullptr;
 }
 
 }  // namespace media