mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-09-02 02:03:54 +00:00
Code Issues 1 Projects Releases Wiki Activity

webrtcstats: Fall back to last packet ssrc if caps dont provide it

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1448>
This commit is contained in:
Olivier Crête 2021-12-14 12:38:25 -05:00
parent 4e32d6bf3e
commit 818a185b5d
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
subprojects/gst-plugins-bad/ext/webrtc/gstwebrtcstats.c
View file

@ -759,7 +759,7 @@ _get_stats_from_transport_channel (GstWebRTCBin * webrtc,
} }
/* https://www.w3.org/TR/webrtc-stats/#codec-dict* */ /* https://www.w3.org/TR/webrtc-stats/#codec-dict* */
static void static gboolean
_get_codec_stats_from_pad (GstWebRTCBin * webrtc, GstPad * pad, _get_codec_stats_from_pad (GstWebRTCBin * webrtc, GstPad * pad,
GstStructure * s, gchar ** out_id, guint * out_ssrc, guint * out_clock_rate) GstStructure * s, gchar ** out_id, guint * out_ssrc, guint * out_clock_rate)
{ {
@ -770,6 +770,7 @@ _get_codec_stats_from_pad (GstWebRTCBin * webrtc, GstPad * pad,
double ts; double ts;
guint ssrc = 0; guint ssrc = 0;
gint clock_rate = 0; gint clock_rate = 0;
gboolean has_caps_ssrc = FALSE;
gst_structure_get_double (s, "timestamp", &ts); gst_structure_get_double (s, "timestamp", &ts);
@ -793,8 +794,10 @@ _get_codec_stats_from_pad (GstWebRTCBin * webrtc, GstPad * pad,
if (gst_structure_get_int (caps_s, "clock-rate", &clock_rate)) if (gst_structure_get_int (caps_s, "clock-rate", &clock_rate))
gst_structure_set (stats, "clock-rate", G_TYPE_UINT, clock_rate, NULL); gst_structure_set (stats, "clock-rate", G_TYPE_UINT, clock_rate, NULL);
if (gst_structure_get_uint (caps_s, "ssrc", &ssrc)) if (gst_structure_get_uint (caps_s, "ssrc", &ssrc)) {
gst_structure_set (stats, "ssrc", G_TYPE_UINT, ssrc, NULL); gst_structure_set (stats, "ssrc", G_TYPE_UINT, ssrc, NULL);
has_caps_ssrc = TRUE;
}
media = gst_structure_get_string (caps_s, "media"); media = gst_structure_get_string (caps_s, "media");
encoding_name = gst_structure_get_string (caps_s, "encoding-name"); encoding_name = gst_structure_get_string (caps_s, "encoding-name");
@ -848,6 +851,8 @@ _get_codec_stats_from_pad (GstWebRTCBin * webrtc, GstPad * pad,
if (out_clock_rate) if (out_clock_rate)
*out_clock_rate = clock_rate; *out_clock_rate = clock_rate;
return has_caps_ssrc;
} }
static gboolean static gboolean
@ -857,8 +862,10 @@ _get_stats_from_pad (GstWebRTCBin * webrtc, GstPad * pad, GstStructure * s)
TransportStream *stream; TransportStream *stream;
gchar *codec_id; gchar *codec_id;
guint ssrc, clock_rate; guint ssrc, clock_rate;
gboolean has_caps_ssrc;
_get_codec_stats_from_pad (webrtc, pad, s, &codec_id, &ssrc, &clock_rate); has_caps_ssrc = _get_codec_stats_from_pad (webrtc, pad, s, &codec_id, &ssrc,
&clock_rate);
if (!wpad->trans) if (!wpad->trans)
goto out; goto out;
@ -867,6 +874,9 @@ _get_stats_from_pad (GstWebRTCBin * webrtc, GstPad * pad, GstStructure * s)
if (!stream) if (!stream)
goto out; goto out;
if (!has_caps_ssrc)
ssrc = wpad->last_ssrc;
_get_stats_from_transport_channel (webrtc, stream, codec_id, ssrc, _get_stats_from_transport_channel (webrtc, stream, codec_id, ssrc,
clock_rate, s); clock_rate, s);