mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-04 05:35:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

tsmux: Fix default get_es_descrs_func

Browse source 
`tsmux_stream_default_get_es_descrs` is missing the `user_data`
parameter and shouldn't be cast to `TsMuxStreamGetESDescriptorsFunc`.

Prefer not casting at all to make sure we don't miss such an issue.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5516>
This commit is contained in:
Jan Alexander Steffens (heftig) 2023-10-10 10:39:55 +02:00 committed by GStreamer Marge Bot
parent da02db0d95
commit 4299be47ab
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
subprojects/gst-plugins-bad/gst/mpegtsmux/gstatscmux.c
View file

@ -145,8 +145,7 @@ gst_atsc_mux_create_new_stream (guint16 new_pid, TsMuxStreamType stream_type,
}
tsmux_stream_set_get_es_descriptors_func (ret,
(TsMuxStreamGetESDescriptorsFunc) gst_atsc_mux_stream_get_es_descrs,
user_data);
gst_atsc_mux_stream_get_es_descrs, user_data);
return ret;
}

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

@ -96,6 +96,13 @@ struct TsMuxStreamBuffer
void *user_data;
};
static void
tsmux_stream_get_es_descrs_default (TsMuxStream * stream,
GstMpegtsPMTStream * pmt_stream, gpointer user_data)
{
tsmux_stream_default_get_es_descrs (stream, pmt_stream);
}
/**
* tsmux_stream_new:
* @pid: a PID
@ -217,8 +224,7 @@ tsmux_stream_new (guint16 pid, guint stream_type)
stream->pcr_ref = 0;
stream->next_pcr = -1;
stream->get_es_descrs =
(TsMuxStreamGetESDescriptorsFunc) tsmux_stream_default_get_es_descrs;
stream->get_es_descrs = tsmux_stream_get_es_descrs_default;
stream->get_es_descrs_data = NULL;
return stream;

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

@ -76,7 +76,7 @@ typedef enum TsMuxStreamState TsMuxStreamState;
typedef struct TsMuxStreamBuffer TsMuxStreamBuffer;
typedef void (*TsMuxStreamBufferReleaseFunc) (guint8 *data, void *user_data);
typedef void (*TsMuxStreamGetESDescriptorsFunc) (TsMuxStream *stream, GstMpegtsPMTStream *pmt_stream, void *user_data);
typedef void (*TsMuxStreamGetESDescriptorsFunc) (TsMuxStream *stream, GstMpegtsPMTStream *pmt_stream, gpointer user_data);
/* Stream type assignments
*