mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 01:00:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

ffmpegviddec: Flush and drain when needed

Browse source 
we need to flush avcodec internal state on hard resets
we need to drain out pending buffers on EOS and soft resets
This commit is contained in:
Edward Hervey 2012-04-26 17:00:43 +02:00
parent 252c5e0a92
commit 6d2b483e15
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
ext/ffmpeg/gstffmpegviddec.c
View file

@ -152,6 +152,7 @@ static int gst_ffmpegviddec_get_buffer (AVCodecContext * context,
static void gst_ffmpegviddec_release_buffer (AVCodecContext * context, static void gst_ffmpegviddec_release_buffer (AVCodecContext * context,
AVFrame * picture); AVFrame * picture);
static GstFlowReturn gst_ffmpegviddec_finish (GstVideoDecoder * decoder);
static void gst_ffmpegviddec_drain (GstFFMpegVidDec * ffmpegdec); static void gst_ffmpegviddec_drain (GstFFMpegVidDec * ffmpegdec);
#define GST_FFDEC_PARAMS_QDATA g_quark_from_static_string("ffdec-params") #define GST_FFDEC_PARAMS_QDATA g_quark_from_static_string("ffdec-params")
@ -298,6 +299,7 @@ gst_ffmpegviddec_class_init (GstFFMpegVidDecClass * klass)
viddec_class->handle_frame = gst_ffmpegviddec_handle_frame; viddec_class->handle_frame = gst_ffmpegviddec_handle_frame;
viddec_class->stop = gst_ffmpegviddec_stop; viddec_class->stop = gst_ffmpegviddec_stop;
viddec_class->reset = gst_ffmpegviddec_reset; viddec_class->reset = gst_ffmpegviddec_reset;
viddec_class->finish = gst_ffmpegviddec_finish;
} }
static void static void
@ -1384,13 +1386,26 @@ gst_ffmpegviddec_stop (GstVideoDecoder * decoder)
return TRUE; return TRUE;
} }
static GstFlowReturn
gst_ffmpegviddec_finish (GstVideoDecoder * decoder)
{
GstFFMpegVidDec *ffmpegdec = (GstFFMpegVidDec *) decoder;
gst_ffmpegviddec_drain (ffmpegdec);
return GST_FLOW_OK;
}
static gboolean static gboolean
gst_ffmpegviddec_reset (GstVideoDecoder * decoder, gboolean hard) gst_ffmpegviddec_reset (GstVideoDecoder * decoder, gboolean hard)
{ {
GstFFMpegVidDec *ffmpegdec = (GstFFMpegVidDec *) decoder; GstFFMpegVidDec *ffmpegdec = (GstFFMpegVidDec *) decoder;
if (ffmpegdec->opened) if (ffmpegdec->opened) {
if (!hard)
gst_ffmpegviddec_drain (ffmpegdec); gst_ffmpegviddec_drain (ffmpegdec);
avcodec_flush_buffers (ffmpegdec->context);
}
return TRUE; return TRUE;
} }