Added support for Decode() calls during Reset().

content/common/gpu/media/omx_video_decode_accelerator.h

 // Copyright (c) 2011 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.
 
 #ifndef CONTENT_COMMON_GPU_MEDIA_OMX_VIDEO_DECODE_ACCELERATOR_H_
 #define CONTENT_COMMON_GPU_MEDIA_OMX_VIDEO_DECODE_ACCELERATOR_H_
 
 #include <dlfcn.h>
 #include <map>
 #include <queue>
@@ skipping 155 matching lines @@
 
   // For output buffer recycling cases.
   OutputPictureById pictures_;
 
   // To kick the component from Loaded to Idle before we know the real size of
   // the video (so can't yet ask for textures) we populate it with fake output
   // buffers.  Keep track of them here.
   // TODO(fischman): do away with this madness.
   std::set<OMX_BUFFERHEADERTYPE*> fake_output_buffers_;
 
+  // Encoded bitstream buffers awaiting decode, queued while the decoder was
+  // Resetting and thus unable to accept them.  This will be empty most of the
+  // time, is populated when Decode()'s are received between Reset() is called
+  // and NotifyResetDone() is sent, and is drained right before
+  // NotifyResetDone() is sent.
+  typedef std::vector<media::BitstreamBuffer> BitstreamBufferList;
+  BitstreamBufferList queued_bitstream_buffers_;
+  // Available output picture buffers released during Reset() and awaiting
+  // re-use once Reset is done.  Is empty most of the time and drained right
+  // before NotifyResetDone is sent.
+  std::vector<int> queued_picture_buffer_ids_;
+
   // To expose client callbacks from VideoDecodeAccelerator.
   // NOTE: all calls to this object *MUST* be executed in message_loop_.
   Client* client_;
 
   // Method to handle events
   void EventHandlerCompleteTask(OMX_EVENTTYPE event,
                                 OMX_U32 data1,
                                 OMX_U32 data2);
 
   // Method to receive buffers from component's input port
@@ skipping 16 matching lines @@
                                     OMX_PTR event_data);
   static OMX_ERRORTYPE EmptyBufferCallback(OMX_HANDLETYPE component,
                                            OMX_PTR priv_data,
                                            OMX_BUFFERHEADERTYPE* buffer);
   static OMX_ERRORTYPE FillBufferCallback(OMX_HANDLETYPE component,
                                           OMX_PTR priv_data,
                                           OMX_BUFFERHEADERTYPE* buffer);
 };
 
 #endif  // CONTENT_COMMON_GPU_MEDIA_OMX_VIDEO_DECODE_ACCELERATOR_H_