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

rtpasfdepay: Enabled header extension aggregation

Browse source 
Because this depayloader may build several output buffers within one
process run we push them all into a GstBufferList and push them out at
once to make sure that each buffer gets notified about each header
extension.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5378>
This commit is contained in:
Jochen Henneberg 2023-09-17 18:47:31 +02:00 committed by GStreamer Marge Bot
parent 5d1d0cf9a5
commit 4788a3da0d
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
subprojects/gst-plugins-ugly/gst/asfdemux/gstrtpasfdepay.c
View file

@ -104,6 +104,9 @@ gst_rtp_asf_depay_class_init (GstRtpAsfDepayClass * klass)
static void static void
gst_rtp_asf_depay_init (GstRtpAsfDepay * depay) gst_rtp_asf_depay_init (GstRtpAsfDepay * depay)
{ {
gst_rtp_base_depayload_set_aggregate_hdrext_enabled (GST_RTP_BASE_DEPAYLOAD
(depay), TRUE);
depay->adapter = gst_adapter_new (); depay->adapter = gst_adapter_new ();
} }
@ -335,6 +338,7 @@ gst_rtp_asf_depay_process (GstRTPBaseDepayload * depayload, GstBuffer * buf)
GstRtpAsfDepay *depay; GstRtpAsfDepay *depay;
const guint8 *payload; const guint8 *payload;
GstBuffer *outbuf; GstBuffer *outbuf;
GstBufferList *outbufs = NULL;
gboolean S, L, R, D, I; gboolean S, L, R, D, I;
guint payload_len, hdr_len, offset; guint payload_len, hdr_len, offset;
guint len_offs; guint len_offs;
@ -359,6 +363,7 @@ gst_rtp_asf_depay_process (GstRTPBaseDepayload * depayload, GstBuffer * buf)
GST_LOG_OBJECT (depay, "got payload len of %u", payload_len); GST_LOG_OBJECT (depay, "got payload len of %u", payload_len);
outbufs = gst_buffer_list_new ();
do { do {
guint packet_len; guint packet_len;
@ -473,9 +478,12 @@ gst_rtp_asf_depay_process (GstRTPBaseDepayload * depayload, GstBuffer * buf)
gst_rtp_buffer_get_payload_subbuffer (&rtpbuf, offset, packet_len); gst_rtp_buffer_get_payload_subbuffer (&rtpbuf, offset, packet_len);
} }
/* If we haven't completed a full ASF packet, return */ /* If we haven't completed a full ASF packet, return but first
if (!outbuf) push what we have so far */
if (!outbuf) {
gst_rtp_base_depayload_push_list (depayload, outbufs);
return NULL; return NULL;
}
outbuf = gst_rtp_asf_depay_update_padding (depay, outbuf); outbuf = gst_rtp_asf_depay_update_padding (depay, outbuf);
@ -490,7 +498,7 @@ gst_rtp_asf_depay_process (GstRTPBaseDepayload * depayload, GstBuffer * buf)
GST_BUFFER_TIMESTAMP (outbuf) = timestamp; GST_BUFFER_TIMESTAMP (outbuf) = timestamp;
gst_rtp_base_depayload_push (depayload, outbuf); gst_buffer_list_add (outbufs, outbuf);
/* only apply the timestamp to the first buffer of this packet */ /* only apply the timestamp to the first buffer of this packet */
timestamp = -1; timestamp = -1;
@ -501,6 +509,8 @@ gst_rtp_asf_depay_process (GstRTPBaseDepayload * depayload, GstBuffer * buf)
payload_len -= packet_len; payload_len -= packet_len;
} while (payload_len > 0); } while (payload_len > 0);
gst_rtp_base_depayload_push_list (depayload, outbufs);
gst_rtp_buffer_unmap (&rtpbuf); gst_rtp_buffer_unmap (&rtpbuf);
return NULL; return NULL;
@ -511,6 +521,12 @@ too_small:
gst_rtp_buffer_unmap (&rtpbuf); gst_rtp_buffer_unmap (&rtpbuf);
GST_WARNING_OBJECT (depayload, "Payload too small, expected at least 4 " GST_WARNING_OBJECT (depayload, "Payload too small, expected at least 4 "
"bytes for header, but got only %d bytes", payload_len); "bytes for header, but got only %d bytes", payload_len);
if (gst_buffer_list_length (outbufs) == 0) {
gst_rtp_base_depayload_dropped (depayload);
gst_buffer_list_unref (outbufs);
} else {
gst_rtp_base_depayload_push_list (depayload, outbufs);
}
return NULL; return NULL;
} }
} }