cc/output/renderer_pixeltest.cc - Issue 2380673002: Clean up code to use VideoFrameMetadata::MergeMetadataFrom() when appropriate.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: cc/output/renderer_pixeltest.cc

Issue 2380673002: Clean up code to use VideoFrameMetadata::MergeMetadataFrom() when appropriate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Clean up code to use VideoFrameMetadata::MergeMetadataFrom() when appropriate. Created 4 years, 3 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

Index: cc/output/renderer_pixeltest.cc

diff --git a/cc/output/renderer_pixeltest.cc b/cc/output/renderer_pixeltest.cc

index 25456cc0358f750540e4740e1371b0d585dc6cba..dcac7138787cd5d074685e26e7f59fd9d0c62cd4 100644

--- a/cc/output/renderer_pixeltest.cc

+++ b/cc/output/renderer_pixeltest.cc

@@ -310,9 +310,7 @@ scoped_refptr<media::VideoFrame> CreateHighbitVideoFrame(

video_frame->natural_size(), video_frame->timestamp());

// Copy all metadata.

- base::DictionaryValue tmp;

- video_frame->metadata()->MergeInternalValuesInto(&tmp);

- ret->metadata()->MergeInternalValuesFrom(tmp);

+ ret->metadata()->MergeMetadataFrom(video_frame->metadata());

for (int plane = media::VideoFrame::kYPlane;

plane <= media::VideoFrame::kVPlane; ++plane) {

« no previous file with comments | « no previous file | content/renderer/media/media_stream_video_capturer_source_unittest.cc » ('j') | no next file with comments »