content/renderer/media/media_stream_video_capturer_source_unittest.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: content/renderer/media/media_stream_video_capturer_source_unittest.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: content/renderer/media/media_stream_video_capturer_source_unittest.cc

diff --git a/content/renderer/media/media_stream_video_capturer_source_unittest.cc b/content/renderer/media/media_stream_video_capturer_source_unittest.cc

index 182140462223c5caac845e802eb14b49e3c832e4..9fc0a5964e93d7d4d6eea597db3265be7482d189 100644

--- a/content/renderer/media/media_stream_video_capturer_source_unittest.cc

+++ b/content/renderer/media/media_stream_video_capturer_source_unittest.cc

@@ -351,9 +351,7 @@ class FakeMediaStreamVideoSink : public MediaStreamVideoSink {

base::TimeTicks capture_time) {

*capture_time_ = capture_time;

metadata_->Clear();

- base::DictionaryValue tmp;

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

- metadata_->MergeInternalValuesFrom(tmp);

+ metadata_->MergeMetadataFrom(frame->metadata());

base::ResetAndReturn(&got_frame_cb_).Run();

}

« no previous file with comments | « cc/output/renderer_pixeltest.cc ('k') | content/renderer/media/webmediaplayer_ms_compositor.cc » ('j') | no next file with comments »