| Index: content/browser/renderer_host/media/video_capture_controller.cc
|
| diff --git a/content/browser/renderer_host/media/video_capture_controller.cc b/content/browser/renderer_host/media/video_capture_controller.cc
|
| index f10f85ff12789ac811a95bd9193d24c5508df81c..721c87e1db20ba6552c79ef6c2d728e5aa23cf24 100644
|
| --- a/content/browser/renderer_host/media/video_capture_controller.cc
|
| +++ b/content/browser/renderer_host/media/video_capture_controller.cc
|
| @@ -356,8 +356,7 @@ VideoCaptureController::~VideoCaptureController() {
|
|
|
| void VideoCaptureController::DoIncomingCapturedVideoFrameOnIOThread(
|
| std::unique_ptr<media::VideoCaptureDevice::Client::Buffer> buffer,
|
| - const scoped_refptr<VideoFrame>& frame,
|
| - const base::TimeTicks& timestamp) {
|
| + const scoped_refptr<VideoFrame>& frame) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
| const int buffer_id = buffer->id();
|
| DCHECK_NE(buffer_id, VideoCaptureBufferPool::kInvalidId);
|
| @@ -396,10 +395,8 @@ void VideoCaptureController::DoIncomingCapturedVideoFrameOnIOThread(
|
| if (is_new_buffer)
|
| DoNewBufferOnIOThread(client, buffer.get(), frame);
|
|
|
| - client->event_handler->OnBufferReady(client->controller_id,
|
| - buffer_id,
|
| - frame,
|
| - timestamp);
|
| + client->event_handler->OnBufferReady(client->controller_id, buffer_id,
|
| + frame);
|
| const bool inserted =
|
| client->active_buffers.insert(std::make_pair(buffer_id, frame))
|
| .second;
|
|
|