Support queuing input buffers when OMX's buffer list is exhausted.

content/common/gpu/media/omx_video_decode_accelerator.cc

Index: content/common/gpu/media/omx_video_decode_accelerator.cc
diff --git a/content/common/gpu/media/omx_video_decode_accelerator.cc b/content/common/gpu/media/omx_video_decode_accelerator.cc
index f2e79812ccfe2d4ca0f61c1137cd22dc2bf4768b..9c72b26775ada0c94c8718715395238d8e36e747 100644
--- a/content/common/gpu/media/omx_video_decode_accelerator.cc
+++ b/content/common/gpu/media/omx_video_decode_accelerator.cc
@@ -278,10 +278,10 @@ bool OmxVideoDecodeAccelerator::CreateComponent() {
 void OmxVideoDecodeAccelerator::Decode(
     const media::BitstreamBuffer& bitstream_buffer) {
   DCHECK_EQ(message_loop_, MessageLoop::current());
-  DCHECK(!free_input_buffers_.empty());
 
   if (current_state_change_ == RESETTING ||
-      !queued_bitstream_buffers_.empty()) {
+      !queued_bitstream_buffers_.empty() ||
+      free_input_buffers_.empty()) {
     queued_bitstream_buffers_.push_back(bitstream_buffer);
     return;
   }
@@ -510,6 +510,13 @@ void OmxVideoDecodeAccelerator::OnReachedPauseInResetting() {
   FlushIOPorts();
 }
 
+void OmxVideoDecodeAccelerator::DecodeQueuedBitstreamBuffers() {
+  BitstreamBufferList buffers;
+  buffers.swap(queued_bitstream_buffers_);
+  for (size_t i = 0; i < buffers.size(); ++i)
+    Decode(buffers[i]);
+}
+
 void OmxVideoDecodeAccelerator::OnReachedExecutingInResetting() {
   DCHECK_EQ(client_state_, OMX_StatePause);
   client_state_ = OMX_StateExecuting;
@@ -517,14 +524,8 @@ void OmxVideoDecodeAccelerator::OnReachedExecutingInResetting() {
   if (!client_)
     return;
 
-  // Drain queued bitstream & picture buffers that were held away from the
-  // decoder during the reset.
-  BitstreamBufferList buffers;
-  buffers.swap(queued_bitstream_buffers_);
-  for (size_t i = 0; i < buffers.size(); ++i)
-    Decode(buffers[i]);
-  // Ensure the Decode() calls above didn't end up re-enqueuing.
-  DCHECK(queued_bitstream_buffers_.empty());
+  // Drain queues of input & output buffers held during the reset.
+  DecodeQueuedBitstreamBuffers();
   for (size_t i = 0; i < queued_picture_buffer_ids_.size(); ++i)
     ReusePictureBuffer(queued_picture_buffer_ids_[i]);
   queued_picture_buffer_ids_.clear();
@@ -795,6 +796,8 @@ void OmxVideoDecodeAccelerator::EmptyBufferDoneTask(
   if (client_)
     client_->NotifyEndOfBitstreamBuffer(input_buffer_details->second);
   delete input_buffer_details;
+
+  DecodeQueuedBitstreamBuffers();
 }
 
 void OmxVideoDecodeAccelerator::DispatchStateReached(OMX_STATETYPE reached) {