Allow resetting DXVAVDA while it's currently flushing.

media/gpu/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 "media/gpu/dxva_video_decode_accelerator_win.h"
 
 #include <memory>
 
 #if !defined(OS_WIN)
 #error This file should only be built on Windows.
@@ skipping 983 matching lines @@
       FROM_HERE, base::Bind(&DXVAVideoDecodeAccelerator::FlushInternal,
                             base::Unretained(this)));
 }
 
 void DXVAVideoDecodeAccelerator::Reset() {
   DCHECK(main_thread_task_runner_->BelongsToCurrentThread());
 
   DVLOG(1) << "DXVAVideoDecodeAccelerator::Reset";
 
   State state = GetState();
-  RETURN_AND_NOTIFY_ON_FAILURE((state == kNormal || state == kStopped),
-                               "Reset: invalid state: " << state,
-                               ILLEGAL_STATE, );
+  RETURN_AND_NOTIFY_ON_FAILURE(
+      (state == kNormal || state == kStopped || state == kFlushing),
+      "Reset: invalid state: " << state, ILLEGAL_STATE, );
 
   decoder_thread_.Stop();
 
+  if (state == kFlushing)
+    NotifyFlushDone();
+
   SetState(kResetting);
 
   // If we have pending output frames waiting for display then we drop those
   // frames and set the corresponding picture buffer as available.
   PendingOutputSamples::iterator index;
   for (index = pending_output_samples_.begin();
        index != pending_output_samples_.end(); ++index) {
     if (index->picture_buffer_id != -1) {
       OutputBuffers::iterator it =
           output_picture_buffers_.find(index->picture_buffer_id);
@@ skipping 1665 matching lines @@
   SetState(kConfigChange);
   Invalidate();
   Initialize(config_, client_);
   decoder_thread_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&DXVAVideoDecodeAccelerator::DecodePendingInputBuffers,
                  base::Unretained(this)));
 }
 
 }  // namespace media