Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(96)

Unified Diff: media/base/video_frame_metadata.cc

Issue 1752243002: Modifying video_frame.cc to copy all metadata values, instead of only END_OF_STREAM, and updating u… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressing last comment Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/video_frame_metadata.h ('k') | media/base/video_frame_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/video_frame_metadata.cc
diff --git a/media/base/video_frame_metadata.cc b/media/base/video_frame_metadata.cc
index 2ecf002550cd523d1c48dbee27144f5b47b9794d..6aa322669c822cbcc5b88a7ca57b31319fe2b385 100644
--- a/media/base/video_frame_metadata.cc
+++ b/media/base/video_frame_metadata.cc
@@ -145,6 +145,11 @@ void VideoFrameMetadata::MergeInternalValuesFrom(
dictionary_.MergeDictionary(&in);
}
+void VideoFrameMetadata::MergeMetadataFrom(
+ const VideoFrameMetadata* metadata_source) {
+ dictionary_.MergeDictionary(&metadata_source->dictionary_);
+}
+
const base::BinaryValue* VideoFrameMetadata::GetBinaryValue(Key key) const {
const base::Value* internal_value = nullptr;
if (dictionary_.GetWithoutPathExpansion(ToInternalKey(key),
« no previous file with comments | « media/base/video_frame_metadata.h ('k') | media/base/video_frame_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698