From 72933810f5dcd0e5ca401d2f3bfe3c2a638fb5c4 Mon Sep 17 00:00:00 2001 From: Seungha Yang Date: Wed, 16 Sep 2020 03:13:09 +0900 Subject: avviddec: Don't return GST_FLOW_EOS from drain()/finish() AVERROR_EOF means that it's fully drained, but it doesn't mean that that end of stream. Part-of: --- ext/libav/gstavviddec.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'ext') diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c index d9eb178..b21c231 100644 --- a/ext/libav/gstavviddec.c +++ b/ext/libav/gstavviddec.c @@ -1824,6 +1824,14 @@ gst_ffmpegviddec_drain (GstVideoDecoder * decoder) } while (got_frame && ret == GST_FLOW_OK); avcodec_flush_buffers (ffmpegdec->context); + /* FFMpeg will return AVERROR_EOF if it's internal was fully drained + * then we are translating it to GST_FLOW_EOS. However, because this behavior + * is fullly internal stuff of this implementation and gstvideodecoer + * baseclass doesn't convert this GST_FLOW_EOS to GST_FLOW_OK, + * convert this flow retturn by ourselves */ + if (ret == GST_FLOW_EOS) + ret = GST_FLOW_OK; + done: return ret; -- cgit v1.2.1