FaSTTUBe/GST-Tensordecoder-ov_ep
35
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

adaptivedemux2: Split track id from event stream-id

Browse Source 
The id is used for naming of the various objects and debugging. We don't
want/need it to be obfuscated with the massive upstream id.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3890>
This commit is contained in:
Edward Hervey 2023-02-03 11:23:50 +01:00 committed by GStreamer Marge Bot
parent edaf3252c5
commit 5e193730db
3 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
subprojects/gst-plugins-good/ext/adaptivedemux2/dash/gstdashdemux.c
View File

@ -874,8 +874,7 @@ gst_dash_demux_setup_all_streams (GstDashDemux2 * demux)
track = gst_adaptive_demux_track_new (GST_ADAPTIVE_DEMUX_CAST (demux), track = gst_adaptive_demux_track_new (GST_ADAPTIVE_DEMUX_CAST (demux),
streamtype, GST_STREAM_FLAG_NONE, stream_id, codec_caps, tags); streamtype, GST_STREAM_FLAG_NONE, stream_id, codec_caps, tags);
stream = stream = gst_dash_demux_stream_new (demux->client->period_idx, stream_id);
gst_dash_demux_stream_new (demux->client->period_idx, track->stream_id);
GST_ADAPTIVE_DEMUX2_STREAM_CAST (stream)->stream_type = streamtype; GST_ADAPTIVE_DEMUX2_STREAM_CAST (stream)->stream_type = streamtype;
g_free (stream_id); g_free (stream_id);

30
subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux-track.c
View File

@ -787,11 +787,11 @@ gst_adaptive_demux_track_update_level_locked (GstAdaptiveDemuxTrack * track)
static void static void
_demux_track_free (GstAdaptiveDemuxTrack * track) _demux_track_free (GstAdaptiveDemuxTrack * track)
{ {
GST_DEBUG_OBJECT (track->demux, "freeing track %p '%s'", track, GST_DEBUG_ID (track->id, "freeing track");
track->stream_id);
g_free (track->stream_id); g_free (track->stream_id);
g_free (track->upstream_stream_id); g_free (track->upstream_stream_id);
g_free (track->id);
if (track->pending_srcpad) if (track->pending_srcpad)
gst_object_unref (track->pending_srcpad); gst_object_unref (track->pending_srcpad);
@ -849,31 +849,24 @@ gst_adaptive_demux_track_add_elements (GstAdaptiveDemuxTrack * track,
guint period_num) guint period_num)
{ {
GstAdaptiveDemux *demux = track->demux; GstAdaptiveDemux *demux = track->demux;
gchar *internal_name; gchar *tmpid;
guint i, len; guint i, len;
/* Store the period number for debugging output */ /* Store the period number for debugging output */
track->period_num = period_num; track->period_num = period_num;
internal_name = tmpid = g_strdup_printf ("%s-period%d", track->id, period_num);
g_strdup_printf ("track-period%d-%s", period_num, track->stream_id); g_free (track->id);
len = strlen (internal_name); track->id = tmpid;
len = strlen (track->id);
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
if (internal_name[i] == ' ') if (track->id[i] == ' ')
internal_name[i] = '_'; track->id[i] = '_';
track->element = gst_bin_new (internal_name); track->element = gst_bin_new (track->id);
g_free (internal_name);
internal_name = track->sinkpad = gst_pad_new ("sink", GST_PAD_SINK);
g_strdup_printf ("track-period%d-sink-%s", period_num, track->stream_id);
len = strlen (internal_name);
for (i = 0; i < len; i++)
if (internal_name[i] == ' ')
internal_name[i] = '_';
track->sinkpad = gst_pad_new (internal_name, GST_PAD_SINK);
g_signal_connect (track->sinkpad, "unlinked", g_signal_connect (track->sinkpad, "unlinked",
(GCallback) track_sinkpad_unlinked_cb, track); (GCallback) track_sinkpad_unlinked_cb, track);
g_free (internal_name);
gst_element_add_pad (GST_ELEMENT_CAST (track->element), track->sinkpad); gst_element_add_pad (GST_ELEMENT_CAST (track->element), track->sinkpad);
gst_pad_set_element_private (track->sinkpad, track); gst_pad_set_element_private (track->sinkpad, track);
gst_pad_set_chain_function (track->sinkpad, _track_sink_chain_function); gst_pad_set_chain_function (track->sinkpad, _track_sink_chain_function);
@ -923,6 +916,7 @@ gst_adaptive_demux_track_new (GstAdaptiveDemux * demux,
track->flags = flags; track->flags = flags;
track->stream_id = track->stream_id =
gst_element_decorate_stream_id (GST_ELEMENT (demux), stream_id); gst_element_decorate_stream_id (GST_ELEMENT (demux), stream_id);
track->id = g_strdup_printf ("track-%s", stream_id);
track->period_num = (guint) (-1); track->period_num = (guint) (-1);
track->generic_caps = caps; track->generic_caps = caps;
track->stream_object = gst_stream_new (track->stream_id, caps, type, flags); track->stream_object = gst_stream_new (track->stream_id, caps, type, flags);

3
subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux.h
View File

@ -104,6 +104,9 @@ struct _GstAdaptiveDemuxTrack
/* Stream flags */ /* Stream flags */
GstStreamFlags flags; GstStreamFlags flags;
/* Unique identifier (for naming and debugging) */
gchar *id;
/* Unique identifier */ /* Unique identifier */
gchar *stream_id; gchar *stream_id;