mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

jpegdec: Clean up handling of reset/start/stop

Browse source
This commit is contained in:
Sebastian Dröge 2013-07-25 14:12:56 +02:00
parent a53dcf98f8
commit 6f39f5d49f
1 changed files with 7 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
ext/jpeg/gstjpegdec.c
View file

@ -98,7 +98,6 @@ static void gst_jpeg_dec_get_property (GObject * object, guint prop_id,
static gboolean gst_jpeg_dec_set_format (GstVideoDecoder * dec, static gboolean gst_jpeg_dec_set_format (GstVideoDecoder * dec,
GstVideoCodecState * state); GstVideoCodecState * state);
static gboolean gst_jpeg_dec_start (GstVideoDecoder * bdec);
static gboolean gst_jpeg_dec_stop (GstVideoDecoder * bdec); static gboolean gst_jpeg_dec_stop (GstVideoDecoder * bdec);
static gboolean gst_jpeg_dec_reset (GstVideoDecoder * bdec, gboolean hard); static gboolean gst_jpeg_dec_reset (GstVideoDecoder * bdec, gboolean hard);
static GstFlowReturn gst_jpeg_dec_parse (GstVideoDecoder * bdec, static GstFlowReturn gst_jpeg_dec_parse (GstVideoDecoder * bdec,
@ -169,7 +168,6 @@ gst_jpeg_dec_class_init (GstJpegDecClass * klass)
"Codec/Decoder/Image", "Codec/Decoder/Image",
"Decode images from JPEG format", "Wim Taymans <wim@fluendo.com>"); "Decode images from JPEG format", "Wim Taymans <wim@fluendo.com>");
vdec_class->start = gst_jpeg_dec_start;
vdec_class->stop = gst_jpeg_dec_stop; vdec_class->stop = gst_jpeg_dec_stop;
vdec_class->reset = gst_jpeg_dec_reset; vdec_class->reset = gst_jpeg_dec_reset;
vdec_class->parse = gst_jpeg_dec_parse; vdec_class->parse = gst_jpeg_dec_parse;
@ -1350,6 +1348,13 @@ gst_jpeg_dec_reset (GstVideoDecoder * bdec, gboolean hard)
dec->parse_resync = FALSE; dec->parse_resync = FALSE;
dec->saw_header = FALSE; dec->saw_header = FALSE;
if (hard) {
dec->parse_entropy_len = 0;
dec->parse_resync = FALSE;
gst_video_decoder_set_packetized (bdec, FALSE);
}
return TRUE; return TRUE;
} }
@ -1397,20 +1402,6 @@ gst_jpeg_dec_get_property (GObject * object, guint prop_id, GValue * value,
} }
} }
static gboolean
gst_jpeg_dec_start (GstVideoDecoder * bdec)
{
GstJpegDec *dec = (GstJpegDec *) bdec;
dec->error_count = 0;
dec->parse_entropy_len = 0;
dec->parse_resync = FALSE;
gst_video_decoder_set_packetized (bdec, FALSE);
return TRUE;
}
static gboolean static gboolean
gst_jpeg_dec_stop (GstVideoDecoder * bdec) gst_jpeg_dec_stop (GstVideoDecoder * bdec)
{ {