Chromium Code Reviews| Index: content/common/gpu/media/video_decode_accelerator_unittest.cc |
| diff --git a/content/common/gpu/media/video_decode_accelerator_unittest.cc b/content/common/gpu/media/video_decode_accelerator_unittest.cc |
| index 0c64f37f3bb5e7a9c014d730dcb2dcd1636cfa2a..e707f697948ff25170b6e687b0bd168e05f5e284 100644 |
| --- a/content/common/gpu/media/video_decode_accelerator_unittest.cc |
| +++ b/content/common/gpu/media/video_decode_accelerator_unittest.cc |
| @@ -729,8 +729,16 @@ void GLRenderingVDAClient::NotifyEndOfBitstreamBuffer( |
| // 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()) { |
| + if (outstanding_decodes_ == 0) { |
|
Pawel Osciak
2015/09/04 08:15:30
Please add a TODO explaining we should not have to
Owen Lin
2015/09/07 03:54:18
Done.
|
| + decoder_->Flush(); |
| + SetState(CS_FLUSHING); |
| + } |
| + } else if (decode_calls_per_second_ == 0) { |
| DecodeNextFragment(); |
| + } |
| } |
| void GLRenderingVDAClient::NotifyFlushDone() { |
| @@ -922,13 +930,8 @@ static bool FragmentHasConfigInfo(const uint8* data, size_t size, |
| 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) { |