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

ext/mpeg2dec/gstmpeg2dec.*: Simplify and don't leak our buffer pool.

Browse source 
Original commit message from CVS:
* ext/mpeg2dec/gstmpeg2dec.c: (gst_mpeg2dec_finalize),
(gst_mpeg2dec_reset), (clear_buffers), (handle_picture),
(gst_mpeg2dec_sink_convert), (gst_mpeg2dec_src_convert),
(gst_mpeg2dec_change_state):
* ext/mpeg2dec/gstmpeg2dec.h:
Simplify and don't leak our buffer pool.
Use _scale_int.
Remove unfixed bug number from previous ChangeLog entry.
This commit is contained in:
Wim Taymans 2006-06-07 17:05:48 +00:00
parent 78d4166a4f
commit a489cb42e7
3 changed files with 48 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ChangeLog
View file

@ -1,3 +1,14 @@
2006-06-07 Wim Taymans <wim@fluendo.com>
* ext/mpeg2dec/gstmpeg2dec.c: (gst_mpeg2dec_finalize),
(gst_mpeg2dec_reset), (clear_buffers), (handle_picture),
(gst_mpeg2dec_sink_convert), (gst_mpeg2dec_src_convert),
(gst_mpeg2dec_change_state):
* ext/mpeg2dec/gstmpeg2dec.h:
Simplify and don't leak our buffer pool.
Use _scale_int.
Remove unfixed bug number from previous ChangeLog entry.
2006-06-07 Wim Taymans <wim@fluendo.com> 2006-06-07 Wim Taymans <wim@fluendo.com>
* ext/mpeg2dec/gstmpeg2dec.c: (gst_mpeg2dec_base_init), * ext/mpeg2dec/gstmpeg2dec.c: (gst_mpeg2dec_base_init),
@ -17,7 +28,7 @@
Always give libmpeg2 a valid fbuf when it wants one. Always give libmpeg2 a valid fbuf when it wants one.
don't trust libmpeg to discard our buffers but manage it don't trust libmpeg to discard our buffers but manage it
ourselves. ourselves.
Fixes #343627, #327350, #335288 Fixes #343627, #335288
2006-06-05 Sebastien Moutte <sebastien@moutte.net> 2006-06-05 Sebastien Moutte <sebastien@moutte.net>

46
ext/mpeg2dec/gstmpeg2dec.c
View file

@ -123,6 +123,8 @@ static GstStateChangeReturn gst_mpeg2dec_change_state (GstElement * element,
static gboolean gst_mpeg2dec_sink_event (GstPad * pad, GstEvent * event); static gboolean gst_mpeg2dec_sink_event (GstPad * pad, GstEvent * event);
static GstFlowReturn gst_mpeg2dec_chain (GstPad * pad, GstBuffer * buf); static GstFlowReturn gst_mpeg2dec_chain (GstPad * pad, GstBuffer * buf);
static void clear_buffers (GstMpeg2dec * mpeg2dec);
//static gboolean gst_mpeg2dec_sink_query (GstPad * pad, GstQuery * query); //static gboolean gst_mpeg2dec_sink_query (GstPad * pad, GstQuery * query);
#if 0 #if 0
@ -255,6 +257,7 @@ gst_mpeg2dec_finalize (GObject * object)
mpeg2_close (mpeg2dec->decoder); mpeg2_close (mpeg2dec->decoder);
mpeg2dec->decoder = NULL; mpeg2dec->decoder = NULL;
} }
clear_buffers (mpeg2dec);
g_free (mpeg2dec->dummybuf[0]); g_free (mpeg2dec->dummybuf[0]);
mpeg2dec->dummybuf[0] = NULL; mpeg2dec->dummybuf[0] = NULL;
@ -272,7 +275,7 @@ gst_mpeg2dec_reset (GstMpeg2dec * mpeg2dec)
mpeg2dec->discont_state = MPEG2DEC_DISC_NEW_PICTURE; mpeg2dec->discont_state = MPEG2DEC_DISC_NEW_PICTURE;
mpeg2dec->frame_period = 0; mpeg2dec->frame_period = 0;
mpeg2dec->need_sequence = TRUE; mpeg2dec->need_sequence = TRUE;
mpeg2dec->next_time = 0; mpeg2dec->next_time = -1;
mpeg2dec->offset = 0; mpeg2dec->offset = 0;
mpeg2dec->error_count = 0; mpeg2dec->error_count = 0;
mpeg2_reset (mpeg2dec->decoder, 1); mpeg2_reset (mpeg2dec->decoder, 1);
@ -623,12 +626,29 @@ negotiate_failed:
} }
} }
static void
clear_buffers (GstMpeg2dec * mpeg2dec)
{
gint i;
GstBuffer **bufpen;
for (i = 0; i < 4; i++) {
bufpen = &mpeg2dec->ip_buffers[i];
if (*bufpen)
gst_buffer_unref (*bufpen);
*bufpen = NULL;
}
bufpen = &mpeg2dec->b_buffer;
if (*bufpen)
gst_buffer_unref (*bufpen);
*bufpen = NULL;
}
static GstFlowReturn static GstFlowReturn
handle_picture (GstMpeg2dec * mpeg2dec, const mpeg2_info_t * info) handle_picture (GstMpeg2dec * mpeg2dec, const mpeg2_info_t * info)
{ {
gboolean key_frame = FALSE; gboolean key_frame = FALSE;
GstBuffer *outbuf, **bufpen; GstBuffer *outbuf, **bufpen;
GstMpeg2Buf *mpbuf;
GstFlowReturn ret; GstFlowReturn ret;
gint type; gint type;
@ -650,10 +670,7 @@ handle_picture (GstMpeg2dec * mpeg2dec, const mpeg2_info_t * info)
case PIC_FLAG_CODING_TYPE_I: case PIC_FLAG_CODING_TYPE_I:
mpeg2_skip (mpeg2dec->decoder, 0); mpeg2_skip (mpeg2dec->decoder, 0);
case PIC_FLAG_CODING_TYPE_P: case PIC_FLAG_CODING_TYPE_P:
mpbuf = &mpeg2dec->ip_buffers[mpeg2dec->ip_bufpos]; bufpen = &mpeg2dec->ip_buffers[mpeg2dec->ip_bufpos];
bufpen = &mpbuf->buffer;
mpbuf->type = type;
GST_DEBUG_OBJECT (mpeg2dec, "I/P unref %p, ref %p", *bufpen, outbuf); GST_DEBUG_OBJECT (mpeg2dec, "I/P unref %p, ref %p", *bufpen, outbuf);
if (*bufpen) if (*bufpen)
gst_buffer_unref (*bufpen); gst_buffer_unref (*bufpen);
@ -661,9 +678,7 @@ handle_picture (GstMpeg2dec * mpeg2dec, const mpeg2_info_t * info)
mpeg2dec->ip_bufpos = (mpeg2dec->ip_bufpos + 1) & 3; mpeg2dec->ip_bufpos = (mpeg2dec->ip_bufpos + 1) & 3;
break; break;
case PIC_FLAG_CODING_TYPE_B: case PIC_FLAG_CODING_TYPE_B:
mpbuf = &mpeg2dec->b_buffer; bufpen = &mpeg2dec->b_buffer;
mpbuf->type = type;
bufpen = &mpbuf->buffer;
GST_DEBUG_OBJECT (mpeg2dec, "B unref %p, ref %p", *bufpen, outbuf); GST_DEBUG_OBJECT (mpeg2dec, "B unref %p, ref %p", *bufpen, outbuf);
if (*bufpen) if (*bufpen)
gst_buffer_unref (*bufpen); gst_buffer_unref (*bufpen);
@ -1120,7 +1135,9 @@ gst_mpeg2dec_sink_convert (GstPad * pad, GstFormat src_format, gint64 src_value,
switch (*dest_format) { switch (*dest_format) {
case GST_FORMAT_TIME: case GST_FORMAT_TIME:
if (info->sequence && info->sequence->byte_rate) { if (info->sequence && info->sequence->byte_rate) {
*dest_value = GST_SECOND * src_value / info->sequence->byte_rate; *dest_value =
gst_util_uint64_scale_int (GST_SECOND, src_value,
info->sequence->byte_rate);
GST_WARNING_OBJECT (mpeg2dec, "dest_value:%" GST_TIME_FORMAT, GST_WARNING_OBJECT (mpeg2dec, "dest_value:%" GST_TIME_FORMAT,
GST_TIME_ARGS (*dest_value)); GST_TIME_ARGS (*dest_value));
break; break;
@ -1135,7 +1152,9 @@ gst_mpeg2dec_sink_convert (GstPad * pad, GstFormat src_format, gint64 src_value,
switch (*dest_format) { switch (*dest_format) {
case GST_FORMAT_BYTES: case GST_FORMAT_BYTES:
if (info->sequence && info->sequence->byte_rate) { if (info->sequence && info->sequence->byte_rate) {
*dest_value = src_value * info->sequence->byte_rate / GST_SECOND; *dest_value =
gst_util_uint64_scale_int (src_value, info->sequence->byte_rate,
GST_SECOND);
break; break;
} else if (info->sequence) } else if (info->sequence)
GST_WARNING_OBJECT (mpeg2dec, GST_WARNING_OBJECT (mpeg2dec,
@ -1186,7 +1205,9 @@ gst_mpeg2dec_src_convert (GstPad * pad, GstFormat src_format, gint64 src_value,
scale = 6 * (mpeg2dec->width * mpeg2dec->height >> 2); scale = 6 * (mpeg2dec->width * mpeg2dec->height >> 2);
case GST_FORMAT_DEFAULT: case GST_FORMAT_DEFAULT:
if (info->sequence && mpeg2dec->frame_period) { if (info->sequence && mpeg2dec->frame_period) {
*dest_value = src_value * scale / mpeg2dec->frame_period; *dest_value =
gst_util_uint64_scale_int (src_value, scale,
mpeg2dec->frame_period);
break; break;
} }
default: default:
@ -1562,6 +1583,7 @@ gst_mpeg2dec_change_state (GstElement * element, GstStateChange transition)
mpeg2dec->decoder = NULL; mpeg2dec->decoder = NULL;
mpeg2dec->info = NULL; mpeg2dec->info = NULL;
} }
clear_buffers (mpeg2dec);
break; break;
default: default:
break; break;

9
ext/mpeg2dec/gstmpeg2dec.h
View file

@ -59,11 +59,6 @@ typedef enum
MPEG2DEC_DISC_NEW_KEYFRAME MPEG2DEC_DISC_NEW_KEYFRAME
} DiscontState; } DiscontState;
typedef struct {
gint type;
GstBuffer *buffer;
} GstMpeg2Buf;
struct _GstMpeg2dec { struct _GstMpeg2dec {
GstElement element; GstElement element;
@ -80,8 +75,8 @@ struct _GstMpeg2dec {
/* buffer management */ /* buffer management */
guint ip_bufpos; guint ip_bufpos;
GstMpeg2Buf ip_buffers[4]; GstBuffer *ip_buffers[4];
GstMpeg2Buf b_buffer; GstBuffer *b_buffer;
DiscontState discont_state; DiscontState discont_state;