Workaround for DXVA incorrectly claiming to be done with Decode() too soon.

media/filters/gpu_video_decoder.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 "media/filters/gpu_video_decoder.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
@@ skipping 202 matching lines @@
     case kNormal:
       EnsureDemuxOrDecode();
       break;
     case kDrainingDecoder:
       // Do nothing.  Will be satisfied either by a PictureReady or
       // NotifyFlushDone below.
       break;
   }
 }
 
+bool GpuVideoDecoder::CanMoreDecodeWorkBeDone() {
+#if defined(OS_WIN)
+  // TODO(ananta): the DXVA decoder stymies our attempt to pipeline Decode()s by
+  // claiming to be done with previous work way too quickly.  Until this is
+  // resolved we don't pipeline work.  http://crbug.com/150925
+  return bitstream_buffers_in_decoder_.empty() && !pending_read_cb_.is_null();
+#else
+  return bitstream_buffers_in_decoder_.size() < kMaxInFlightDecodes;
+#endif
+}
+
 void GpuVideoDecoder::RequestBufferDecode(
     DemuxerStream::Status status,
     const scoped_refptr<DecoderBuffer>& buffer) {
   DCHECK_EQ(status != DemuxerStream::kOk, !buffer) << status;
 
   if (!gvd_loop_proxy_->BelongsToCurrentThread()) {
     gvd_loop_proxy_->PostTask(FROM_HERE, base::Bind(
         &GpuVideoDecoder::RequestBufferDecode, this, status, buffer));
     return;
   }
@@ skipping 36 matching lines @@
   BitstreamBuffer bitstream_buffer(
       next_bitstream_buffer_id_++, shm_buffer->shm->handle(), size);
   bool inserted = bitstream_buffers_in_decoder_.insert(std::make_pair(
       bitstream_buffer.id(), BufferPair(shm_buffer, buffer))).second;
   DCHECK(inserted);
   RecordBufferData(bitstream_buffer, *buffer);
 
   vda_loop_proxy_->PostTask(FROM_HERE, base::Bind(
       &VideoDecodeAccelerator::Decode, weak_vda_, bitstream_buffer));
 
-  if (bitstream_buffers_in_decoder_.size() < kMaxInFlightDecodes)
+  if (CanMoreDecodeWorkBeDone())
     EnsureDemuxOrDecode();
 }
 
 void GpuVideoDecoder::RecordBufferData(
     const BitstreamBuffer& bitstream_buffer, const Buffer& buffer) {
   input_buffer_data_.push_front(BufferData(
       bitstream_buffer.id(), buffer.GetTimestamp(),
       demuxer_stream_->video_decoder_config().natural_size()));
   // Why this value?  Because why not.  avformat.h:MAX_REORDER_DELAY is 16, but
   // that's too small for some pathological B-frame test videos.  The cost of
@@ skipping 179 matching lines @@
   PutSHM(it->second.shm_buffer);
   const scoped_refptr<DecoderBuffer>& buffer = it->second.buffer;
   if (buffer->GetDataSize()) {
     PipelineStatistics statistics;
     statistics.video_bytes_decoded = buffer->GetDataSize();
     statistics_cb_.Run(statistics);
   }
   bitstream_buffers_in_decoder_.erase(it);
 
   if (pending_reset_cb_.is_null() && state_ != kDrainingDecoder &&
-      bitstream_buffers_in_decoder_.size() < kMaxInFlightDecodes) {
+      CanMoreDecodeWorkBeDone()) {
     EnsureDemuxOrDecode();
   }
 }
 
 GpuVideoDecoder::~GpuVideoDecoder() {
   DCHECK(!vda_.get());  // Stop should have been already called.
   DCHECK(pending_read_cb_.is_null());
   for (size_t i = 0; i < available_shm_segments_.size(); ++i) {
     available_shm_segments_[i]->shm->Close();
     delete available_shm_segments_[i];
@@ skipping 65 matching lines @@
 
   error_occured_ = true;
 
   if (!pending_read_cb_.is_null()) {
     base::ResetAndReturn(&pending_read_cb_).Run(kDecodeError, NULL);
     return;
   }
 }
 
 }  // namespace media