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

Unified Diff: media/renderers/skcanvas_video_renderer.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
« no previous file with comments | « media/base/video_frame_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/renderers/skcanvas_video_renderer.cc
diff --git a/media/renderers/skcanvas_video_renderer.cc b/media/renderers/skcanvas_video_renderer.cc
index 3ff3510a992dd99c35f35aec43f1c262dbc8aa34..129610ebd9517bb35cb47ceab556e9db25854e45 100644
--- a/media/renderers/skcanvas_video_renderer.cc
+++ b/media/renderers/skcanvas_video_renderer.cc
@@ -477,9 +477,7 @@ scoped_refptr<VideoFrame> DownShiftHighbitVideoFrame(
// Copy all metadata.
// (May be enough to copy color space)
- base::DictionaryValue tmp;
- video_frame->metadata()->MergeInternalValuesInto(&tmp);
- ret->metadata()->MergeInternalValuesFrom(tmp);
+ ret->metadata()->MergeMetadataFrom(video_frame->metadata());
for (int plane = VideoFrame::kYPlane; plane <= VideoFrame::kVPlane; ++plane) {
int width = ret->row_bytes(plane);
« no previous file with comments | « media/base/video_frame_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698