content/browser/renderer_host/media/video_capture_host.cc - Issue 2577563002: Add struct traits for base::Value.

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/browser/renderer_host/media/video_capture_host.cc

Issue 2577563002: Add struct traits for base::Value. (Closed)

Patch Set: rebase Created 4 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: content/browser/renderer_host/media/video_capture_host.cc

diff --git a/content/browser/renderer_host/media/video_capture_host.cc b/content/browser/renderer_host/media/video_capture_host.cc

index 639552248f5579c4883968bae50f5f722b25a180..b818ae3be0b83918828ebdf47df29a20cfdf01c4 100644

--- a/content/browser/renderer_host/media/video_capture_host.cc

+++ b/content/browser/renderer_host/media/video_capture_host.cc

@@ -95,7 +95,7 @@ void VideoCaptureHost::OnBufferReady(

media::mojom::VideoFrameInfoPtr info = media::mojom::VideoFrameInfo::New();

info->timestamp = video_frame->timestamp();

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

+ info->metadata = video_frame->metadata()->CopyInternalValues();

DCHECK(media::PIXEL_FORMAT_I420 == video_frame->format() ||

media::PIXEL_FORMAT_Y16 == video_frame->format());