Invalidate DXVA IMFTransform on Flush()

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 1177 matching lines @@
   pending_input_buffers_.clear();
 
   RETURN_AND_NOTIFY_ON_FAILURE(StartDecoderThread(),
                                "Failed to start decoder thread.",
                                PLATFORM_FAILURE, );
   SetState(kNormal);
 }
 
 void DXVAVideoDecodeAccelerator::Destroy() {
   DCHECK(main_thread_task_runner_->BelongsToCurrentThread());
-  Invalidate();
+  Invalidate(false);
   delete this;
 }
 
 bool DXVAVideoDecodeAccelerator::TryToSetupDecodeOnSeparateThread(
     const base::WeakPtr<Client>& decode_client,
     const scoped_refptr<base::SingleThreadTaskRunner>& decode_task_runner) {
   return false;
 }
 
 GLenum DXVAVideoDecodeAccelerator::GetSurfaceInternalFormat() const {
@@ skipping 799 matching lines @@
         FROM_HERE,
         base::Bind(&DXVAVideoDecodeAccelerator::StopOnError, weak_ptr_, error));
     return;
   }
 
   if (client_)
     client_->NotifyError(error);
   client_ = NULL;
 
   if (GetState() != kUninitialized) {
-    Invalidate();
+    Invalidate(false);
   }
 }
 
-void DXVAVideoDecodeAccelerator::Invalidate() {
+void DXVAVideoDecodeAccelerator::Invalidate(bool for_config_change) {
   if (GetState() == kUninitialized)
     return;
 
   // Best effort to make the GL context current.
   make_context_current_cb_.Run();
 
   StopDecoderThread();
   weak_this_factory_.InvalidateWeakPtrs();
   weak_ptr_ = weak_this_factory_.GetWeakPtr();
   pending_output_samples_.clear();
   decoder_.Reset();
   config_change_detector_.reset();
 
   // If we are processing a config change, then leave the d3d9/d3d11 objects
   // along with the output picture buffers intact as they can be reused. The
   // output picture buffers may need to be recreated in case the video
   // resolution changes. We already handle that in the
   // HandleResolutionChanged() function.
-  if (GetState() != kConfigChange) {
+  if (!for_config_change) {
     output_picture_buffers_.clear();
     stale_output_picture_buffers_.clear();
     // We want to continue processing pending input after detecting a config
     // change.
     pending_input_buffers_.clear();
     pictures_requested_ = false;
     if (use_dx11_) {
       d3d11_processor_.Reset();
       enumerator_.Reset();
       video_context_.Reset();
@@ skipping 52 matching lines @@
 void DXVAVideoDecodeAccelerator::NotifyFlushDone() {
   DCHECK(main_thread_task_runner_->BelongsToCurrentThread());
   if (client_ && pending_flush_) {
     pending_flush_ = false;
     {
       base::AutoLock lock(decoder_lock_);
       sent_drain_message_ = false;
     }
 
     client_->NotifyFlushDone();
+    Invalidate(true);
+    Initialize(config_, client_);
   }
 }
 
 void DXVAVideoDecodeAccelerator::NotifyResetDone() {
   DCHECK(main_thread_task_runner_->BelongsToCurrentThread());
   if (client_)
     client_->NotifyResetDone();
 }
 
 void DXVAVideoDecodeAccelerator::RequestPictureBuffers(int width, int height) {
@@ skipping 904 matching lines @@
                          E_FAIL);
   }
   *config_changed = config_change_detector_->config_changed();
   return S_OK;
 }
 
 void DXVAVideoDecodeAccelerator::ConfigChanged(const Config& config) {
   DCHECK(main_thread_task_runner_->BelongsToCurrentThread());
 
   SetState(kConfigChange);
-  Invalidate();
+  Invalidate(true);
   Initialize(config_, client_);
   decoder_thread_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&DXVAVideoDecodeAccelerator::DecodePendingInputBuffers,
                  base::Unretained(this)));
 }
 
 uint32_t DXVAVideoDecodeAccelerator::GetTextureTarget() const {
   switch (GetPictureBufferMechanism()) {
     case PictureBufferMechanism::BIND:
@@ skipping 31 matching lines @@
       return false;
   }
   NOTREACHED();
   return false;
 }
 ID3D11Device* DXVAVideoDecodeAccelerator::D3D11Device() const {
   return ShouldUseANGLEDevice() ? angle_device_.Get() : d3d11_device_.Get();
 }
 
 }  // namespace media