Fix Vaapi VDA flush handling during resolution change

media/gpu/vaapi_video_decode_accelerator.h

 // 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.
 //
 // This file contains an implementation of VideoDecoderAccelerator
 // that utilizes hardware video decoder present on Intel CPUs.
 
 #ifndef MEDIA_GPU_VAAPI_VIDEO_DECODE_ACCELERATOR_H_
 #define MEDIA_GPU_VAAPI_VIDEO_DECODE_ACCELERATOR_H_
 
@@ skipping 73 matching lines @@
   static VideoDecodeAccelerator::SupportedProfiles GetSupportedProfiles();
 
  private:
   class VaapiH264Accelerator;
   class VaapiVP8Accelerator;
   class VaapiVP9Accelerator;
 
   // Notify the client that an error has occurred and decoding cannot continue.
   void NotifyError(Error error);
 
-  // Map the received input buffer into this process' address space and
-  // queue it for decode.
-  void MapAndQueueNewInputBuffer(const BitstreamBuffer& bitstream_buffer);
+  // Queue a input buffer for decode.
+  void QueueInputBuffer(const BitstreamBuffer& bitstream_buffer);
 
   // Get a new input buffer from the queue and set it up in decoder. This will
   // sleep if no input buffers are available. Return true if a new buffer has
   // been set up, false if an early exit has been requested (due to initiated
   // reset/flush/destroy).
   bool GetInputBuffer_Locked();
 
   // Signal the client that the current buffer has been read and can be
   // returned. Will also release the mapping.
   void ReturnCurrInputBuffer_Locked();
@@ skipping 82 matching lines @@
   scoped_refptr<VaapiDecodeSurface> CreateSurface();
 
   // VAVDA state.
   enum State {
     // Initialize() not called yet or failed.
     kUninitialized,
     // DecodeTask running.
     kDecoding,
     // Resetting, waiting for decoder to finish current task and cleanup.
     kResetting,
-    // Flushing, waiting for decoder to finish current task and cleanup.
-    kFlushing,
     // Idle, decoder in state ready to start/resume decoding.
     kIdle,
     // Destroying, waiting for the decoder to finish current task.
     kDestroying,
   };
 
   // Protects input buffer and surface queues and state_.
   base::Lock lock_;
   State state_;
   Config::OutputMode output_mode_;
 
   // An input buffer awaiting consumption, provided by the client.
   struct InputBuffer {
     InputBuffer();
     ~InputBuffer();
 
-    int32_t id;
+    // Indicates this is a dummy buffer for flush request.
+    bool is_flush() const { return shm == nullptr; }
+
+    int32_t id = -1;
     std::unique_ptr<SharedMemoryRegion> shm;
   };
 
   // Queue for available PictureBuffers (picture_buffer_ids).
   typedef std::queue<linked_ptr<InputBuffer>> InputBuffers;
   InputBuffers input_buffers_;
   // Signalled when input buffers are queued onto the input_buffers_ queue.
   base::ConditionVariable input_ready_;
 
   // Current input buffer at decoder.
@@ skipping 91 matching lines @@
 
   // The WeakPtrFactory for |weak_this_|.
   base::WeakPtrFactory<VaapiVideoDecodeAccelerator> weak_this_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VaapiVideoDecodeAccelerator);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_GPU_VAAPI_VIDEO_DECODE_ACCELERATOR_H_