Chromium Code Reviews| Index: media/capture/video/video_capture_device_client.cc |
| diff --git a/media/capture/video/video_capture_device_client.cc b/media/capture/video/video_capture_device_client.cc |
| index 729c02edc9ed76e7da9eb4f91f5074c86123f2f9..8d95f3da6f05cfdd3992be1dbeb2da8bcb5faba1 100644 |
| --- a/media/capture/video/video_capture_device_client.cc |
| +++ b/media/capture/video/video_capture_device_client.cc |
| @@ -104,7 +104,11 @@ VideoCaptureDeviceClient::VideoCaptureDeviceClient( |
| jpeg_decoder_factory_callback_(jpeg_decoder_factory), |
| external_jpeg_decoder_initialized_(false), |
| buffer_pool_(std::move(buffer_pool)), |
| - last_captured_pixel_format_(media::PIXEL_FORMAT_UNKNOWN) {} |
| + last_captured_pixel_format_(media::PIXEL_FORMAT_UNKNOWN) { |
| + on_started_using_gpu_cb_ = |
| + base::Bind(&VideoFrameReceiver::OnStartedUsingGpuDecode, |
| + base::Unretained(receiver_.get())); |
| +} |
| VideoCaptureDeviceClient::~VideoCaptureDeviceClient() { |
| // This should be on the platform auxiliary thread since |
| @@ -281,6 +285,8 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData( |
| } else if (status == VideoCaptureJpegDecoder::INIT_PASSED && |
| format.pixel_format == media::PIXEL_FORMAT_MJPEG && |
| rotation == 0 && !flip) { |
| + if (on_started_using_gpu_cb_) |
| + std::move(on_started_using_gpu_cb_).Run(); |
|
sandersd (OOO until July 31)
2017/03/14 23:02:34
Does std::move() actually do anything here? Is thi
chfremer
2017/03/15 17:31:05
|on_started_using_gpu_cb_| is a OnceClosure. On On
|
| external_jpeg_decoder_->DecodeCapturedData( |
| data, length, format, reference_time, timestamp, std::move(buffer)); |
| return; |
| @@ -336,9 +342,8 @@ VideoCaptureDeviceClient::ReserveOutputBuffer( |
| if (!base::ContainsValue(buffer_ids_known_by_receiver_, buffer_id)) { |
| receiver_->OnNewBufferHandle( |
| - buffer_id, |
| - base::MakeUnique<BufferPoolBufferHandleProvider>(buffer_pool_, |
| - buffer_id)); |
| + buffer_id, base::MakeUnique<BufferPoolBufferHandleProvider>( |
| + buffer_pool_, buffer_id)); |
| buffer_ids_known_by_receiver_.push_back(buffer_id); |
| } |