Fix the EOS hang.

content/gpu/omx_video_decode_accelerator.cc

 // 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.
 
 #include "content/gpu/omx_video_decode_accelerator.h"
 
 #include "content/common/gpu/gpu_channel.h"
 #include "content/common/gpu_messages.h"
 #include "content/gpu/gles2_texture_to_egl_image_translator.h"
 #include "media/base/bitstream_buffer.h"
@@ skipping 276 matching lines @@
     std::vector<PictureBuffer*> picture_buffers) {
   // NOTE: this is only partially-implemented as it only inspects the first
   // picture buffer passed in each AssignPictureBuffer call, and never unsets
   // uses_egl_image_ once set.
   if (PictureBuffer::PICTUREBUFFER_MEMORYTYPE_GL_TEXTURE ==
       picture_buffers[0]->GetMemoryType()) {
       uses_egl_image_ = true;
   }
 
   assigned_picture_buffers_.insert(
-      assigned_picture_buffers_.begin(),
+      assigned_picture_buffers_.end(),

[vhiremath, 2011/05/19 13:38:00]

Newer picture buffers should be inserted in the end. Not in the beginning. This
fixes the jerkiness in playback.

       picture_buffers.begin(),
       picture_buffers.end());
 
   if (assigned_picture_buffers_.size() < kNumPictureBuffers)
     return;  // get all the buffers first.
 
   // Obtain the information about the output port.
   OMX_PARAM_PORTDEFINITIONTYPE port_format;
   InitParam(*this, &port_format);
   port_format.nPortIndex = output_port_;
@@ skipping 81 matching lines @@
   OMX_GetState(component_handle_, &il_state);
   DCHECK_EQ(il_state, OMX_StateExecuting);
   if (il_state != OMX_StateExecuting) {
     callback.Run();
     return false;
   }
   on_buffer_flag_event_func_ = &OmxVideoDecodeAccelerator::FlushBegin;
   flush_done_callback_ = callback;
 
   OMX_BUFFERHEADERTYPE* omx_buffer = free_input_buffers_.front();
+  free_input_buffers_.pop();
   omx_buffer->nFilledLen = 0;
   omx_buffer->nAllocLen = omx_buffer->nFilledLen;
   omx_buffer->nFlags |= OMX_BUFFERFLAG_EOS;
   omx_buffer->nTimeStamp = 0;
   // Give this buffer to OMX.
   OMX_ERRORTYPE result = OMX_ErrorNone;
   result = OMX_EmptyThisBuffer(component_handle_, omx_buffer);
   if (result != OMX_ErrorNone) {
     LOG(ERROR) << "OMX_EmptyThisBuffer() failed with result " << result;
     StopOnError();
@@ skipping 113 matching lines @@
   DCHECK_EQ(state, OMX_StateExecuting);
 
   VLOG(1) << "Deinit from Executing";
   on_state_event_func_ =
       &OmxVideoDecodeAccelerator::OnStateChangeExecutingToIdle;
   TransitionToState(OMX_StateIdle);
   for (int i = 0; i < output_buffer_count_; ++i) {
     OutputPicture output_picture = output_pictures_[i];
     client_->DismissPictureBuffer(output_picture.first);
   }
-  output_pictures_.clear();
 }
 
 void OmxVideoDecodeAccelerator::OnStateChangeExecutingToIdle(
     OMX_STATETYPE state) {
   DCHECK_EQ(state, OMX_StateIdle);
 
   VLOG(1) << "Deinit from Idle";
   on_state_event_func_ =
       &OmxVideoDecodeAccelerator::OnStateChangeIdleToLoaded;
   TransitionToState(OMX_StateLoaded);
@@ skipping 119 matching lines @@
       buffer->pAppPrivate = picture;
     }
   }
   return true;
 }
 
 void OmxVideoDecodeAccelerator::FreeInputBuffers() {
   // Calls to OMX to free buffers.
   OMX_ERRORTYPE result;
   OMX_BUFFERHEADERTYPE* omx_buffer;
-  for (int i = 0; i < input_buffer_count_; ++i) {
+  while (!free_input_buffers_.empty()) {
     omx_buffer = free_input_buffers_.front();
     free_input_buffers_.pop();
     result = OMX_FreeBuffer(component_handle_, input_port_, omx_buffer);
     if (result != OMX_ErrorNone) {
       LOG(ERROR) << "SendCommand(OMX_CommandPortDisable) failed";
       StopOnError();
       return;
     }
   }
 }
@@ skipping 165 matching lines @@
   return (client_state_ != OMX_StateInvalid &&
           client_state_ != OMX_StatePause &&
           client_state_ != OMX_StateLoaded);
 }
 
 bool OmxVideoDecodeAccelerator::CanFillBuffer() {
   // Make sure component is in the executing state and end-of-stream
   // has not been reached.
   OMX_ERRORTYPE result;
   OMX_STATETYPE il_state;
+  if (client_state_ == OMX_StateLoaded)
+    return false;

[vhiremath, 2011/05/19 13:38:00]

This check is useful in case we get ReusePictureBuffer after Flush from app is
called.
The openmax component is closed and no need to even GetState of component when
it is already closed.

   result = OMX_GetState(component_handle_, &il_state);
   if (result != OMX_ErrorNone) {
     LOG(ERROR) << "SendCommand(OMX_CommandPortDisable) failed";
     StopOnError();
     return false;
   }
   return (il_state == OMX_StateExecuting);
 }
 
 // Send command to disable/enable port.
 void OmxVideoDecodeAccelerator::ChangePort(
     OMX_COMMANDTYPE cmd, int port_index) {
   OMX_ERRORTYPE result = OMX_SendCommand(component_handle_,
                                              cmd, port_index, 0);
   if (result != OMX_ErrorNone) {
     LOG(ERROR) << "SendCommand(OMX_CommandPortDisable) failed";
     StopOnError();
     return;
   }
 }
 
 DISABLE_RUNNABLE_METHOD_REFCOUNT(OmxVideoDecodeAccelerator);