| Index: media/filters/gpu_video_decoder.cc
|
| diff --git a/media/filters/gpu_video_decoder.cc b/media/filters/gpu_video_decoder.cc
|
| index 7415db87ac0bb4b4513313a1683fbfc82ea49a8c..00f93ad39dfa9206bc390a9e460d228e064554ad 100644
|
| --- a/media/filters/gpu_video_decoder.cc
|
| +++ b/media/filters/gpu_video_decoder.cc
|
| @@ -200,20 +200,27 @@ void GpuVideoDecoder::Read(const ReadCB& read_cb) {
|
| }
|
|
|
| void GpuVideoDecoder::RequestBufferDecode(
|
| + DemuxerStream::Status status,
|
| const scoped_refptr<DecoderBuffer>& buffer) {
|
| + DCHECK_EQ(status != DemuxerStream::kOk, !buffer);
|
| +
|
| if (!gvd_loop_proxy_->BelongsToCurrentThread()) {
|
| gvd_loop_proxy_->PostTask(FROM_HERE, base::Bind(
|
| - &GpuVideoDecoder::RequestBufferDecode, this, buffer));
|
| + &GpuVideoDecoder::RequestBufferDecode, this, status, buffer));
|
| return;
|
| }
|
| demuxer_read_in_progress_ = false;
|
|
|
| - if (!buffer) {
|
| + if (status != DemuxerStream::kOk) {
|
| if (pending_read_cb_.is_null())
|
| return;
|
|
|
| + // TODO(acolwell): Add support for reinitializing the decoder when
|
| + // |status| == kConfigChanged. For now we just trigger a decode error.
|
| + DecoderStatus decoder_status =
|
| + (status == DemuxerStream::kAborted) ? kOk : kDecodeError;
|
| gvd_loop_proxy_->PostTask(FROM_HERE, base::Bind(
|
| - pending_read_cb_, kOk, scoped_refptr<VideoFrame>()));
|
| + pending_read_cb_, decoder_status, scoped_refptr<VideoFrame>()));
|
| pending_read_cb_.Reset();
|
| return;
|
| }
|
|
|