Skip posting DecodeTask of resolution changing while resetting

media/gpu/vaapi_video_decode_accelerator.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/vaapi_video_decode_accelerator.h"
 
 #include <string.h>
 
 #include <memory>
 
@@ skipping 793 matching lines @@
       RETURN_AND_NOTIFY_ON_FAILURE(
           picture->Allocate(output_format_),
           "Failed to allocate memory for a VaapiPicture", PLATFORM_FAILURE, );
       output_buffers_.push(buffers[i].id());
     }
 
     available_va_surfaces_.push_back(va_surface_ids[i]);
     surfaces_available_.Signal();
   }
 
-  state_ = kDecoding;
-  decoder_thread_task_runner_->PostTask(
-      FROM_HERE, base::Bind(&VaapiVideoDecodeAccelerator::DecodeTask,
-                            base::Unretained(this)));
+  // The resolution changing may happen while resetting or flushing. In this
+  // case we do not change state and post DecodeTask().
+  if (state_ != kResetting && state_ != kFlushing) {

[johnylin1, 2016/07/20 02:50:43]

I ran overnight for AdaptivePlaybackTest#testH264_adaptiveDrcEarlyEos to make
sure that everything goes right if |state_| == kFlushing. Tests are all passed
(71 times).

Is there other test we need to verify for the reliability of this change?

[Pawel Osciak, 2016/07/20 04:28:34]

Please also test with video_VideoSeek.

+    state_ = kDecoding;
+    decoder_thread_task_runner_->PostTask(
+        FROM_HERE, base::Bind(&VaapiVideoDecodeAccelerator::DecodeTask,
+                              base::Unretained(this)));
+  }
 }
 
 #if defined(USE_OZONE)
 static void CloseGpuMemoryBufferHandle(
     const gfx::GpuMemoryBufferHandle& handle) {
   for (const auto& fd : handle.native_pixmap_handle.fds) {
     // Close the fd by wrapping it in a ScopedFD and letting
     // it fall out of scope.
     base::ScopedFD scoped_fd(fd.fd);
   }
@@ skipping 1019 matching lines @@
   return vaapi_pic->dec_surface();
 }
 
 // static
 VideoDecodeAccelerator::SupportedProfiles
 VaapiVideoDecodeAccelerator::GetSupportedProfiles() {
   return VaapiWrapper::GetSupportedDecodeProfiles();
 }
 
 }  // namespace media