Fix input frames being dropped when the h.264 DXVA decoder detects a configuration change.

content/common/gpu/media/dxva_video_decode_accelerator_win.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/common/gpu/media/dxva_video_decode_accelerator_win.h"
 
 #if !defined(OS_WIN)
 #error This file should only be built on Windows.
 #endif   // !defined(OS_WIN)
 
@@ skipping 1805 matching lines @@
 
 void DXVAVideoDecodeAccelerator::Invalidate() {
   if (GetState() == kUninitialized)
     return;
 
   decoder_thread_.Stop();
   weak_this_factory_.InvalidateWeakPtrs();
   output_picture_buffers_.clear();
   stale_output_picture_buffers_.clear();
   pending_output_samples_.clear();
-  pending_input_buffers_.clear();
+  // We want to continue processing pending input after detecting a config
+  // change.
+  if (GetState() != kConfigChange)
+    pending_input_buffers_.clear();
   decoder_.Release();
   pictures_requested_ = false;
 
   if (use_dx11_) {
     if (video_format_converter_mft_.get()) {
       video_format_converter_mft_->ProcessMessage(
           MFT_MESSAGE_NOTIFY_END_STREAMING, 0);
       video_format_converter_mft_.Release();
     }
     d3d11_device_context_.Release();
@@ skipping 158 matching lines @@
 
   // Check if the resolution, bit rate, etc changed in the stream. If yes we
   // reinitialize the decoder to ensure that the stream decodes correctly.
   bool config_changed = false;
 
   HRESULT hr = CheckConfigChanged(sample.get(), &config_changed);
   RETURN_AND_NOTIFY_ON_HR_FAILURE(hr, "Failed to check video stream config",
       PLATFORM_FAILURE,);
 
   if (config_changed) {
+    pending_input_buffers_.push_back(sample);
     main_thread_task_runner_->PostTask(
         FROM_HERE,
         base::Bind(&DXVAVideoDecodeAccelerator::ConfigChanged,
                    weak_this_factory_.GetWeakPtr(),
-                   config_,
-                   sample));
+                   config_));
     return;
   }
 
   if (!inputs_before_decode_) {
     TRACE_EVENT_ASYNC_BEGIN0("gpu", "DXVAVideoDecodeAccelerator.Decoding",
                              this);
   }
   inputs_before_decode_++;
 
   hr = decoder_->ProcessInput(0, sample.get(), 0);
@@ skipping 614 matching lines @@
           scoped_media_buffer.get(),
           scoped_media_buffer.current_length())) {
     RETURN_ON_HR_FAILURE(E_FAIL, "Failed to detect H.264 stream config",
         E_FAIL);
   }
   *config_changed = config_change_detector_.config_changed();
   return S_OK;
 }
 
 void DXVAVideoDecodeAccelerator::ConfigChanged(
-    const Config& config,
-    const base::win::ScopedComPtr<IMFSample>& input_sample) {
+    const Config& config) {
   DCHECK(main_thread_task_runner_->BelongsToCurrentThread());
+  SetState(kConfigChange);
   DismissStaleBuffers(true);
   Invalidate();
   Initialize(config_, client_);
   decoder_thread_task_runner_->PostTask(
       FROM_HERE,
-      base::Bind(&DXVAVideoDecodeAccelerator::DecodeInternal,
-                 base::Unretained(this), input_sample));
+      base::Bind(&DXVAVideoDecodeAccelerator::DecodePendingInputBuffers,
+                 base::Unretained(this)));
 }
 
 }  // namespace content