mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-31 03:29:50 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpegtsmux: also properly reset and free pad data

Browse source
This commit is contained in:
Mark Nauwelaerts 2012-06-05 12:17:26 +02:00 committed by Sebastian Dröge
parent ec109c390f
commit c195a015e1
1 changed files with 37 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
gst/mpegtsmux/mpegtsmux.c
View file

@ -251,9 +251,37 @@ mpegtsmux_init (MpegTsMux * mux, MpegTsMuxClass * g_class)
mpegtsmux_reset (mux, TRUE); mpegtsmux_reset (mux, TRUE);
} }
static void
mpegtsmux_pad_reset (MpegTsPadData * pad_data)
{
pad_data->pid = 0;
pad_data->last_ts = GST_CLOCK_TIME_NONE;
pad_data->cur_ts = GST_CLOCK_TIME_NONE;
pad_data->prog_id = -1;
pad_data->eos = FALSE;
if (pad_data->free_func)
pad_data->free_func (pad_data->prepare_data);
pad_data->prepare_data = NULL;
pad_data->prepare_func = NULL;
pad_data->free_func = NULL;
if (pad_data->queued_buf)
gst_buffer_replace (&pad_data->queued_buf, NULL);
if (pad_data->codec_data)
gst_buffer_replace (&pad_data->codec_data, NULL);
/* reference owned elsewhere */
pad_data->stream = NULL;
pad_data->prog = NULL;
}
static void static void
mpegtsmux_reset (MpegTsMux * mux, gboolean alloc) mpegtsmux_reset (MpegTsMux * mux, gboolean alloc)
{ {
GSList *walk;
mux->first = TRUE; mux->first = TRUE;
mux->last_flow_ret = GST_FLOW_OK; mux->last_flow_ret = GST_FLOW_OK;
mux->first_pcr = TRUE; mux->first_pcr = TRUE;
@ -286,6 +314,11 @@ mpegtsmux_reset (MpegTsMux * mux, gboolean alloc)
gst_event_replace (&mux->force_key_unit_event, NULL); gst_event_replace (&mux->force_key_unit_event, NULL);
gst_buffer_replace (&mux->out_buffer, NULL); gst_buffer_replace (&mux->out_buffer, NULL);
GST_COLLECT_PADS2_STREAM_LOCK (mux->collect);
for (walk = mux->collect->data; walk != NULL; walk = g_slist_next (walk))
mpegtsmux_pad_reset ((MpegTsPadData *) walk->data);
GST_COLLECT_PADS2_STREAM_UNLOCK (mux->collect);
if (alloc) { if (alloc) {
mux->tsmux = tsmux_new (); mux->tsmux = tsmux_new ();
tsmux_set_write_func (mux->tsmux, new_packet_cb, mux); tsmux_set_write_func (mux->tsmux, new_packet_cb, mux);
@ -1008,19 +1041,14 @@ mpegtsmux_request_new_pad (GstElement * element,
pad = gst_pad_new_from_template (templ, pad_name); pad = gst_pad_new_from_template (templ, pad_name);
g_free (pad_name); g_free (pad_name);
pad_data = (MpegTsPadData *) gst_collect_pads2_add_pad (mux->collect, pad, pad_data = (MpegTsPadData *)
sizeof (MpegTsPadData)); gst_collect_pads2_add_pad_full (mux->collect, pad, sizeof (MpegTsPadData),
(GstCollectData2DestroyNotify) (mpegtsmux_pad_reset), TRUE);
if (pad_data == NULL) if (pad_data == NULL)
goto pad_failure; goto pad_failure;
mpegtsmux_pad_reset (pad_data);
pad_data->pid = pid; pad_data->pid = pid;
pad_data->last_ts = GST_CLOCK_TIME_NONE;
pad_data->codec_data = NULL;
pad_data->prepare_data = NULL;
pad_data->prepare_func = NULL;
pad_data->free_func = NULL;
pad_data->prog_id = -1;
pad_data->prog = NULL;
if (G_UNLIKELY (!gst_element_add_pad (element, pad))) if (G_UNLIKELY (!gst_element_add_pad (element, pad)))
goto could_not_add; goto could_not_add;