| Index: media/capture/video/video_capture_buffer_pool_impl.cc
|
| diff --git a/media/capture/video/video_capture_buffer_pool_impl.cc b/media/capture/video/video_capture_buffer_pool_impl.cc
|
| index 3b5860a73fe794e0fe5d895a3b0bc653d2c8c7f5..7bc10e16e9e2b4bcd2f18b186e64c5d3ad3cfc48 100644
|
| --- a/media/capture/video/video_capture_buffer_pool_impl.cc
|
| +++ b/media/capture/video/video_capture_buffer_pool_impl.cc
|
| @@ -57,10 +57,11 @@ int VideoCaptureBufferPoolImpl::ReserveForProducer(
|
| const gfx::Size& dimensions,
|
| media::VideoPixelFormat format,
|
| media::VideoPixelStorage storage,
|
| + int frame_feedback_id,
|
| int* buffer_id_to_drop) {
|
| base::AutoLock lock(lock_);
|
| return ReserveForProducerInternal(dimensions, format, storage,
|
| - buffer_id_to_drop);
|
| + frame_feedback_id, buffer_id_to_drop);
|
| }
|
|
|
| void VideoCaptureBufferPoolImpl::RelinquishProducerReservation(int buffer_id) {
|
| @@ -151,6 +152,7 @@ int VideoCaptureBufferPoolImpl::ReserveForProducerInternal(
|
| const gfx::Size& dimensions,
|
| media::VideoPixelFormat pixel_format,
|
| media::VideoPixelStorage storage_type,
|
| + int frame_feedback_id,
|
| int* buffer_id_to_drop) {
|
| lock_.AssertAcquired();
|
|
|
| @@ -177,6 +179,7 @@ int VideoCaptureBufferPoolImpl::ReserveForProducerInternal(
|
| // Existing tracker is big enough and has correct format. Reuse it.
|
| tracker->set_dimensions(dimensions);
|
| tracker->set_held_by_producer(true);
|
| + tracker->set_frame_feedback_id(frame_feedback_id);
|
| return it->first;
|
| }
|
| if (tracker->max_pixel_count() > largest_size_in_pixels) {
|
| @@ -194,6 +197,7 @@ int VideoCaptureBufferPoolImpl::ReserveForProducerInternal(
|
| last_relinquished_buffer_id_ = kInvalidId;
|
| tracker_of_last_resort->second->set_dimensions(dimensions);
|
| tracker_of_last_resort->second->set_held_by_producer(true);
|
| + tracker_of_last_resort->second->set_frame_feedback_id(frame_feedback_id);
|
| return tracker_of_last_resort->first;
|
| }
|
| if (tracker_to_drop == trackers_.end()) {
|
| @@ -219,6 +223,7 @@ int VideoCaptureBufferPoolImpl::ReserveForProducerInternal(
|
| }
|
|
|
| tracker->set_held_by_producer(true);
|
| + tracker->set_frame_feedback_id(frame_feedback_id);
|
| trackers_[buffer_id] = std::move(tracker);
|
|
|
| return buffer_id;
|
|
|