rtpj2kdepay: Enabled header extension aggregation

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5378>
This commit is contained in:
Jochen Henneberg 2023-09-04 17:30:48 +02:00 committed by GStreamer Marge Bot
parent ae3a00abd2
commit 460813f7ee

View file

@ -132,6 +132,9 @@ gst_rtp_j2k_depay_class_init (GstRtpJ2KDepayClass * klass)
static void static void
gst_rtp_j2k_depay_init (GstRtpJ2KDepay * rtpj2kdepay) gst_rtp_j2k_depay_init (GstRtpJ2KDepay * rtpj2kdepay)
{ {
gst_rtp_base_depayload_set_aggregate_hdrext_enabled (GST_RTP_BASE_DEPAYLOAD
(rtpj2kdepay), TRUE);
rtpj2kdepay->pu_adapter = gst_adapter_new (); rtpj2kdepay->pu_adapter = gst_adapter_new ();
rtpj2kdepay->t_adapter = gst_adapter_new (); rtpj2kdepay->t_adapter = gst_adapter_new ();
rtpj2kdepay->f_adapter = gst_adapter_new (); rtpj2kdepay->f_adapter = gst_adapter_new ();
@ -440,6 +443,7 @@ gst_rtp_j2k_depay_flush_frame (GstRTPBaseDepayload * depayload)
} else { } else {
GST_WARNING_OBJECT (rtpj2kdepay, "empty packet"); GST_WARNING_OBJECT (rtpj2kdepay, "empty packet");
gst_adapter_clear (rtpj2kdepay->f_adapter); gst_adapter_clear (rtpj2kdepay->f_adapter);
gst_rtp_base_depayload_flush (depayload, TRUE);
} }
/* we accept any mh_id now */ /* we accept any mh_id now */
@ -597,6 +601,7 @@ empty_packet:
{ {
GST_ELEMENT_WARNING (rtpj2kdepay, STREAM, DECODE, GST_ELEMENT_WARNING (rtpj2kdepay, STREAM, DECODE,
("Empty Payload."), (NULL)); ("Empty Payload."), (NULL));
gst_rtp_base_depayload_dropped (depayload);
return NULL; return NULL;
} }
wrong_mh_id: wrong_mh_id:
@ -604,6 +609,7 @@ wrong_mh_id:
GST_ELEMENT_WARNING (rtpj2kdepay, STREAM, DECODE, GST_ELEMENT_WARNING (rtpj2kdepay, STREAM, DECODE,
("Invalid mh_id %u, expected %u", mh_id, rtpj2kdepay->last_mh_id), ("Invalid mh_id %u, expected %u", mh_id, rtpj2kdepay->last_mh_id),
(NULL)); (NULL));
gst_rtp_base_depayload_dropped (depayload);
gst_rtp_j2k_depay_clear_pu (rtpj2kdepay); gst_rtp_j2k_depay_clear_pu (rtpj2kdepay);
return NULL; return NULL;
} }