vda_unittest: Fix Flush() is not called when decoding is slow.

content/common/gpu/media/video_decode_accelerator_unittest.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.
 //
 // The bulk of this file is support code; sorry about that.  Here's an overview
 // to hopefully help readers of this code:
 // - RenderingHelper is charged with interacting with X11/{EGL/GLES2,GLX/GL} or
 //   Win/EGL.
 // - ClientState is an enum for the state of the decode client used by the test.
 // - ClientStateNotification is a barrier abstraction that allows the test code
@@ skipping 711 matching lines @@
 }
 
 void GLRenderingVDAClient::NotifyEndOfBitstreamBuffer(
     int32 bitstream_buffer_id) {
   // TODO(fischman): this test currently relies on this notification to make
   // forward progress during a Reset().  But the VDA::Reset() API doesn't
   // guarantee this, so stop relying on it (and remove the notifications from
   // VaapiVideoDecodeAccelerator::FinishReset()).
   ++num_done_bitstream_buffers_;
   --outstanding_decodes_;
-  if (decode_calls_per_second_ == 0)
+
+  // Flush decoder after all BitstreamBuffers are processed.
+  if (encoded_data_next_pos_to_decode_ == encoded_data_.size() &&
+      outstanding_decodes_ == 0) {

[wuchengli, 2015/09/04 03:26:06]

No need to call DecodeNextFragment if reaching the end of encoded data.
if (encoded_data_next_pos_to_decode_ == encoded_data_.size()) {
  if (outstanding_decodes_ == 0) {
    ... 
  }
} else if ... {
}

[Pawel Osciak, 2015/09/04 06:04:40]

Do we need to check outstanding_decodes_? I think it would be better to test by
sending Flush as soon a possible, while decodes are still running, to check the
decoders are behaving correctly.
To avoid sending it more than once, we could do it only if CS_INITIALIZED.

[Owen Lin, 2015/09/04 07:15:43]

Done.

[Owen Lin, 2015/09/04 07:15:44]

This is what I thought. (So I issue the Flush once we send the last frame for
decode). But the test failed on minnie. I think this should be another issue.
How about we still keep the same behavior for this CL and fix the bug (I think
it is) in another.

+    decoder_->Flush();
+    SetState(CS_FLUSHING);
+  } else if (decode_calls_per_second_ == 0) {
     DecodeNextFragment();
+  }
 }
 
 void GLRenderingVDAClient::NotifyFlushDone() {
   if (decoder_deleted())
     return;
 
   SetState(CS_FLUSHED);
   --remaining_play_throughs_;
   DCHECK_GE(remaining_play_throughs_, 0);
   if (decoder_deleted())
@@ skipping 171 matching lines @@
     return (size > 0 && !(data[0] & 0x01));
   }
   // Shouldn't happen at this point.
   LOG(FATAL) << "Invalid profile: " << profile;
   return false;
 }
 
 void GLRenderingVDAClient::DecodeNextFragment() {
   if (decoder_deleted())
     return;
-  if (encoded_data_next_pos_to_decode_ == encoded_data_.size()) {
-    if (outstanding_decodes_ == 0) {
-      decoder_->Flush();
-      SetState(CS_FLUSHING);
-    }
+  if (encoded_data_next_pos_to_decode_ == encoded_data_.size())
     return;
-  }
   size_t end_pos;
   std::string next_fragment_bytes;
   if (encoded_data_next_pos_to_decode_ == 0) {
     next_fragment_bytes = GetBytesForFirstFragment(0, &end_pos);
   } else {
     next_fragment_bytes =
         GetBytesForNextFragment(encoded_data_next_pos_to_decode_, &end_pos);
   }
   size_t next_fragment_size = next_fragment_bytes.size();
 
@@ skipping 707 matching lines @@
   content::VaapiWrapper::PreSandboxInitialization();
 #endif
 
   content::g_env =
       reinterpret_cast<content::VideoDecodeAcceleratorTestEnvironment*>(
           testing::AddGlobalTestEnvironment(
               new content::VideoDecodeAcceleratorTestEnvironment()));
 
   return RUN_ALL_TESTS();
 }