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

pngdec: Keep the input state in reset()

Browse source 
It's still valid after a flush and we might not get a new one.
This commit is contained in:
Sebastian Dröge 2012-11-12 10:10:15 +01:00
parent ef2cc91eb9
commit f37fca4e00
1 changed files with 31 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
ext/libpng/gstpngdec.c
View file

@ -417,17 +417,6 @@ gst_pngdec_decide_allocation (GstVideoDecoder * bdec, GstQuery * query)
return TRUE;
}
/* Clean up the libpng structures */
static gboolean
gst_pngdec_reset (GstVideoDecoder * decoder, gboolean hard)
{
gst_pngdec_stop (decoder);
gst_pngdec_start (decoder);
return TRUE;
}
static gboolean
gst_pngdec_libpng_init (GstPngDec * pngdec)
{
@ -476,20 +465,10 @@ endinfo_failed:
}
}
static gboolean
gst_pngdec_start (GstVideoDecoder * decoder)
static void
gst_pngdec_libpng_clear (GstPngDec * pngdec)
{
GstPngDec *pngdec = (GstPngDec *) decoder;
gst_pngdec_libpng_init (pngdec);
return TRUE;
}
static gboolean
gst_pngdec_stop (GstVideoDecoder * decoder)
{
GstPngDec *pngdec = (GstPngDec *) decoder;
png_infopp info = NULL, endinfo = NULL;
GST_LOG ("cleaning up libpng structures");
@ -510,6 +489,24 @@ gst_pngdec_stop (GstVideoDecoder * decoder)
}
pngdec->color_type = -1;
}
static gboolean
gst_pngdec_start (GstVideoDecoder * decoder)
{
GstPngDec *pngdec = (GstPngDec *) decoder;
gst_pngdec_libpng_init (pngdec);
return TRUE;
}
static gboolean
gst_pngdec_stop (GstVideoDecoder * decoder)
{
GstPngDec *pngdec = (GstPngDec *) decoder;
gst_pngdec_libpng_clear (pngdec);
if (pngdec->input_state) {
gst_video_codec_state_unref (pngdec->input_state);
@ -522,3 +519,13 @@ gst_pngdec_stop (GstVideoDecoder * decoder)
return TRUE;
}
/* Clean up the libpng structures */
static gboolean
gst_pngdec_reset (GstVideoDecoder * decoder, gboolean hard)
{
gst_pngdec_libpng_clear (decoder);
gst_pngdec_libpng_init (decoder);
return TRUE;
}