From a68a7fb65d0d43bf032b494d23f5ab73154b3507 Mon Sep 17 00:00:00 2001 From: Tim-Philipp Müller Date: Fri, 26 May 2017 16:30:06 +0100 Subject: rtph264depay: simplify buffer accumulation control flow There is no difference between pushing out a buffer directly with gst_rtp_base_depayload_push() and returning it from the process function. The base class will just call _depayload_push() on the returned buffer as well. So instead of marshalling buffers through three layers and back, just push them from one place in handle_nal() and always return NULL from the process vfunc. This simplifies the code a little. Also rename _push_fragmentation_unit() to _finish_fragmentation_unit() for clarity. Push sounds like it means being pushed out, whereas it might just be pushed into an adapter. This change has the side-effect that multiple NALs in a single STAP (such as SPS/PPS) may no longer be pushed out as a single buffer if we output NALs in byte-stream format (i.e. not aggregate AUs), but that shouldn't really make any difference to anyone. --- gst/rtp/gstrtph264depay.c | 45 ++++++++++++++++----------------------------- 1 file changed, 16 insertions(+), 29 deletions(-) diff --git a/gst/rtp/gstrtph264depay.c b/gst/rtp/gstrtph264depay.c index e5b8b0306..93f4f76ba 100644 --- a/gst/rtp/gstrtph264depay.c +++ b/gst/rtp/gstrtph264depay.c @@ -758,7 +758,7 @@ gst_rtp_h264_complete_au (GstRtpH264Depay * rtph264depay, * so downstream waiting for keyframe can pick up at SPS/PPS/IDR */ #define NAL_TYPE_IS_KEY(nt) (((nt) == 5) || ((nt) == 7) || ((nt) == 8)) -static GstBuffer * +static void gst_rtp_h264_depay_handle_nal (GstRtpH264Depay * rtph264depay, GstBuffer * nal, GstClockTime in_timestamp, gboolean marker) { @@ -788,7 +788,7 @@ gst_rtp_h264_depay_handle_nal (GstRtpH264Depay * rtph264depay, GstBuffer * nal, 4, gst_buffer_get_size (nal) - 4)); gst_buffer_unmap (nal, &map); gst_buffer_unref (nal); - return NULL; + return; } else if (rtph264depay->sps->len == 0 || rtph264depay->pps->len == 0) { /* Down push down any buffer in non-bytestream mode if the SPS/PPS haven't * go through yet @@ -799,7 +799,7 @@ gst_rtp_h264_depay_handle_nal (GstRtpH264Depay * rtph264depay, GstBuffer * nal, "all-headers", G_TYPE_BOOLEAN, TRUE, NULL))); gst_buffer_unmap (nal, &map); gst_buffer_unref (nal); - return NULL; + return; } if (rtph264depay->new_codec_data && @@ -878,9 +878,11 @@ gst_rtp_h264_depay_handle_nal (GstRtpH264Depay * rtph264depay, GstBuffer * nal, GST_BUFFER_FLAG_UNSET (outbuf, GST_BUFFER_FLAG_DELTA_UNIT); else GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_FLAG_DELTA_UNIT); + + gst_rtp_base_depayload_push (depayload, outbuf); } - return outbuf; + return; /* ERRORS */ short_nal: @@ -888,13 +890,12 @@ short_nal: GST_WARNING_OBJECT (depayload, "dropping short NAL"); gst_buffer_unmap (nal, &map); gst_buffer_unref (nal); - return NULL; + return; } } -static GstBuffer * -gst_rtp_h264_push_fragmentation_unit (GstRtpH264Depay * rtph264depay, - gboolean send) +static void +gst_rtp_h264_finish_fragmentation_unit (GstRtpH264Depay * rtph264depay) { guint outsize; GstMapInfo map; @@ -919,14 +920,8 @@ gst_rtp_h264_push_fragmentation_unit (GstRtpH264Depay * rtph264depay, rtph264depay->current_fu_type = 0; - outbuf = gst_rtp_h264_depay_handle_nal (rtph264depay, outbuf, + gst_rtp_h264_depay_handle_nal (rtph264depay, outbuf, rtph264depay->fu_timestamp, rtph264depay->fu_marker); - - if (send && outbuf) { - gst_rtp_base_depayload_push (GST_RTP_BASE_DEPAYLOAD (rtph264depay), outbuf); - outbuf = NULL; - } - return outbuf; } static GstBuffer * @@ -988,7 +983,7 @@ gst_rtp_h264_depay_process (GstRTPBaseDepayload * depayload, GstRTPBuffer * rtp) * when the FU ended) and send out what we gathered thusfar */ if (G_UNLIKELY (rtph264depay->current_fu_type != 0 && nal_unit_type != rtph264depay->current_fu_type)) - gst_rtp_h264_push_fragmentation_unit (rtph264depay, TRUE); + gst_rtp_h264_finish_fragmentation_unit (rtph264depay); switch (nal_unit_type) { case 0: @@ -1045,19 +1040,12 @@ gst_rtp_h264_depay_process (GstRTPBaseDepayload * depayload, GstRTPBuffer * rtp) gst_rtp_copy_video_meta (rtph264depay, outbuf, rtp->buffer); - outbuf = - gst_rtp_h264_depay_handle_nal (rtph264depay, outbuf, timestamp, + gst_rtp_h264_depay_handle_nal (rtph264depay, outbuf, timestamp, marker); - if (outbuf) - gst_adapter_push (rtph264depay->adapter, outbuf); payload += nalu_size; payload_len -= nalu_size; } - - outsize = gst_adapter_available (rtph264depay->adapter); - if (outsize > 0) - outbuf = gst_adapter_take_buffer (rtph264depay->adapter, outsize); break; } case 26: @@ -1100,7 +1088,7 @@ gst_rtp_h264_depay_process (GstRTPBaseDepayload * depayload, GstRTPBuffer * rtp) * Assume that the remote payloader is buggy (doesn't set the end * bit) and send out what we've gathered thusfar */ if (G_UNLIKELY (rtph264depay->current_fu_type != 0)) - gst_rtp_h264_push_fragmentation_unit (rtph264depay, TRUE); + gst_rtp_h264_finish_fragmentation_unit (rtph264depay); rtph264depay->current_fu_type = nal_unit_type; rtph264depay->fu_timestamp = timestamp; @@ -1152,7 +1140,7 @@ gst_rtp_h264_depay_process (GstRTPBaseDepayload * depayload, GstRTPBuffer * rtp) /* if NAL unit ends, flush the adapter */ if (E) - outbuf = gst_rtp_h264_push_fragmentation_unit (rtph264depay, FALSE); + gst_rtp_h264_finish_fragmentation_unit (rtph264depay); break; } default: @@ -1178,14 +1166,13 @@ gst_rtp_h264_depay_process (GstRTPBaseDepayload * depayload, GstRTPBuffer * rtp) gst_rtp_copy_video_meta (rtph264depay, outbuf, rtp->buffer); - outbuf = gst_rtp_h264_depay_handle_nal (rtph264depay, outbuf, timestamp, - marker); + gst_rtp_h264_depay_handle_nal (rtph264depay, outbuf, timestamp, marker); break; } } } - return outbuf; + return NULL; /* ERRORS */ empty_packet: -- cgit v1.2.3