Fix for issue 684766 Old/erroneous frame feedback during tab capture

content/browser/renderer_host/media/video_capture_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/media/video_capture_controller.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
@@ skipping 127 matching lines @@
       frame_buffer_pool_->ReleaseBufferHold(buffer_id_);
     max_consumer_utilization_ =
         media::VideoFrameConsumerFeedbackObserver::kNoUtilizationRecorded;
   }
 }
 
 bool VideoCaptureController::BufferState::HasZeroConsumerHoldCount() {
   return consumer_hold_count_ == 0;
 }
 
+void VideoCaptureController::BufferState::SetFrameFeedbackId(int id) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  frame_feedback_id_ = id;
+}
+
 void VideoCaptureController::BufferState::SetConsumerFeedbackObserver(
     media::VideoFrameConsumerFeedbackObserver* consumer_feedback_observer) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   consumer_feedback_observer_ = consumer_feedback_observer;
 }
 
 void VideoCaptureController::BufferState::SetFrameBufferPool(
     media::FrameBufferPool* frame_buffer_pool) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   frame_buffer_pool_ = frame_buffer_pool;
@@ skipping 212 matching lines @@
 }
 
 void VideoCaptureController::OnIncomingCapturedVideoFrame(
     media::VideoCaptureDevice::Client::Buffer buffer,
     scoped_refptr<VideoFrame> frame) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   const int buffer_id = buffer.id();
   DCHECK_NE(buffer_id, media::VideoCaptureBufferPool::kInvalidId);
 
   // Insert if not exists.
-  const auto it =
-      buffer_id_to_state_map_
-          .insert(std::make_pair(
-              buffer_id, BufferState(buffer_id, buffer.frame_feedback_id(),
-                                     consumer_feedback_observer_.get(),
-                                     frame_buffer_pool_.get())))
-          .first;
-  BufferState& buffer_state = it->second;
+  const auto insert_result = buffer_id_to_state_map_.insert(std::make_pair(
+      buffer_id, BufferState(buffer_id, buffer.frame_feedback_id(),
+                             consumer_feedback_observer_.get(),
+                             frame_buffer_pool_.get())));
+  BufferState& buffer_state = insert_result.first->second;
   DCHECK(buffer_state.HasZeroConsumerHoldCount());
+  // If a BufferState for |buffer_id| already existed, we must update the
+  // |frame_feedback_id| of the existing entry.
+  if (!insert_result.second)
+    buffer_state.SetFrameFeedbackId(buffer.frame_feedback_id());
 
   if (state_ == VIDEO_CAPTURE_STATE_STARTED) {
     if (!frame->metadata()->HasKey(VideoFrameMetadata::FRAME_RATE)) {
       frame->metadata()->SetDouble(VideoFrameMetadata::FRAME_RATE,
                                    video_capture_format_.frame_rate);
     }
     std::unique_ptr<base::DictionaryValue> metadata =
         frame->metadata()->CopyInternalValues();
 
     // Only I420 and Y16 pixel formats are currently supported.
@@ skipping 114 matching lines @@
     int session_id,
     const ControllerClients& clients) {
   for (const auto& client : clients) {
     if (client->session_id == session_id)
       return client.get();
   }
   return nullptr;
 }
 
 }  // namespace content