mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpegtbase: Avoid copying GstStructure

Browse source
This commit is contained in:
Edward Hervey 2012-06-10 11:21:41 +02:00 committed by Sebastian Dröge
parent 94c68115ef
commit 8fd2d43d60
1 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
gst/mpegtsdemux/mpegtsbase.c
View file

@ -729,7 +729,7 @@ mpegts_base_activate_program (MpegTSBase * base, MpegTSBaseProgram * program,
if (program->pmt_info) if (program->pmt_info)
gst_structure_free (program->pmt_info); gst_structure_free (program->pmt_info);
program->pmt_info = gst_structure_copy (pmt_info); program->pmt_info = pmt_info;
program->pmt_pid = pmt_pid; program->pmt_pid = pmt_pid;
program->pcr_pid = pcr_pid; program->pcr_pid = pcr_pid;
@ -852,7 +852,7 @@ mpegts_base_apply_pat (MpegTSBase * base, GstStructure * pat_info)
*/ */
old_pat = base->pat; old_pat = base->pat;
base->pat = gst_structure_copy (pat_info); base->pat = pat_info;
gst_element_post_message (GST_ELEMENT_CAST (base), gst_element_post_message (GST_ELEMENT_CAST (base),
gst_message_new_element (GST_OBJECT (base), gst_message_new_element (GST_OBJECT (base),
@ -983,14 +983,11 @@ mpegts_base_apply_pmt (MpegTSBase * base,
} else } else
program = old_program; program = old_program;
/* First activate program */ /* activate program */
/* Ownership of pmt_info is given to the program */
mpegts_base_activate_program (base, program, pmt_pid, pmt_info, mpegts_base_activate_program (base, program, pmt_pid, pmt_info,
initial_program); initial_program);
/* if (program->pmt_info) */
/* gst_structure_free (program->pmt_info); */
/* program->pmt_info = NULL; */
gst_element_post_message (GST_ELEMENT_CAST (base), gst_element_post_message (GST_ELEMENT_CAST (base),
gst_message_new_element (GST_OBJECT (base), gst_message_new_element (GST_OBJECT (base),
gst_structure_copy (pmt_info))); gst_structure_copy (pmt_info)));
@ -1000,12 +997,14 @@ mpegts_base_apply_pmt (MpegTSBase * base,
no_program: no_program:
{ {
GST_ERROR ("Attempted to apply a PMT on a program that wasn't created"); GST_ERROR ("Attempted to apply a PMT on a program that wasn't created");
gst_structure_free (pmt_info);
return; return;
} }
same_program: same_program:
{ {
GST_DEBUG ("Not applying identical program"); GST_DEBUG ("Not applying identical program");
gst_structure_free (pmt_info);
return; return;
} }
} }
@ -1016,8 +1015,7 @@ mpegts_base_apply_cat (MpegTSBase * base, GstStructure * cat_info)
GST_DEBUG_OBJECT (base, "CAT %" GST_PTR_FORMAT, cat_info); GST_DEBUG_OBJECT (base, "CAT %" GST_PTR_FORMAT, cat_info);
gst_element_post_message (GST_ELEMENT_CAST (base), gst_element_post_message (GST_ELEMENT_CAST (base),
gst_message_new_element (GST_OBJECT (base), gst_message_new_element (GST_OBJECT (base), cat_info));
gst_structure_copy (cat_info)));
} }
static void static void
@ -1027,8 +1025,7 @@ mpegts_base_apply_nit (MpegTSBase * base,
GST_DEBUG_OBJECT (base, "NIT %" GST_PTR_FORMAT, nit_info); GST_DEBUG_OBJECT (base, "NIT %" GST_PTR_FORMAT, nit_info);
gst_element_post_message (GST_ELEMENT_CAST (base), gst_element_post_message (GST_ELEMENT_CAST (base),
gst_message_new_element (GST_OBJECT (base), gst_message_new_element (GST_OBJECT (base), nit_info));
gst_structure_copy (nit_info)));
} }
static void static void
@ -1040,8 +1037,7 @@ mpegts_base_apply_sdt (MpegTSBase * base,
mpegts_base_get_tags_from_sdt (base, sdt_info); mpegts_base_get_tags_from_sdt (base, sdt_info);
gst_element_post_message (GST_ELEMENT_CAST (base), gst_element_post_message (GST_ELEMENT_CAST (base),
gst_message_new_element (GST_OBJECT (base), gst_message_new_element (GST_OBJECT (base), sdt_info));
gst_structure_copy (sdt_info)));
} }
static void static void
@ -1053,8 +1049,7 @@ mpegts_base_apply_eit (MpegTSBase * base,
mpegts_base_get_tags_from_eit (base, eit_info); mpegts_base_get_tags_from_eit (base, eit_info);
gst_element_post_message (GST_ELEMENT_CAST (base), gst_element_post_message (GST_ELEMENT_CAST (base),
gst_message_new_element (GST_OBJECT (base), gst_message_new_element (GST_OBJECT (base), eit_info));
gst_structure_copy (eit_info)));
} }
static void static void
@ -1066,8 +1061,7 @@ mpegts_base_apply_tdt (MpegTSBase * base,
gst_structure_copy (tdt_info))); gst_structure_copy (tdt_info)));
GST_MPEGTS_BASE_GET_CLASS (base)->push_event (base, GST_MPEGTS_BASE_GET_CLASS (base)->push_event (base,
gst_event_new_custom (GST_EVENT_CUSTOM_DOWNSTREAM, gst_event_new_custom (GST_EVENT_CUSTOM_DOWNSTREAM, tdt_info));
gst_structure_copy (tdt_info)));
} }
@ -1214,9 +1208,6 @@ mpegts_base_handle_psi (MpegTSBase * base, MpegTSPacketizerSection * section)
break; break;
} }
if (structure)
gst_structure_free (structure);
return res; return res;
} }