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

rtptheoradepay: 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-04 17:33:52 +02:00 committed by GStreamer Marge Bot
parent 0a4918a509
commit 334ceaca21
1 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
subprojects/gst-plugins-good/gst/rtp/gstrtptheoradepay.c
View file

@ -116,6 +116,8 @@ gst_rtp_theora_depay_class_init (GstRtpTheoraDepayClass * klass)
static void static void
gst_rtp_theora_depay_init (GstRtpTheoraDepay * rtptheoradepay) gst_rtp_theora_depay_init (GstRtpTheoraDepay * rtptheoradepay)
{ {
gst_rtp_base_depayload_set_aggregate_hdrext_enabled (GST_RTP_BASE_DEPAYLOAD
(rtptheoradepay), TRUE);
rtptheoradepay->adapter = gst_adapter_new (); rtptheoradepay->adapter = gst_adapter_new ();
} }
@ -422,10 +424,10 @@ gst_rtp_theora_depay_process (GstRTPBaseDepayload * depayload,
{ {
GstRtpTheoraDepay *rtptheoradepay; GstRtpTheoraDepay *rtptheoradepay;
GstBuffer *outbuf; GstBuffer *outbuf;
GstFlowReturn ret;
gint payload_len; gint payload_len;
GstMapInfo map; GstMapInfo map;
GstBuffer *payload_buffer = NULL; GstBuffer *payload_buffer = NULL;
GstBufferList *outbufs = NULL;
guint8 *payload; guint8 *payload;
guint32 header, ident; guint32 header, ident;
guint8 F, TDT, packets; guint8 F, TDT, packets;
@ -491,12 +493,15 @@ gst_rtp_theora_depay_process (GstRTPBaseDepayload * depayload,
if (F == 1) { if (F == 1) {
/* if we start a packet, clear adapter and start assembling. */ /* if we start a packet, clear adapter and start assembling. */
gst_adapter_clear (rtptheoradepay->adapter); gst_adapter_clear (rtptheoradepay->adapter);
gst_rtp_base_depayload_flush (depayload, TRUE);
GST_DEBUG_OBJECT (depayload, "start assemble"); GST_DEBUG_OBJECT (depayload, "start assemble");
rtptheoradepay->assembling = TRUE; rtptheoradepay->assembling = TRUE;
} }
if (!rtptheoradepay->assembling) if (!rtptheoradepay->assembling) {
gst_rtp_base_depayload_dropped (depayload);
goto no_output; goto no_output;
}
/* skip header and length. */ /* skip header and length. */
vdata = gst_rtp_buffer_get_payload_subbuffer (rtp, 6, -1); vdata = gst_rtp_buffer_get_payload_subbuffer (rtp, 6, -1);
@ -526,6 +531,8 @@ gst_rtp_theora_depay_process (GstRTPBaseDepayload * depayload,
rtptheoradepay->assembling = FALSE; rtptheoradepay->assembling = FALSE;
gst_adapter_clear (rtptheoradepay->adapter); gst_adapter_clear (rtptheoradepay->adapter);
outbufs = gst_buffer_list_new ();
/* payload now points to a length with that many theora data bytes. /* payload now points to a length with that many theora data bytes.
* Iterate over the packets and send them out. * Iterate over the packets and send them out.
* *
@ -562,6 +569,12 @@ gst_rtp_theora_depay_process (GstRTPBaseDepayload * depayload,
/* handle in-band configuration */ /* handle in-band configuration */
if (G_UNLIKELY (TDT == 1)) { if (G_UNLIKELY (TDT == 1)) {
GST_DEBUG_OBJECT (rtptheoradepay, "in-band configuration"); GST_DEBUG_OBJECT (rtptheoradepay, "in-band configuration");
/* push all buffers we found so far and clear the cached header
extensions if any */
gst_rtp_base_depayload_push_list (depayload, outbufs);
gst_rtp_base_depayload_flush (depayload, FALSE);
if (!gst_rtp_theora_depay_parse_inband_configuration (rtptheoradepay, if (!gst_rtp_theora_depay_parse_inband_configuration (rtptheoradepay,
ident, payload, payload_len, length)) ident, payload, payload_len, length))
goto invalid_configuration; goto invalid_configuration;
@ -584,11 +597,11 @@ gst_rtp_theora_depay_process (GstRTPBaseDepayload * depayload,
/* make sure to read next length */ /* make sure to read next length */
length = 0; length = 0;
ret = gst_rtp_base_depayload_push (depayload, outbuf); gst_buffer_list_add (outbufs, outbuf);
if (ret != GST_FLOW_OK)
break;
} }
gst_rtp_base_depayload_push_list (depayload, outbufs);
if (rtptheoradepay->needs_keyframe) if (rtptheoradepay->needs_keyframe)
goto request_keyframe; goto request_keyframe;
@ -607,23 +620,30 @@ switch_failed:
{ {
GST_ELEMENT_WARNING (rtptheoradepay, STREAM, DECODE, GST_ELEMENT_WARNING (rtptheoradepay, STREAM, DECODE,
(NULL), ("Could not switch codebooks")); (NULL), ("Could not switch codebooks"));
gst_rtp_base_depayload_dropped (depayload);
goto request_config; goto request_config;
} }
packet_short: packet_short:
{ {
GST_ELEMENT_WARNING (rtptheoradepay, STREAM, DECODE, GST_ELEMENT_WARNING (rtptheoradepay, STREAM, DECODE,
(NULL), ("Packet was too short (%d < 4)", payload_len)); (NULL), ("Packet was too short (%d < 4)", payload_len));
gst_rtp_base_depayload_dropped (depayload);
goto request_keyframe; goto request_keyframe;
} }
ignore_reserved: ignore_reserved:
{ {
GST_WARNING_OBJECT (rtptheoradepay, "reserved TDT ignored"); GST_WARNING_OBJECT (rtptheoradepay, "reserved TDT ignored");
gst_rtp_base_depayload_dropped (depayload);
goto out; goto out;
} }
length_short: length_short:
{ {
GST_ELEMENT_WARNING (rtptheoradepay, STREAM, DECODE, GST_ELEMENT_WARNING (rtptheoradepay, STREAM, DECODE,
(NULL), ("Packet contains invalid data")); (NULL), ("Packet contains invalid data"));
/* there may already be some buffers to push so do that before
leaving */
gst_rtp_base_depayload_push_list (depayload, outbufs);
gst_rtp_base_depayload_flush (depayload, FALSE);
goto request_keyframe; goto request_keyframe;
} }
invalid_configuration: invalid_configuration: