mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-12 11:26:39 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtph264depay, rtph265depay: various parameter-set string handling fixes

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7812>
This commit is contained in:
Sebastian Dröge 2024-10-31 17:46:40 +02:00 committed by Backport Bot
parent 6575d1de8e
commit 377b4525d9
2 changed files with 88 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
subprojects/gst-plugins-good/gst/rtp/gstrtph264depay.c
View file

@ -649,6 +649,9 @@ gst_rtp_h264_add_sps_pps (GstElement * rtph264, GPtrArray * sps_array,
gst_buffer_map (nal, &map, GST_MAP_READ); gst_buffer_map (nal, &map, GST_MAP_READ);
if (map.size == 0)
goto drop;
type = map.data[0] & 0x1f; type = map.data[0] & 0x1f;
if (type == 7) { if (type == 7) {
@ -791,7 +794,12 @@ gst_rtp_h264_depay_setcaps (GstRTPBaseDepayload * depayload, GstCaps * caps)
* front of the params. */ * front of the params. */
len = 0; len = 0;
for (i = 0; params[i]; i++) { for (i = 0; params[i]; i++) {
len += strlen (params[i]); gsize nal_len = strlen (params[i]);
if (nal_len == 0) {
GST_WARNING_OBJECT (depayload, "empty param (#%d)", i);
continue;
}
len += nal_len;
len += sizeof (sync_bytes); len += sizeof (sync_bytes);
} }
/* we seriously overshoot the length, but it's fine. */ /* we seriously overshoot the length, but it's fine. */
@ -803,13 +811,20 @@ gst_rtp_h264_depay_setcaps (GstRTPBaseDepayload * depayload, GstCaps * caps)
for (i = 0; params[i]; i++) { for (i = 0; params[i]; i++) {
guint save = 0; guint save = 0;
gint state = 0; gint state = 0;
gsize nal_len = strlen (params[i]);
if (nal_len == 0)
continue;
GST_DEBUG_OBJECT (depayload, "decoding param %d (%s)", i, params[i]); GST_DEBUG_OBJECT (depayload, "decoding param %d (%s)", i, params[i]);
memcpy (ptr, sync_bytes, sizeof (sync_bytes)); memcpy (ptr, sync_bytes, sizeof (sync_bytes));
ptr += sizeof (sync_bytes); ptr += sizeof (sync_bytes);
len = len = g_base64_decode_step (params[i], nal_len, ptr, &state, &save);
g_base64_decode_step (params[i], strlen (params[i]), ptr, &state, if (len == 0) {
&save); GST_WARNING_OBJECT (depayload, "failed decoding param %d", i);
ptr -= sizeof (sync_bytes);
continue;
}
GST_DEBUG_OBJECT (depayload, "decoded %d bytes", len); GST_DEBUG_OBJECT (depayload, "decoded %d bytes", len);
total += len + sizeof (sync_bytes); total += len + sizeof (sync_bytes);
ptr += len; ptr += len;
@ -818,12 +833,16 @@ gst_rtp_h264_depay_setcaps (GstRTPBaseDepayload * depayload, GstCaps * caps)
gst_buffer_resize (codec_data, 0, total); gst_buffer_resize (codec_data, 0, total);
g_strfreev (params); g_strfreev (params);
/* keep the codec_data, we need to send it as the first buffer. We cannot if (total > 0) {
* push it in the adapter because the adapter might be flushed on discont. /* keep the codec_data, we need to send it as the first buffer. We cannot
*/ * push it in the adapter because the adapter might be flushed on discont.
if (rtph264depay->codec_data) */
gst_buffer_unref (rtph264depay->codec_data); if (rtph264depay->codec_data)
rtph264depay->codec_data = codec_data; gst_buffer_unref (rtph264depay->codec_data);
rtph264depay->codec_data = codec_data;
} else {
gst_buffer_unref (codec_data);
}
} else if (!rtph264depay->byte_stream) { } else if (!rtph264depay->byte_stream) {
gchar **params; gchar **params;
gint i; gint i;
@ -845,7 +864,7 @@ gst_rtp_h264_depay_setcaps (GstRTPBaseDepayload * depayload, GstCaps * caps)
nal_len = strlen (params[i]); nal_len = strlen (params[i]);
if (nal_len == 0) { if (nal_len == 0) {
GST_WARNING_OBJECT (depayload, "empty param '%s' (#%d)", params[i], i); GST_WARNING_OBJECT (depayload, "empty param (#%d)", i);
continue; continue;
} }
nal = gst_buffer_new_and_alloc (nal_len); nal = gst_buffer_new_and_alloc (nal_len);
@ -854,13 +873,20 @@ gst_rtp_h264_depay_setcaps (GstRTPBaseDepayload * depayload, GstCaps * caps)
nal_len = nal_len =
g_base64_decode_step (params[i], nal_len, nalmap.data, &state, &save); g_base64_decode_step (params[i], nal_len, nalmap.data, &state, &save);
GST_DEBUG_OBJECT (depayload, "adding param %d as %s", i, if (nal_len > 0) {
((nalmap.data[0] & 0x1f) == 7) ? "SPS" : "PPS"); GST_DEBUG_OBJECT (depayload, "adding param %d as %s", i,
((nalmap.data[0] & 0x1f) == 7) ? "SPS" : "PPS");
}
gst_buffer_unmap (nal, &nalmap); gst_buffer_unmap (nal, &nalmap);
gst_buffer_set_size (nal, nal_len); gst_buffer_set_size (nal, nal_len);
gst_rtp_h264_depay_add_sps_pps (rtph264depay, nal); if (nal_len > 0) {
gst_rtp_h264_depay_add_sps_pps (rtph264depay, nal);
} else {
GST_WARNING_OBJECT (depayload, "failed decoding param %d", i);
gst_buffer_unref (nal);
}
} }
g_strfreev (params); g_strfreev (params);

64
subprojects/gst-plugins-good/gst/rtp/gstrtph265depay.c
View file

@ -677,9 +677,18 @@ gst_rtp_h265_add_vps_sps_pps (GstElement * rtph265, GPtrArray * vps_array,
gst_buffer_map (nal, &map, GST_MAP_READ); gst_buffer_map (nal, &map, GST_MAP_READ);
if (map.size == 0)
goto drop;
type = (map.data[0] >> 1) & 0x3f; type = (map.data[0] >> 1) & 0x3f;
if (type == GST_H265_VPS_NUT) { if (type == GST_H265_VPS_NUT) {
if (map.size < 3) {
GST_WARNING_OBJECT (rtph265, "Invalid VPS,"
" can't parse seq_parameter_set_id");
goto drop;
}
guint32 vps_id = (map.data[2] >> 4) & 0x0f; guint32 vps_id = (map.data[2] >> 4) & 0x0f;
for (i = 0; i < vps_array->len; i++) { for (i = 0; i < vps_array->len; i++) {
@ -855,7 +864,12 @@ gst_rtp_h265_depay_setcaps (GstRTPBaseDepayload * depayload, GstCaps * caps)
* front of the params. */ * front of the params. */
len = 0; len = 0;
for (i = 0; params[i]; i++) { for (i = 0; params[i]; i++) {
len += strlen (params[i]); gsize nal_len = strlen (params[i]);
if (nal_len == 0) {
GST_WARNING_OBJECT (depayload, "empty param (#%d)", i);
continue;
}
len += nal_len;
len += sizeof (sync_bytes); len += sizeof (sync_bytes);
} }
/* we seriously overshoot the length, but it's fine. */ /* we seriously overshoot the length, but it's fine. */
@ -867,13 +881,20 @@ gst_rtp_h265_depay_setcaps (GstRTPBaseDepayload * depayload, GstCaps * caps)
for (i = 0; params[i]; i++) { for (i = 0; params[i]; i++) {
guint save = 0; guint save = 0;
gint state = 0; gint state = 0;
gsize nal_len = strlen (params[i]);
if (nal_len == 0)
continue;
GST_DEBUG_OBJECT (depayload, "decoding param %d (%s)", i, params[i]); GST_DEBUG_OBJECT (depayload, "decoding param %d (%s)", i, params[i]);
memcpy (ptr, sync_bytes, sizeof (sync_bytes)); memcpy (ptr, sync_bytes, sizeof (sync_bytes));
ptr += sizeof (sync_bytes); ptr += sizeof (sync_bytes);
len = len = g_base64_decode_step (params[i], nal_len, ptr, &state, &save);
g_base64_decode_step (params[i], strlen (params[i]), ptr, &state, if (len == 0) {
&save); GST_WARNING_OBJECT (depayload, "failed decoding param %d", i);
ptr -= sizeof (sync_bytes);
continue;
}
GST_DEBUG_OBJECT (depayload, "decoded %d bytes", len); GST_DEBUG_OBJECT (depayload, "decoded %d bytes", len);
total += len + sizeof (sync_bytes); total += len + sizeof (sync_bytes);
ptr += len; ptr += len;
@ -882,12 +903,16 @@ gst_rtp_h265_depay_setcaps (GstRTPBaseDepayload * depayload, GstCaps * caps)
gst_buffer_resize (codec_data, 0, total); gst_buffer_resize (codec_data, 0, total);
g_strfreev (params); g_strfreev (params);
/* keep the codec_data, we need to send it as the first buffer. We cannot if (total > 0) {
* push it in the adapter because the adapter might be flushed on discont. /* keep the codec_data, we need to send it as the first buffer. We cannot
*/ * push it in the adapter because the adapter might be flushed on discont.
if (rtph265depay->codec_data) */
gst_buffer_unref (rtph265depay->codec_data); if (rtph265depay->codec_data)
rtph265depay->codec_data = codec_data; gst_buffer_unref (rtph265depay->codec_data);
rtph265depay->codec_data = codec_data;
} else {
gst_buffer_unref (codec_data);
}
} else if (!rtph265depay->byte_stream) { } else if (!rtph265depay->byte_stream) {
gchar **params; gchar **params;
gint i; gint i;
@ -909,7 +934,7 @@ gst_rtp_h265_depay_setcaps (GstRTPBaseDepayload * depayload, GstCaps * caps)
nal_len = strlen (params[i]); nal_len = strlen (params[i]);
if (nal_len == 0) { if (nal_len == 0) {
GST_WARNING_OBJECT (depayload, "empty param '%s' (#%d)", params[i], i); GST_WARNING_OBJECT (depayload, "empty param (#%d)", i);
continue; continue;
} }
nal = gst_buffer_new_and_alloc (nal_len); nal = gst_buffer_new_and_alloc (nal_len);
@ -918,15 +943,22 @@ gst_rtp_h265_depay_setcaps (GstRTPBaseDepayload * depayload, GstCaps * caps)
nal_len = nal_len =
g_base64_decode_step (params[i], nal_len, nalmap.data, &state, &save); g_base64_decode_step (params[i], nal_len, nalmap.data, &state, &save);
GST_DEBUG_OBJECT (depayload, "adding param %d as %s", i, if (nal_len > 0) {
(((nalmap.data[0] >> 1) & 0x3f) == GST_DEBUG_OBJECT (depayload, "adding param %d as %s", i,
32) ? "VPS" : (((nalmap.data[0] >> 1) & 0x3f) == (((nalmap.data[0] >> 1) & 0x3f) ==
33) ? "SPS" : "PPS"); 32) ? "VPS" : (((nalmap.data[0] >> 1) & 0x3f) ==
33) ? "SPS" : "PPS");
}
gst_buffer_unmap (nal, &nalmap); gst_buffer_unmap (nal, &nalmap);
gst_buffer_set_size (nal, nal_len); gst_buffer_set_size (nal, nal_len);
gst_rtp_h265_depay_add_vps_sps_pps (rtph265depay, nal); if (nal_len > 0) {
gst_rtp_h265_depay_add_vps_sps_pps (rtph265depay, nal);
} else {
GST_WARNING_OBJECT (depayload, "failed decoding param %d", i);
gst_buffer_unref (nal);
}
} }
g_strfreev (params); g_strfreev (params);