V4L2VideoDecodeAccelerator: destroy buffers in decoder thread.

media/gpu/v4l2_video_decode_accelerator.h

 // Copyright 2014 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 VideoDecodeAccelerator
 // that utilizes hardware video decoders, which expose Video4Linux 2 API
 // (http://linuxtv.org/downloads/v4l-dvb-apis/).
 
 #ifndef MEDIA_GPU_V4L2_VIDEO_DECODE_ACCELERATOR_H_
 #define MEDIA_GPU_V4L2_VIDEO_DECODE_ACCELERATOR_H_
@@ skipping 115 matching lines @@
     // and +1 for a frame in transit.
     kDpbOutputBufferExtraCount = limits::kMaxVideoFrames + 1,
   };
 
   // Internal state of the decoder.
   enum State {
     kUninitialized,  // Initialize() not yet called.
     kInitialized,    // Initialize() returned true; ready to start decoding.
     kDecoding,       // DecodeBufferInitial() successful; decoding frames.
     kResetting,      // Presently resetting.
-    // Performing resolution change, all remaining pre-change frames decoded
-    // and processed.
+    // Performing resolution change and waiting for image processor to return
+    // all frames.
     kChangingResolution,
     // Requested new PictureBuffers via ProvidePictureBuffers(), awaiting
     // AssignPictureBuffers().
     kAwaitingPictureBuffers,
     kError,  // Error in kDecoding state.
   };
 
   enum OutputRecordState {
     kFree,         // Ready to be queued to the device.
     kAtDevice,     // Held by device.
@@ skipping 174 matching lines @@
   //
   // Other utility functions.  Called on decoder_thread_, unless
   // decoder_thread_ is not yet started, in which case the child thread can call
   // these (e.g. in Initialize() or Destroy()).
   //
 
   // Create the buffers we need.
   bool CreateInputBuffers();
   bool CreateOutputBuffers();
 
+  // Destroy buffers.
+  void DestroyInputBuffers();
+  // In contrast to DestroyInputBuffers, which is called only on destruction,
+  // we call DestroyOutputBuffers also during playback, on resolution change.
+  // Even if anything fails along the way, we still want to go on and clean
+  // up as much as possible, so return false if this happens, so that the
+  // caller can error out on resolution change.
+  bool DestroyOutputBuffers();
+
   // Set input and output formats before starting decode.
   bool SetupFormats();
   // Return a usable input format of image processor. Return 0 if not found.
   uint32_t FindImageProcessorInputFormat();
   // Return a usable output format of image processor. Return 0 if not found.
   uint32_t FindImageProcessorOutputFormat();
   // Reset image processor and drop all processing frames.
   bool ResetImageProcessor();
 
   //
   // Methods run on child thread.
   //
 
-  // Destroy buffers.
-  void DestroyInputBuffers();
-  // In contrast to DestroyInputBuffers, which is called only from destructor,
-  // we call DestroyOutputBuffers also during playback, on resolution change.
-  // Even if anything fails along the way, we still want to go on and clean
-  // up as much as possible, so return false if this happens, so that the
-  // caller can error out on resolution change.
-  bool DestroyOutputBuffers();
-  void ResolutionChangeDestroyBuffers();
-
   // Send decoded pictures to PictureReady.
   void SendPictureReady();
 
   // Callback that indicates a picture has been cleared.
   void PictureCleared();
 
   // Image processor returns a processed frame. Its id is |bitstream_buffer_id|
   // and stored in |output_buffer_index| buffer of image processor.
   void FrameProcessed(int32_t bitstream_buffer_id, int output_buffer_index);
 
@@ skipping 159 matching lines @@
 
   // The WeakPtrFactory for |weak_this_|.
   base::WeakPtrFactory<V4L2VideoDecodeAccelerator> weak_this_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(V4L2VideoDecodeAccelerator);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_GPU_V4L2_VIDEO_DECODE_ACCELERATOR_H_