mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

tsmux: Remove program_array_index

Browse source 
It's only used for removal. Let's just scan the array.

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

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

@ -612,8 +612,6 @@ tsmux_program_add_stream (TsMuxProgram * program, TsMuxStream * stream)
g_return_if_fail (program != NULL); g_return_if_fail (program != NULL);
g_return_if_fail (stream != NULL); g_return_if_fail (stream != NULL);
stream->program_array_index = program->streams->len;
g_ptr_array_add (program->streams, stream); g_ptr_array_add (program->streams, stream);
program->pmt_changed = TRUE; program->pmt_changed = TRUE;
} }
@ -746,21 +744,10 @@ static gboolean
tsmux_program_remove_stream (TsMuxProgram * program, TsMuxStream * stream) tsmux_program_remove_stream (TsMuxProgram * program, TsMuxStream * stream)
{ {
GPtrArray *streams = program->streams; GPtrArray *streams = program->streams;
TsMuxStream *s;
gint i;
i = stream->program_array_index; if (!g_ptr_array_remove (streams, stream)) {
g_return_val_if_fail (i >= 0, FALSE); g_warn_if_reached ();
return FALSE;
s = g_ptr_array_index (streams, i);
g_return_val_if_fail (s == stream, FALSE);
g_ptr_array_remove_index (streams, i);
/* Correct indices of remaining streams, if any */
for (; i < streams->len; i++) {
s = g_ptr_array_index (streams, i);
s->program_array_index -= 1;
} }
return streams->len == 0; return streams->len == 0;

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

@ -117,7 +117,6 @@ tsmux_stream_new (guint16 pid, guint stream_type)
stream->pes_payload_size = 0; stream->pes_payload_size = 0;
stream->cur_pes_payload_size = 0; stream->cur_pes_payload_size = 0;
stream->pes_bytes_written = 0; stream->pes_bytes_written = 0;
stream->program_array_index = -1;
switch (stream_type) { switch (stream_type) {
case TSMUX_ST_VIDEO_MPEG1: case TSMUX_ST_VIDEO_MPEG1:

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

@ -150,8 +150,6 @@ struct TsMuxStream {
guint8 id; guint8 id;
/* extended stream id (13818-1 Amdt 2) */ /* extended stream id (13818-1 Amdt 2) */
guint8 id_extended; guint8 id_extended;
/* array index in program array */
gint program_array_index;
gboolean is_video_stream; gboolean is_video_stream;