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

tsmux: Replace streams GArray with GPtrArray

Browse source 
This is more appropriate.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1510>
This commit is contained in:
Jan Alexander Steffens (heftig) 2022-01-10 12:31:42 +01:00 committed by GStreamer Marge Bot
parent 64ac6a1d16
commit 2acaa3940a
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
subprojects/gst-plugins-bad/gst/mpegtsmux/tsmux/tsmux.c
View file

@ -456,7 +456,8 @@ tsmux_program_new (TsMux * mux, gint prog_id)
program->scte35_null_interval = TSMUX_DEFAULT_SCTE_35_NULL_INTERVAL; program->scte35_null_interval = TSMUX_DEFAULT_SCTE_35_NULL_INTERVAL;
program->next_scte35_pcr = -1; program->next_scte35_pcr = -1;
program->streams = g_array_sized_new (FALSE, TRUE, sizeof (TsMuxStream *), 1); /* mux->streams owns the streams */
program->streams = g_ptr_array_new_full (1, NULL);
mux->programs = g_list_prepend (mux->programs, program); mux->programs = g_list_prepend (mux->programs, program);
mux->nb_programs++; mux->nb_programs++;
@ -613,7 +614,7 @@ tsmux_program_add_stream (TsMuxProgram * program, TsMuxStream * stream)
stream->program_array_index = program->streams->len; stream->program_array_index = program->streams->len;
g_array_append_val (program->streams, stream); g_ptr_array_add (program->streams, stream);
program->pmt_changed = TRUE; program->pmt_changed = TRUE;
} }
@ -744,21 +745,21 @@ tsmux_find_stream (TsMux * mux, guint16 pid)
static gboolean static gboolean
tsmux_program_remove_stream (TsMuxProgram * program, TsMuxStream * stream) tsmux_program_remove_stream (TsMuxProgram * program, TsMuxStream * stream)
{ {
GArray *streams = program->streams; GPtrArray *streams = program->streams;
TsMuxStream *s; TsMuxStream *s;
gint i; gint i;
i = stream->program_array_index; i = stream->program_array_index;
g_return_val_if_fail (i >= 0, FALSE); g_return_val_if_fail (i >= 0, FALSE);
s = g_array_index (streams, TsMuxStream *, i); s = g_ptr_array_index (streams, i);
g_return_val_if_fail (s == stream, FALSE); g_return_val_if_fail (s == stream, FALSE);
g_array_remove_index (streams, i); g_ptr_array_remove_index (streams, i);
/* Correct indices of remaining streams, if any */ /* Correct indices of remaining streams, if any */
for (; i < streams->len; i++) { for (; i < streams->len; i++) {
s = g_array_index (streams, TsMuxStream *, i); s = g_ptr_array_index (streams, i);
s->program_array_index -= 1; s->program_array_index -= 1;
} }
@ -1653,7 +1654,7 @@ tsmux_program_free (TsMuxProgram * program)
if (program->scte35_null_section) if (program->scte35_null_section)
tsmux_section_free (program->scte35_null_section); tsmux_section_free (program->scte35_null_section);
g_array_free (program->streams, TRUE); g_ptr_array_free (program->streams, TRUE);
g_slice_free (TsMuxProgram, program); g_slice_free (TsMuxProgram, program);
} }
@ -1772,7 +1773,7 @@ tsmux_write_pmt (TsMux * mux, TsMuxProgram * program)
/* Write out the entries */ /* Write out the entries */
for (i = 0; i < program->streams->len; i++) { for (i = 0; i < program->streams->len; i++) {
GstMpegtsPMTStream *pmt_stream; GstMpegtsPMTStream *pmt_stream;
TsMuxStream *stream = g_array_index (program->streams, TsMuxStream *, i); TsMuxStream *stream = g_ptr_array_index (program->streams, i);
pmt_stream = gst_mpegts_pmt_stream_new (); pmt_stream = gst_mpegts_pmt_stream_new ();

2
subprojects/gst-plugins-bad/gst/mpegtsmux/tsmux/tsmux.h
View file

@ -127,7 +127,7 @@ struct TsMuxProgram {
TsMuxStream *pcr_stream; TsMuxStream *pcr_stream;
/* programs TsMuxStream's */ /* programs TsMuxStream's */
GArray *streams; GPtrArray *streams;
}; };
struct TsMux { struct TsMux {