| Index: content/browser/renderer_host/media/video_capture_device_client.cc
|
| diff --git a/content/browser/renderer_host/media/video_capture_device_client.cc b/content/browser/renderer_host/media/video_capture_device_client.cc
|
| index a8a1ca91f4397283e4be936f02e2793708d097eb..a0f8fec570007f3a4d7e30acd98ccea67380a540 100644
|
| --- a/content/browser/renderer_host/media/video_capture_device_client.cc
|
| +++ b/content/browser/renderer_host/media/video_capture_device_client.cc
|
| @@ -225,9 +225,9 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData(
|
| } else if (status == VideoCaptureGpuJpegDecoder::INIT_PASSED &&
|
| frame_format.pixel_format == media::PIXEL_FORMAT_MJPEG &&
|
| rotation == 0 && !flip) {
|
| - // TODO(qiangchen): Pass timestamp into DecodeCapturedData.
|
| - external_jpeg_decoder_->DecodeCapturedData(
|
| - data, length, frame_format, reference_time, std::move(buffer));
|
| + external_jpeg_decoder_->DecodeCapturedData(data, length, frame_format,
|
| + reference_time, timestamp,
|
| + std::move(buffer));
|
| return;
|
| }
|
| }
|
| @@ -330,8 +330,6 @@ void VideoCaptureDeviceClient::OnIncomingCapturedVideoFrame(
|
| std::unique_ptr<Buffer> buffer,
|
| const scoped_refptr<VideoFrame>& frame,
|
| base::TimeTicks reference_time) {
|
| - // TODO(qiangchen): Dive into DoIncomingCapturedVideoFrameOnIOThread to
|
| - // process timestamp.
|
| BrowserThread::PostTask(
|
| BrowserThread::IO, FROM_HERE,
|
| base::Bind(
|
|
|