content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.cc - Issue 2045813003: Decouple capture timestamp and reference time

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_gpu_jpeg_decoder.cc

Issue 2045813003: Decouple capture timestamp and reference time (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 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

« content/browser/renderer_host/media/video_capture_controller_unittest.cc ('K') | « content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.h ('k') | content/browser/renderer_host/media/video_capture_host.h » ('j') | content/browser/renderer_host/media/video_capture_host.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index e47dd24a07bee541fb6684b17cea391aa174b2f8..fd2b25914be3e395a401b4285d191914934a78f1 100644

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

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

@@ -79,7 +79,8 @@ void VideoCaptureGpuJpegDecoder::DecodeCapturedData(

const uint8_t* data,

size_t in_buffer_size,

const media::VideoCaptureFormat& frame_format,

- const base::TimeTicks& timestamp,

+ base::TimeTicks reference_time,

+ base::TimeDelta timestamp,

std::unique_ptr<media::VideoCaptureDevice::Client::Buffer> out_buffer) {

DCHECK(CalledOnValidThread());

DCHECK(decoder_);

@@ -133,7 +134,7 @@ void VideoCaptureGpuJpegDecoder::DecodeCapturedData(

out_buffer->mapped_size(), // data_size

out_handle, // handle

0, // shared_memory_offset

- base::TimeDelta()); // timestamp

+ timestamp); // timestamp

if (!out_frame) {

base::AutoLock lock(lock_);

decoder_status_ = FAILED;

@@ -146,7 +147,7 @@ void VideoCaptureGpuJpegDecoder::DecodeCapturedData(

{

base::AutoLock lock(lock_);

decode_done_closure_ = base::Bind(

- decode_done_cb_, base::Passed(&out_buffer), out_frame, timestamp);

+ decode_done_cb_, base::Passed(&out_buffer), out_frame, reference_time);

miu 2016/06/07 20:03:47 ditto: Just set out_frame->metadata()->SetTimeTick

qiangchen 2016/06/08 18:04:30 Done.

}

decoder_->Decode(in_buffer, out_frame);

#else