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

rtp/h264depay+h265depay: Enable hdrext aggregation for H264 and H265

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4979>
This commit is contained in:
Jochen Henneberg 2023-07-30 09:35:53 +02:00
parent d086491909
commit 2673a66e60
2 changed files with 31 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -213,6 +213,9 @@ gst_rtp_h264_depay_class_init (GstRtpH264DepayClass * klass)
static void static void
gst_rtp_h264_depay_init (GstRtpH264Depay * rtph264depay) gst_rtp_h264_depay_init (GstRtpH264Depay * rtph264depay)
{ {
gst_rtp_base_depayload_set_aggregate_hdrext_enabled (GST_RTP_BASE_DEPAYLOAD
(rtph264depay), TRUE);
rtph264depay->adapter = gst_adapter_new (); rtph264depay->adapter = gst_adapter_new ();
rtph264depay->picture_adapter = gst_adapter_new (); rtph264depay->picture_adapter = gst_adapter_new ();
rtph264depay->byte_stream = DEFAULT_BYTE_STREAM; rtph264depay->byte_stream = DEFAULT_BYTE_STREAM;
@ -1096,6 +1099,7 @@ gst_rtp_h264_depay_handle_nal (GstRtpH264Depay * rtph264depay, GstBuffer * nal,
GST_LOG_OBJECT (depayload, GST_LOG_OBJECT (depayload,
"Dropping %" GST_PTR_FORMAT ", we are waiting for a keyframe", "Dropping %" GST_PTR_FORMAT ", we are waiting for a keyframe",
outbuf); outbuf);
gst_rtp_base_depayload_flush (depayload, FALSE);
gst_buffer_unref (outbuf); gst_buffer_unref (outbuf);
} }
} }
@ -1214,8 +1218,10 @@ gst_rtp_h264_depay_process (GstRTPBaseDepayload * depayload, GstRTPBuffer * rtp)
* type. Assume that the remote payloader is buggy (didn't set the end bit * type. Assume that the remote payloader is buggy (didn't set the end bit
* when the FU ended) and send out what we gathered thusfar */ * when the FU ended) and send out what we gathered thusfar */
if (G_UNLIKELY (rtph264depay->current_fu_type != 0 && if (G_UNLIKELY (rtph264depay->current_fu_type != 0 &&
nal_unit_type != rtph264depay->current_fu_type)) nal_unit_type != rtph264depay->current_fu_type)) {
gst_rtp_base_depayload_delayed (depayload);
gst_rtp_h264_finish_fragmentation_unit (rtph264depay); gst_rtp_h264_finish_fragmentation_unit (rtph264depay);
}
switch (nal_unit_type) { switch (nal_unit_type) {
case 0: case 0:
@ -1324,8 +1330,10 @@ gst_rtp_h264_depay_process (GstRTPBaseDepayload * depayload, GstRTPBuffer * rtp)
/* If a new FU unit started, while still processing an older one. /* If a new FU unit started, while still processing an older one.
* Assume that the remote payloader is buggy (doesn't set the end * Assume that the remote payloader is buggy (doesn't set the end
* bit) and send out what we've gathered thusfar */ * bit) and send out what we've gathered thusfar */
if (G_UNLIKELY (rtph264depay->current_fu_type != 0)) if (G_UNLIKELY (rtph264depay->current_fu_type != 0)) {
gst_rtp_base_depayload_delayed (depayload);
gst_rtp_h264_finish_fragmentation_unit (rtph264depay); gst_rtp_h264_finish_fragmentation_unit (rtph264depay);
}
rtph264depay->current_fu_type = nal_unit_type; rtph264depay->current_fu_type = nal_unit_type;
rtph264depay->fu_timestamp = timestamp; rtph264depay->fu_timestamp = timestamp;
@ -1361,6 +1369,7 @@ gst_rtp_h264_depay_process (GstRTPBaseDepayload * depayload, GstRTPBuffer * rtp)
/* previous FU packet missing start bit? */ /* previous FU packet missing start bit? */
GST_WARNING_OBJECT (rtph264depay, "missing FU start bit on an " GST_WARNING_OBJECT (rtph264depay, "missing FU start bit on an "
"earlier packet. Dropping."); "earlier packet. Dropping.");
gst_rtp_base_depayload_flush (depayload, FALSE);
gst_adapter_clear (rtph264depay->adapter); gst_adapter_clear (rtph264depay->adapter);
return NULL; return NULL;
} }
@ -1371,6 +1380,7 @@ gst_rtp_h264_depay_process (GstRTPBaseDepayload * depayload, GstRTPBuffer * rtp)
"%u to %u within Fragmentation Unit. Data was lost, dropping " "%u to %u within Fragmentation Unit. Data was lost, dropping "
"stored.", rtph264depay->last_fu_seqnum, "stored.", rtph264depay->last_fu_seqnum,
gst_rtp_buffer_get_seq (rtp)); gst_rtp_buffer_get_seq (rtp));
gst_rtp_base_depayload_flush (depayload, FALSE);
gst_adapter_clear (rtph264depay->adapter); gst_adapter_clear (rtph264depay->adapter);
return NULL; return NULL;
} }
@ -1435,23 +1445,27 @@ gst_rtp_h264_depay_process (GstRTPBaseDepayload * depayload, GstRTPBuffer * rtp)
empty_packet: empty_packet:
{ {
GST_DEBUG_OBJECT (rtph264depay, "empty packet"); GST_DEBUG_OBJECT (rtph264depay, "empty packet");
gst_rtp_base_depayload_dropped (depayload);
return NULL; return NULL;
} }
undefined_type: undefined_type:
{ {
GST_ELEMENT_WARNING (rtph264depay, STREAM, DECODE, GST_ELEMENT_WARNING (rtph264depay, STREAM, DECODE,
(NULL), ("Undefined packet type")); (NULL), ("Undefined packet type"));
gst_rtp_base_depayload_dropped (depayload);
return NULL; return NULL;
} }
waiting_start: waiting_start:
{ {
GST_DEBUG_OBJECT (rtph264depay, "waiting for start"); GST_DEBUG_OBJECT (rtph264depay, "waiting for start");
gst_rtp_base_depayload_dropped (depayload);
return NULL; return NULL;
} }
not_implemented: not_implemented:
{ {
GST_ELEMENT_ERROR (rtph264depay, STREAM, FORMAT, GST_ELEMENT_ERROR (rtph264depay, STREAM, FORMAT,
(NULL), ("NAL unit type %d not supported yet", nal_unit_type)); (NULL), ("NAL unit type %d not supported yet", nal_unit_type));
gst_rtp_base_depayload_dropped (depayload);
return NULL; return NULL;
} }
} }

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

@ -152,6 +152,9 @@ gst_rtp_h265_depay_class_init (GstRtpH265DepayClass * klass)
static void static void
gst_rtp_h265_depay_init (GstRtpH265Depay * rtph265depay) gst_rtp_h265_depay_init (GstRtpH265Depay * rtph265depay)
{ {
gst_rtp_base_depayload_set_aggregate_hdrext_enabled (GST_RTP_BASE_DEPAYLOAD
(rtph265depay), TRUE);
rtph265depay->adapter = gst_adapter_new (); rtph265depay->adapter = gst_adapter_new ();
rtph265depay->picture_adapter = gst_adapter_new (); rtph265depay->picture_adapter = gst_adapter_new ();
rtph265depay->output_format = DEFAULT_STREAM_FORMAT; rtph265depay->output_format = DEFAULT_STREAM_FORMAT;
@ -1293,8 +1296,10 @@ gst_rtp_h265_depay_process (GstRTPBaseDepayload * depayload, GstRTPBuffer * rtp)
* type. Assume that the remote payloader is buggy (didn't set the end bit * type. Assume that the remote payloader is buggy (didn't set the end bit
* when the FU ended) and send out what we gathered thusfar */ * when the FU ended) and send out what we gathered thusfar */
if (G_UNLIKELY (rtph265depay->current_fu_type != 0 && if (G_UNLIKELY (rtph265depay->current_fu_type != 0 &&
nal_unit_type != rtph265depay->current_fu_type)) nal_unit_type != rtph265depay->current_fu_type)) {
gst_rtp_base_depayload_delayed (depayload);
gst_rtp_h265_finish_fragmentation_unit (rtph265depay); gst_rtp_h265_finish_fragmentation_unit (rtph265depay);
}
switch (nal_unit_type) { switch (nal_unit_type) {
case 48: case 48:
@ -1428,8 +1433,10 @@ gst_rtp_h265_depay_process (GstRTPBaseDepayload * depayload, GstRTPBuffer * rtp)
/* If a new FU unit started, while still processing an older one. /* If a new FU unit started, while still processing an older one.
* Assume that the remote payloader is buggy (doesn't set the end * Assume that the remote payloader is buggy (doesn't set the end
* bit) and send out what we've gathered thusfar */ * bit) and send out what we've gathered thusfar */
if (G_UNLIKELY (rtph265depay->current_fu_type != 0)) if (G_UNLIKELY (rtph265depay->current_fu_type != 0)) {
gst_rtp_base_depayload_delayed (depayload);
gst_rtp_h265_finish_fragmentation_unit (rtph265depay); gst_rtp_h265_finish_fragmentation_unit (rtph265depay);
}
rtph265depay->current_fu_type = nal_unit_type; rtph265depay->current_fu_type = nal_unit_type;
rtph265depay->fu_timestamp = timestamp; rtph265depay->fu_timestamp = timestamp;
@ -1475,6 +1482,7 @@ gst_rtp_h265_depay_process (GstRTPBaseDepayload * depayload, GstRTPBuffer * rtp)
/* previous FU packet missing start bit? */ /* previous FU packet missing start bit? */
GST_WARNING_OBJECT (rtph265depay, "missing FU start bit on an " GST_WARNING_OBJECT (rtph265depay, "missing FU start bit on an "
"earlier packet. Dropping."); "earlier packet. Dropping.");
gst_rtp_base_depayload_flush (depayload, FALSE);
gst_adapter_clear (rtph265depay->adapter); gst_adapter_clear (rtph265depay->adapter);
return NULL; return NULL;
} }
@ -1485,6 +1493,7 @@ gst_rtp_h265_depay_process (GstRTPBaseDepayload * depayload, GstRTPBuffer * rtp)
"%u to %u within Fragmentation Unit. Data was lost, dropping " "%u to %u within Fragmentation Unit. Data was lost, dropping "
"stored.", rtph265depay->last_fu_seqnum, "stored.", rtph265depay->last_fu_seqnum,
gst_rtp_buffer_get_seq (rtp)); gst_rtp_buffer_get_seq (rtp));
gst_rtp_base_depayload_flush (depayload, FALSE);
gst_adapter_clear (rtph265depay->adapter); gst_adapter_clear (rtph265depay->adapter);
return NULL; return NULL;
} }
@ -1560,11 +1569,13 @@ gst_rtp_h265_depay_process (GstRTPBaseDepayload * depayload, GstRTPBuffer * rtp)
empty_packet: empty_packet:
{ {
GST_DEBUG_OBJECT (rtph265depay, "empty packet"); GST_DEBUG_OBJECT (rtph265depay, "empty packet");
gst_rtp_base_depayload_dropped (depayload);
return NULL; return NULL;
} }
waiting_start: waiting_start:
{ {
GST_DEBUG_OBJECT (rtph265depay, "waiting for start"); GST_DEBUG_OBJECT (rtph265depay, "waiting for start");
gst_rtp_base_depayload_dropped (depayload);
return NULL; return NULL;
} }
#if 0 #if 0
@ -1572,6 +1583,7 @@ not_implemented_donl_present:
{ {
GST_ELEMENT_ERROR (rtph265depay, STREAM, FORMAT, GST_ELEMENT_ERROR (rtph265depay, STREAM, FORMAT,
(NULL), ("DONL field present not supported yet")); (NULL), ("DONL field present not supported yet"));
gst_rtp_base_depayload_dropped (depayload);
return NULL; return NULL;
} }
#endif #endif
@ -1579,6 +1591,7 @@ not_implemented:
{ {
GST_ELEMENT_ERROR (rtph265depay, STREAM, FORMAT, GST_ELEMENT_ERROR (rtph265depay, STREAM, FORMAT,
(NULL), ("NAL unit type %d not supported yet", nal_unit_type)); (NULL), ("NAL unit type %d not supported yet", nal_unit_type));
gst_rtp_base_depayload_dropped (depayload);
return NULL; return NULL;
} }
} }