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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/renderer_host/media/video_capture_host.cc

Issue 2577563002: Add struct traits for base::Value. (Closed)
Patch Set: 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/renderer_host/media/video_capture_controller.cc ('k') | content/renderer/media/video_capture_impl.cc » ('j') | media/base/video_frame_metadata.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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());
« no previous file with comments | « content/browser/renderer_host/media/video_capture_controller.cc ('k') | content/renderer/media/video_capture_impl.cc » ('j') | media/base/video_frame_metadata.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698