X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fmedia%2Ffilters%2Ffake_video_decoder.cc;h=f7f1abd8540b6af9ffbc7b22b3fbfefafb918325;hb=3545e9f2671f595d2a2f3ee75ca0393b01e35ef6;hp=05dc410f870bc1a6fad5ddbd7da11f6f7955b191;hpb=7d210d4c7e9ba36e635eabc5b5780495f8a63292;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/media/filters/fake_video_decoder.cc b/src/media/filters/fake_video_decoder.cc index 05dc410..f7f1abd 100644 --- a/src/media/filters/fake_video_decoder.cc +++ b/src/media/filters/fake_video_decoder.cc @@ -40,6 +40,10 @@ FakeVideoDecoder::~FakeVideoDecoder() { decoded_frames_.clear(); } +std::string FakeVideoDecoder::GetDisplayName() const { + return "FakeVideoDecoder"; +} + void FakeVideoDecoder::Initialize(const VideoDecoderConfig& config, bool low_delay, const PipelineStatusCB& status_cb, @@ -74,6 +78,7 @@ void FakeVideoDecoder::Decode(const scoped_refptr& buffer, decoding_delay_ + held_decode_callbacks_.size()); DCHECK_LT(static_cast(held_decode_callbacks_.size()), max_parallel_decoding_requests_); + DCHECK_NE(state_, STATE_END_OF_STREAM); int buffer_size = buffer->end_of_stream() ? 0 : buffer->data_size(); DecodeCB wrapped_decode_cb = base::Bind(&FakeVideoDecoder::OnFrameDecoded, @@ -223,6 +228,7 @@ void FakeVideoDecoder::RunDecodeCallback(const DecodeCB& decode_cb) { output_cb_.Run(decoded_frames_.front()); decoded_frames_.pop_front(); } + state_ = STATE_NORMAL; } else if (!decoded_frames_.empty()) { output_cb_.Run(decoded_frames_.front()); decoded_frames_.pop_front();