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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/renderer/media/video_capture_impl.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_host.cc ('k') | content/renderer/media/video_capture_impl_unittest.cc » ('j') | media/base/video_frame_metadata.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/video_capture_impl.cc
diff --git a/content/renderer/media/video_capture_impl.cc b/content/renderer/media/video_capture_impl.cc
index aaacbf0695f01a8afac11d23064ad5a6d5705e65..ccf9c0a36e5644f4c25ad3b6e4fee5df50162e41 100644
--- a/content/renderer/media/video_capture_impl.cc
+++ b/content/renderer/media/video_capture_impl.cc
@@ -276,7 +276,7 @@ void VideoCaptureImpl::OnBufferReady(int32_t buffer_id,
base::TimeTicks reference_time;
media::VideoFrameMetadata frame_metadata;
- frame_metadata.MergeInternalValuesFrom(info->metadata);
+ frame_metadata.MergeInternalValuesFrom(*info->metadata);
const bool success = frame_metadata.GetTimeTicks(
media::VideoFrameMetadata::REFERENCE_TIME, &reference_time);
DCHECK(success);
@@ -323,7 +323,7 @@ void VideoCaptureImpl::OnBufferReady(int32_t buffer_id,
base::Bind(&VideoCaptureImpl::DidFinishConsumingFrame, frame->metadata(),
base::Passed(&release_sync_token), buffer_finished_callback));
- frame->metadata()->MergeInternalValuesFrom(info->metadata);
+ frame->metadata()->MergeInternalValuesFrom(*info->metadata);
// TODO(qiangchen): Dive into the full code path to let frame metadata hold
// reference time rather than using an extra parameter.
« no previous file with comments | « content/browser/renderer_host/media/video_capture_host.cc ('k') | content/renderer/media/video_capture_impl_unittest.cc » ('j') | media/base/video_frame_metadata.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698