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

media/base/video_frame.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 "media/base/video_frame.h"
 
 #include <algorithm>
 #include <climits>
 
 #include "base/bind.h"
@@ skipping 498 matching lines @@
     LOG(DFATAL) << __FUNCTION__ << " Invalid config."
                 << ConfigToString(frame->format(), frame->storage_type(),
                                   frame->coded_size(), visible_rect,
                                   natural_size);
     return nullptr;
   }
 
   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);
     wrapping_frame->data_[i] = frame->data(i);
   }
 
 #if defined(OS_LINUX)
   // If there are any |dmabuf_fds_| plugged in, we should duplicate them.
   if (frame->storage_type() == STORAGE_DMABUFS) {
     std::vector<int> original_fds;
@@ skipping 547 matching lines @@
   if (zero_initialize_memory)
     memset(data, 0, data_size);
 
   for (size_t plane = 0; plane < NumPlanes(format_); ++plane)
     data_[plane] = data + offset[plane];
 
   AddDestructionObserver(base::Bind(&base::AlignedFree, data));
 }
 
 }  // namespace media