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

rtph265pay: Properly set the marker bit

Browse source 
The marker bit is used for efficient decoding. The assumption that
it should be set on the AUD is wrong, since the AUD is conceptually
starts the frame, while the marker is to indicate the end.

So properly set the marker bit as soon as we know we are ending an
AU and also whenever upstream have set the GST_BUFFER_FLAG_MARKER
flag.
This commit is contained in:
Nicolas Dufresne 2018-10-03 13:44:56 -04:00
parent 1f72131781
commit e721071dca
1 changed files with 28 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
gst/rtp/gstrtph265pay.c
View file

@ -897,6 +897,7 @@ gst_rtp_h265_pay_payload_nal (GstRTPBasePayload * basepayload,
gboolean send_ps; gboolean send_ps;
GstRTPBuffer rtp = { NULL }; GstRTPBuffer rtp = { NULL };
guint size; guint size;
gboolean marker;
paybuf = g_ptr_array_index (paybufs, i); paybuf = g_ptr_array_index (paybufs, i);
@ -906,6 +907,8 @@ gst_rtp_h265_pay_payload_nal (GstRTPBasePayload * basepayload,
continue; continue;
} }
marker = GST_BUFFER_FLAG_IS_SET (paybuf, GST_BUFFER_FLAG_MARKER);
size = gst_buffer_get_size (paybuf); size = gst_buffer_get_size (paybuf);
gst_buffer_extract (paybuf, 0, nalHeader, 2); gst_buffer_extract (paybuf, 0, nalHeader, 2);
nalType = (nalHeader[0] >> 1) & 0x3f; nalType = (nalHeader[0] >> 1) & 0x3f;
@ -1000,12 +1003,8 @@ gst_rtp_h265_pay_payload_nal (GstRTPBasePayload * basepayload,
gst_rtp_buffer_map (outbuf, GST_MAP_WRITE, &rtp); gst_rtp_buffer_map (outbuf, GST_MAP_WRITE, &rtp);
/* only set the marker bit on packets containing access units */ /* Mark the end of a frame */
if (i == paybufs->len - 1 gst_rtp_buffer_set_marker (&rtp, marker);
&& rtph265pay->alignment == GST_H265_ALIGNMENT_AU
&& IS_ACCESS_UNIT (nalType)) {
gst_rtp_buffer_set_marker (&rtp, 1);
}
/* timestamp the outbuffer */ /* timestamp the outbuffer */
GST_BUFFER_PTS (outbuf) = pts; GST_BUFFER_PTS (outbuf) = pts;
@ -1069,12 +1068,9 @@ gst_rtp_h265_pay_payload_nal (GstRTPBasePayload * basepayload,
payload[0] = (nalHeader[0] & 0x81) | (49 << 1); payload[0] = (nalHeader[0] & 0x81) | (49 << 1);
payload[1] = nalHeader[1]; payload[1] = nalHeader[1];
/* set the marker bit on the last packet of an access unit */ /* If it's the last fragment and the end of this au, mark the end of
if (IS_ACCESS_UNIT (nalType)) { * slice */
gst_rtp_buffer_set_marker (&rtp, gst_rtp_buffer_set_marker (&rtp, marker);
end && i == paybufs->len - 1
&& rtph265pay->alignment == GST_H265_ALIGNMENT_AU);
}
/* FU Header */ /* FU Header */
payload[2] = (start << 7) | (end << 6) | (nalType & 0x3f); payload[2] = (start << 7) | (end << 6) | (nalType & 0x3f);
@ -1197,6 +1193,16 @@ gst_rtp_h265_pay_handle_buffer (GstRTPBasePayload * basepayload,
nal_len); nal_len);
g_ptr_array_add (paybufs, paybuf); g_ptr_array_add (paybufs, paybuf);
/* If we're at the end of the buffer, then we're at the end of the
* access unit
*/
GST_BUFFER_FLAG_UNSET (paybuf, GST_BUFFER_FLAG_MARKER);
if (size - nal_len <= nal_length_size) {
if (rtph265pay->alignment == GST_H265_ALIGNMENT_AU ||
GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_MARKER))
GST_BUFFER_FLAG_SET (paybuf, GST_BUFFER_FLAG_MARKER);
}
data += nal_len; data += nal_len;
offset += nal_len; offset += nal_len;
size -= nal_len; size -= nal_len;
@ -1292,15 +1298,20 @@ gst_rtp_h265_pay_handle_buffer (GstRTPBasePayload * basepayload,
for (; size > 1 && data[size - 1] == 0x0; size--) for (; size > 1 && data[size - 1] == 0x0; size--)
/* skip */ ; /* skip */ ;
/* FIXME: We need to wait until the next packet or EOS to
* actually payload the NAL so we can know if the current NAL is
* the last one of an access unit or not if we are in bytestream mode
*/
paybuf = gst_adapter_take_buffer (rtph265pay->adapter, size); paybuf = gst_adapter_take_buffer (rtph265pay->adapter, size);
g_assert (paybuf); g_assert (paybuf);
g_ptr_array_add (paybufs, paybuf); g_ptr_array_add (paybufs, paybuf);
/* If it's the last nal unit we have in non-bytestream mode, we can
* assume it's the end of an access-unit */
GST_BUFFER_FLAG_UNSET (paybuf, GST_BUFFER_FLAG_MARKER);
if (i == nal_queue->len - 1) {
if (rtph265pay->alignment == GST_H265_ALIGNMENT_AU ||
buffer == NULL ||
GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_MARKER))
GST_BUFFER_FLAG_SET (paybuf, GST_BUFFER_FLAG_MARKER);
}
/* move to next NAL packet */ /* move to next NAL packet */
/* Skips the trailing zeros */ /* Skips the trailing zeros */
gst_adapter_flush (rtph265pay->adapter, nal_len - size); gst_adapter_flush (rtph265pay->adapter, nal_len - size);