OMX: Don't try to send buffers when in resetting state.

content/common/gpu/media/omx_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 "content/common/gpu/media/omx_video_decode_accelerator.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
@@ skipping 341 matching lines @@
   if (!AllocateOutputBuffers())
     return;
   if (!SendCommandToPort(OMX_CommandPortEnable, output_port_))
     return;
 }
 
 void OmxVideoDecodeAccelerator::ReusePictureBuffer(int32 picture_buffer_id) {
   TRACE_EVENT1("Video Decoder", "OVDA::ReusePictureBuffer",
                "Picture id", picture_buffer_id);
   DCHECK_EQ(message_loop_, MessageLoop::current());
+
+  // If we are resetting, don't bother, as OMX_FillThisBuffer will fail anyway.
+  // If we're in the middle of closing, this will put the Accelerator in
+  // ERRORING mode, which has the side effect of not going through the
+  // OMX_FreeBuffers path and leaks memory.
+  if (current_state_change_ == RESETTING)

[Ami GONE FROM CHROMIUM, 2012/08/11 04:29:00]

|| DESTROYING || ERRORING

[marcheu, 2012/08/13 19:23:04]

Done.

+    return;
+
   RETURN_ON_FAILURE(CanFillBuffer(), "Can't fill buffer", ILLEGAL_STATE,);
 
   OutputPictureById::iterator it = pictures_.find(picture_buffer_id);
   RETURN_ON_FAILURE(it != pictures_.end(),
                     "Missing picture buffer id: " << picture_buffer_id,
                     INVALID_ARGUMENT,);
   OutputPicture& output_picture = it->second;
 
   ++output_buffers_at_component_;
   OMX_ERRORTYPE result =
@@ skipping 205 matching lines @@
   // Note that during the Executing -> Idle transition, the OMX spec guarantees
   // buffers have been returned to the client, so we don't need to do an
   // explicit FlushIOPorts().
 
   BeginTransitionToState(OMX_StateLoaded);
 
   // TODO(fischman): evaluate what these conditionals are doing.  What happens
   // if they're false??
   if (!input_buffers_at_component_)
     FreeInputBuffers();
   if (!output_buffers_at_component_)

[Ami GONE FROM CHROMIUM, 2012/08/11 04:29:00]

Does you change obviate the need for this?  (allow replacing the if with a
DCHECK(!output_buffers_at_component_); followed by an unconditional FOB())

[marcheu, 2012/08/13 19:23:04]

It might be that this is the case.

With the OMX implementation I tried, the OMX_FillThisBuffer call failed and
returned an error. If instead (with another OMX implementation) it succeeds,
then we'd have ended up there with pending buffers >0.

So yes, we might want to do what you describe in a separate CL, but definitely
not in this CL which I want to backport to M22 :)

     FreeOutputBuffers();
 }
 
 void OmxVideoDecodeAccelerator::OnReachedLoadedInDestroying() {
   DCHECK_EQ(client_state_, OMX_StateIdle);
   client_state_ = OMX_StateLoaded;
   current_state_change_ = NO_TRANSITION;
   ShutdownComponent();
 }
 
@@ skipping 195 matching lines @@
     RETURN_ON_OMX_FAILURE(result, "OMX_FreeBuffer failed", PLATFORM_FAILURE,);
     return;
   }
   DCHECK(!fake_output_buffers_.size());
 
   // When the EOS picture is delivered back to us, notify the client and reuse
   // the underlying picturebuffer.
   if (buffer->nFlags & OMX_BUFFERFLAG_EOS) {
     buffer->nFlags &= ~OMX_BUFFERFLAG_EOS;
     OnReachedEOSInFlushing();
     if (current_state_change_ != DESTROYING)

[Ami GONE FROM CHROMIUM, 2012/08/11 04:29:00]

Make this unconditional.

[marcheu, 2012/08/13 19:23:04]

Done.

       ReusePictureBuffer(picture_buffer_id);
     return;
   }
 
   // During the transition from Executing to Idle, and during port-flushing, all
   // pictures are sent back through here.  Avoid giving them to the client.
   if (current_state_change_ != NO_TRANSITION &&
       current_state_change_ != FLUSHING) {
     if (current_state_change_ == RESETTING)
       queued_picture_buffer_ids_.push_back(picture_buffer_id);
@@ skipping 263 matching lines @@
 
 bool OmxVideoDecodeAccelerator::SendCommandToPort(
     OMX_COMMANDTYPE cmd, int port_index) {
   DCHECK_EQ(message_loop_, MessageLoop::current());
   OMX_ERRORTYPE result = OMX_SendCommand(component_handle_,
                                          cmd, port_index, 0);
   RETURN_ON_OMX_FAILURE(result, "SendCommand() failed" << cmd,
                         PLATFORM_FAILURE, false);
   return true;
 }