| 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 8d95f3da6f05cfdd3992be1dbeb2da8bcb5faba1..729c02edc9ed76e7da9eb4f91f5074c86123f2f9 100644
|
| --- a/media/capture/video/video_capture_device_client.cc
|
| +++ b/media/capture/video/video_capture_device_client.cc
|
| @@ -104,11 +104,7 @@
|
| 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) {
|
| - on_started_using_gpu_cb_ =
|
| - base::Bind(&VideoFrameReceiver::OnStartedUsingGpuDecode,
|
| - base::Unretained(receiver_.get()));
|
| -}
|
| + last_captured_pixel_format_(media::PIXEL_FORMAT_UNKNOWN) {}
|
|
|
| VideoCaptureDeviceClient::~VideoCaptureDeviceClient() {
|
| // This should be on the platform auxiliary thread since
|
| @@ -285,8 +281,6 @@
|
| } 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();
|
| external_jpeg_decoder_->DecodeCapturedData(
|
| data, length, format, reference_time, timestamp, std::move(buffer));
|
| return;
|
| @@ -342,8 +336,9 @@
|
|
|
| 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);
|
| }
|
|
|
|
|