mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-20 04:56:24 +00:00
mpegtsmux: Extend mux->program to a GArray programs
This commit is contained in:
parent
9f90dfee3e
commit
ee31988c7a
2 changed files with 12 additions and 2 deletions
|
@ -196,6 +196,8 @@ mpegtsmux_class_init (MpegTsMuxClass * klass)
|
|||
static void
|
||||
mpegtsmux_init (MpegTsMux * mux, MpegTsMuxClass * g_class)
|
||||
{
|
||||
guint i;
|
||||
|
||||
mux->srcpad =
|
||||
gst_pad_new_from_template (gst_static_pad_template_get
|
||||
(&mpegtsmux_src_factory), "src");
|
||||
|
@ -208,7 +210,11 @@ mpegtsmux_init (MpegTsMux * mux, MpegTsMuxClass * g_class)
|
|||
|
||||
mux->tsmux = tsmux_new ();
|
||||
tsmux_set_write_func (mux->tsmux, new_packet_cb, mux);
|
||||
mux->program = tsmux_program_new (mux->tsmux);
|
||||
|
||||
mux->programs = g_array_sized_new (FALSE, TRUE, sizeof (TsMuxProgram *),
|
||||
MAX_PROG_NUMBER);
|
||||
for (i = 0; i < MAX_PROG_NUMBER; i++)
|
||||
g_array_index (mux->programs, TsMuxProgram *, i) = NULL;
|
||||
|
||||
mux->first = TRUE;
|
||||
mux->last_flow_ret = GST_FLOW_OK;
|
||||
|
@ -242,6 +248,10 @@ mpegtsmux_dispose (GObject * object)
|
|||
gst_structure_free (mux->prog_map);
|
||||
mux->prog_map = NULL;
|
||||
}
|
||||
if (mux->programs) {
|
||||
g_array_free (mux->programs, TRUE);
|
||||
mux->programs = NULL;
|
||||
}
|
||||
|
||||
GST_CALL_PARENT (G_OBJECT_CLASS, dispose, (object));
|
||||
}
|
||||
|
|
|
@ -109,7 +109,7 @@ struct MpegTsMux {
|
|||
GstCollectPads *collect;
|
||||
|
||||
TsMux *tsmux;
|
||||
TsMuxProgram *program;
|
||||
GArray *programs;
|
||||
GstStructure *prog_map;
|
||||
|
||||
gboolean first;
|
||||
|
|
Loading…
Reference in a new issue