mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-28 01:05:07 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtph264pay: do not push unmapped data

Browse source 
Also do not use a GstBuffer after it has been pushed into the adapter.

https://bugzilla.gnome.org/show_bug.cgi?id=685213
This commit is contained in:
Patricia Muscalu 2012-10-01 15:11:05 +02:00 committed by Tim-Philipp Müller
parent b04b1b5089
commit 7a863e4d8d
2 changed files with 98 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
gst/rtp/gstrtph264pay.c
View file

@ -808,8 +808,7 @@ gst_rtp_h264_pay_decode_nal (GstRtpH264Pay * payloader,
static GstFlowReturn static GstFlowReturn
gst_rtp_h264_pay_payload_nal (GstRTPBasePayload * basepayload, gst_rtp_h264_pay_payload_nal (GstRTPBasePayload * basepayload,
const guint8 * data, guint size, GstClockTime dts, GstClockTime pts, GstBuffer * paybuf, GstClockTime dts, GstClockTime pts, gboolean end_of_au);
gboolean end_of_au);
static GstFlowReturn static GstFlowReturn
gst_rtp_h264_pay_send_sps_pps (GstRTPBasePayload * basepayload, gst_rtp_h264_pay_send_sps_pps (GstRTPBasePayload * basepayload,
@ -817,17 +816,14 @@ gst_rtp_h264_pay_send_sps_pps (GstRTPBasePayload * basepayload,
{ {
GstFlowReturn ret = GST_FLOW_OK; GstFlowReturn ret = GST_FLOW_OK;
GList *walk; GList *walk;
GstMapInfo map;
for (walk = rtph264pay->sps; walk; walk = g_list_next (walk)) { for (walk = rtph264pay->sps; walk; walk = g_list_next (walk)) {
GstBuffer *sps_buf = GST_BUFFER_CAST (walk->data); GstBuffer *sps_buf = GST_BUFFER_CAST (walk->data);
GST_DEBUG_OBJECT (rtph264pay, "inserting SPS in the stream"); GST_DEBUG_OBJECT (rtph264pay, "inserting SPS in the stream");
/* resend SPS */ /* resend SPS */
gst_buffer_map (sps_buf, &map, GST_MAP_READ); ret = gst_rtp_h264_pay_payload_nal (basepayload, gst_buffer_ref (sps_buf),
ret = gst_rtp_h264_pay_payload_nal (basepayload, dts, pts, FALSE);
map.data, map.size, dts, pts, FALSE);
gst_buffer_unmap (sps_buf, &map);
/* Not critical here; but throw a warning */ /* Not critical here; but throw a warning */
if (ret != GST_FLOW_OK) if (ret != GST_FLOW_OK)
GST_WARNING ("Problem pushing SPS"); GST_WARNING ("Problem pushing SPS");
@ -837,10 +833,8 @@ gst_rtp_h264_pay_send_sps_pps (GstRTPBasePayload * basepayload,
GST_DEBUG_OBJECT (rtph264pay, "inserting PPS in the stream"); GST_DEBUG_OBJECT (rtph264pay, "inserting PPS in the stream");
/* resend PPS */ /* resend PPS */
gst_buffer_map (pps_buf, &map, GST_MAP_READ); ret = gst_rtp_h264_pay_payload_nal (basepayload, gst_buffer_ref (pps_buf),
ret = gst_rtp_h264_pay_payload_nal (basepayload, dts, pts, FALSE);
map.data, map.size, dts, pts, FALSE);
gst_buffer_unmap (pps_buf, &map);
/* Not critical here; but throw a warning */ /* Not critical here; but throw a warning */
if (ret != GST_FLOW_OK) if (ret != GST_FLOW_OK)
GST_WARNING ("Problem pushing PPS"); GST_WARNING ("Problem pushing PPS");
@ -854,8 +848,7 @@ gst_rtp_h264_pay_send_sps_pps (GstRTPBasePayload * basepayload,
static GstFlowReturn static GstFlowReturn
gst_rtp_h264_pay_payload_nal (GstRTPBasePayload * basepayload, gst_rtp_h264_pay_payload_nal (GstRTPBasePayload * basepayload,
const guint8 * data, guint size, GstClockTime dts, GstClockTime pts, GstBuffer * paybuf, GstClockTime dts, GstClockTime pts, gboolean end_of_au)
gboolean end_of_au)
{ {
GstRtpH264Pay *rtph264pay; GstRtpH264Pay *rtph264pay;
GstFlowReturn ret; GstFlowReturn ret;
@ -866,11 +859,14 @@ gst_rtp_h264_pay_payload_nal (GstRTPBasePayload * basepayload,
GstBufferList *list = NULL; GstBufferList *list = NULL;
gboolean send_spspps; gboolean send_spspps;
GstRTPBuffer rtp = { NULL }; GstRTPBuffer rtp = { NULL };
guint size = gst_buffer_get_size (paybuf);
rtph264pay = GST_RTP_H264_PAY (basepayload); rtph264pay = GST_RTP_H264_PAY (basepayload);
mtu = GST_RTP_BASE_PAYLOAD_MTU (rtph264pay); mtu = GST_RTP_BASE_PAYLOAD_MTU (rtph264pay);
nalType = data[0] & 0x1f; gst_buffer_extract (paybuf, 0, &nalType, 1);
nalType &= 0x1f;
GST_DEBUG_OBJECT (rtph264pay, "Processing Buffer with NAL TYPE=%d", nalType); GST_DEBUG_OBJECT (rtph264pay, "Processing Buffer with NAL TYPE=%d", nalType);
/* should set src caps before pushing stuff, /* should set src caps before pushing stuff,
@ -945,9 +941,7 @@ gst_rtp_h264_pay_payload_nal (GstRTPBasePayload * basepayload,
GST_BUFFER_DTS (outbuf) = dts; GST_BUFFER_DTS (outbuf) = dts;
/* insert payload memory block */ /* insert payload memory block */
gst_buffer_append_memory (outbuf, outbuf = gst_buffer_append (outbuf, paybuf);
gst_memory_new_wrapped (GST_MEMORY_FLAG_READONLY, (guint8 *) data,
size, 0, size, NULL, NULL));
list = gst_buffer_list_new (); list = gst_buffer_list_new ();
@ -967,7 +961,7 @@ gst_rtp_h264_pay_payload_nal (GstRTPBasePayload * basepayload,
GST_DEBUG_OBJECT (basepayload, GST_DEBUG_OBJECT (basepayload,
"NAL Unit DOES NOT fit in one packet datasize=%d mtu=%d", size, mtu); "NAL Unit DOES NOT fit in one packet datasize=%d mtu=%d", size, mtu);
nalHeader = *data; gst_buffer_extract (paybuf, 0, &nalHeader, 1);
pos++; pos++;
size--; size--;
@ -1012,15 +1006,16 @@ gst_rtp_h264_pay_payload_nal (GstRTPBasePayload * basepayload,
/* FU Header */ /* FU Header */
payload[1] = (start << 7) | (end << 6) | (nalHeader & 0x1f); payload[1] = (start << 7) | (end << 6) | (nalHeader & 0x1f);
gst_rtp_buffer_unmap (&rtp);
/* insert payload memory block */ /* insert payload memory block */
gst_buffer_append_memory (outbuf, gst_buffer_append (outbuf,
gst_memory_new_wrapped (GST_MEMORY_FLAG_READONLY, gst_buffer_copy_region (paybuf, GST_BUFFER_COPY_MEMORY, pos,
(guint8 *) data + pos, limitedSize, 0, limitedSize, NULL, NULL)); limitedSize));
/* add the buffer to the buffer list */ /* add the buffer to the buffer list */
gst_buffer_list_add (list, outbuf); gst_buffer_list_add (list, outbuf);
gst_rtp_buffer_unmap (&rtp);
size -= limitedSize; size -= limitedSize;
pos += limitedSize; pos += limitedSize;
@ -1029,6 +1024,7 @@ gst_rtp_h264_pay_payload_nal (GstRTPBasePayload * basepayload,
} }
ret = gst_rtp_base_payload_push_list (basepayload, list); ret = gst_rtp_base_payload_push_list (basepayload, list);
gst_buffer_unref (paybuf);
} }
return ret; return ret;
} }
@ -1042,11 +1038,12 @@ gst_rtp_h264_pay_handle_buffer (GstRTPBasePayload * basepayload,
gsize size; gsize size;
guint nal_len, i; guint nal_len, i;
GstMapInfo map; GstMapInfo map;
const guint8 *data, *nal_data; const guint8 *data;
GstClockTime dts, pts; GstClockTime dts, pts;
GArray *nal_queue; GArray *nal_queue;
guint pushed = 0;
gboolean avc; gboolean avc;
GstBuffer *paybuf = NULL;
gsize skip;
rtph264pay = GST_RTP_H264_PAY (basepayload); rtph264pay = GST_RTP_H264_PAY (basepayload);
@ -1067,20 +1064,19 @@ gst_rtp_h264_pay_handle_buffer (GstRTPBasePayload * basepayload,
} else { } else {
dts = gst_adapter_prev_dts (rtph264pay->adapter, NULL); dts = gst_adapter_prev_dts (rtph264pay->adapter, NULL);
pts = gst_adapter_prev_pts (rtph264pay->adapter, NULL); pts = gst_adapter_prev_pts (rtph264pay->adapter, NULL);
if (buffer)
gst_adapter_push (rtph264pay->adapter, buffer);
size = gst_adapter_available (rtph264pay->adapter);
data = gst_adapter_map (rtph264pay->adapter, size);
GST_DEBUG_OBJECT (basepayload,
"got %" G_GSIZE_FORMAT " bytes (%" G_GSIZE_FORMAT ")", size,
buffer ? gst_buffer_get_size (buffer) : 0);
if (buffer) { if (buffer) {
if (!GST_CLOCK_TIME_IS_VALID (dts)) if (!GST_CLOCK_TIME_IS_VALID (dts))
dts = GST_BUFFER_DTS (buffer); dts = GST_BUFFER_DTS (buffer);
if (!GST_CLOCK_TIME_IS_VALID (pts)) if (!GST_CLOCK_TIME_IS_VALID (pts))
pts = GST_BUFFER_PTS (buffer); pts = GST_BUFFER_PTS (buffer);
gst_adapter_push (rtph264pay->adapter, buffer);
} }
size = gst_adapter_available (rtph264pay->adapter);
data = gst_adapter_map (rtph264pay->adapter, size);
GST_DEBUG_OBJECT (basepayload,
"got %" G_GSIZE_FORMAT " bytes (%" G_GSIZE_FORMAT ")", size,
buffer ? gst_buffer_get_size (buffer) : 0);
} }
ret = GST_FLOW_OK; ret = GST_FLOW_OK;
@ -1091,6 +1087,7 @@ gst_rtp_h264_pay_handle_buffer (GstRTPBasePayload * basepayload,
* latency. */ * latency. */
if (avc) { if (avc) {
guint nal_length_size; guint nal_length_size;
gsize offset = 0;
nal_length_size = rtph264pay->nal_length_size; nal_length_size = rtph264pay->nal_length_size;
@ -1105,6 +1102,7 @@ gst_rtp_h264_pay_handle_buffer (GstRTPBasePayload * basepayload,
/* skip the length bytes, make sure we don't run past the buffer size */ /* skip the length bytes, make sure we don't run past the buffer size */
data += nal_length_size; data += nal_length_size;
offset += nal_length_size;
size -= nal_length_size; size -= nal_length_size;
if (size >= nal_len) { if (size >= nal_len) {
@ -1123,13 +1121,16 @@ gst_rtp_h264_pay_handle_buffer (GstRTPBasePayload * basepayload,
end_of_au = TRUE; end_of_au = TRUE;
} }
paybuf = gst_buffer_copy_region (buffer, GST_BUFFER_COPY_MEMORY, offset,
nal_len);
ret = ret =
gst_rtp_h264_pay_payload_nal (basepayload, data, nal_len, dts, pts, gst_rtp_h264_pay_payload_nal (basepayload, paybuf, dts, pts,
end_of_au); end_of_au);
if (ret != GST_FLOW_OK) if (ret != GST_FLOW_OK)
break; break;
data += nal_len; data += nal_len;
offset += nal_len;
size -= nal_len; size -= nal_len;
} }
} else { } else {
@ -1143,8 +1144,8 @@ gst_rtp_h264_pay_handle_buffer (GstRTPBasePayload * basepayload,
* will not collect data. */ * will not collect data. */
data += next; data += next;
size -= next; size -= next;
nal_data = data;
nal_queue = rtph264pay->queue; nal_queue = rtph264pay->queue;
skip = next;
/* array must be empty when we get here */ /* array must be empty when we get here */
g_assert (nal_queue->len == 0); g_assert (nal_queue->len == 0);
@ -1216,8 +1217,9 @@ gst_rtp_h264_pay_handle_buffer (GstRTPBasePayload * basepayload,
goto caps_rejected; goto caps_rejected;
/* second pass to payload and push */ /* second pass to payload and push */
data = nal_data;
pushed = 0; if (nal_queue->len != 0)
gst_adapter_flush (rtph264pay->adapter, skip);
for (i = 0; i < nal_queue->len; i++) { for (i = 0; i < nal_queue->len; i++) {
guint size; guint size;
@ -1225,17 +1227,19 @@ gst_rtp_h264_pay_handle_buffer (GstRTPBasePayload * basepayload,
nal_len = g_array_index (nal_queue, guint, i); nal_len = g_array_index (nal_queue, guint, i);
/* skip start code */ /* skip start code */
data += 3; gst_adapter_flush (rtph264pay->adapter, 3);
/* Trim the end unless we're the last NAL in the stream. /* Trim the end unless we're the last NAL in the stream.
* In case we're not at the end of the buffer we know the next block * In case we're not at the end of the buffer we know the next block
* starts with 0x000001 so all the 0x00 bytes at the end of this one are * starts with 0x000001 so all the 0x00 bytes at the end of this one are
* trailing 0x0 that can be discarded */ * trailing 0x0 that can be discarded */
size = nal_len; size = nal_len;
data = gst_adapter_map (rtph264pay->adapter, size);
if (i + 1 != nal_queue->len || buffer != NULL) if (i + 1 != nal_queue->len || buffer != NULL)
for (; size > 1 && data[size - 1] == 0x0; size--) for (; size > 1 && data[size - 1] == 0x0; size--)
/* skip */ ; /* skip */ ;
/* If it's the last nal unit we have in non-bytestream mode, we can /* If it's the last nal unit we have in non-bytestream mode, we can
* assume it's the end of an access-unit * assume it's the end of an access-unit
* *
@ -1246,19 +1250,20 @@ gst_rtp_h264_pay_handle_buffer (GstRTPBasePayload * basepayload,
if ((rtph264pay->alignment == GST_H264_ALIGNMENT_AU || buffer == NULL) && if ((rtph264pay->alignment == GST_H264_ALIGNMENT_AU || buffer == NULL) &&
i == nal_queue->len - 1) i == nal_queue->len - 1)
end_of_au = TRUE; end_of_au = TRUE;
paybuf = gst_adapter_take_buffer (rtph264pay->adapter, size);
g_assert (paybuf);
/* put the data in one or more RTP packets */ /* put the data in one or more RTP packets */
ret = ret =
gst_rtp_h264_pay_payload_nal (basepayload, data, size, dts, pts, gst_rtp_h264_pay_payload_nal (basepayload, paybuf, dts, pts,
end_of_au); end_of_au);
if (ret != GST_FLOW_OK) { if (ret != GST_FLOW_OK) {
break; break;
} }
/* move to next NAL packet */ /* move to next NAL packet */
data += nal_len; /* Skips the trailing zeros */
pushed += nal_len + 3; gst_adapter_flush (rtph264pay->adapter, nal_len - size);
} }
g_array_set_size (nal_queue, 0); g_array_set_size (nal_queue, 0);
} }
@ -1269,7 +1274,6 @@ done:
gst_buffer_unref (buffer); gst_buffer_unref (buffer);
} else { } else {
gst_adapter_unmap (rtph264pay->adapter); gst_adapter_unmap (rtph264pay->adapter);
gst_adapter_flush (rtph264pay->adapter, pushed);
} }
return ret; return ret;

52
tests/check/elements/rtp-payloading.c
View file

@ -551,6 +551,30 @@ GST_START_TEST (rtp_h264_list_lt_mtu)
rtp_h264_list_lt_mtu_bytes_sent, rtp_h264_list_lt_mtu_mtu_size, TRUE); rtp_h264_list_lt_mtu_bytes_sent, rtp_h264_list_lt_mtu_mtu_size, TRUE);
} }
GST_END_TEST;
static const guint8 rtp_h264_list_lt_mtu_frame_data_avc[] =
/* packetized data */
{ 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00,
0xad, 0x80, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0d, 0x00
};
/* NAL = 4 bytes */
static int rtp_h264_list_lt_mtu_bytes_sent_avc = 2 * (16 - 2 * 4);
//static int rtp_h264_list_lt_mtu_mtu_size = 1024;
GST_START_TEST (rtp_h264_list_lt_mtu_avc)
{
/* FIXME 0.11: fully specify h264 caps (and make payloader check) */
rtp_pipeline_test (rtp_h264_list_lt_mtu_frame_data_avc,
rtp_h264_list_lt_mtu_frame_data_size, rtp_h264_list_lt_mtu_frame_count,
"video/x-h264,stream-format=(string)avc,alignment=(string)au,"
"codec_data=(buffer)01640014ffe1001867640014acd94141fb0110000003001773594000f142996001000568ebecb22c",
"rtph264pay", "rtph264depay",
rtp_h264_list_lt_mtu_bytes_sent_avc, rtp_h264_list_lt_mtu_mtu_size, TRUE);
}
GST_END_TEST; GST_END_TEST;
static const guint8 rtp_h264_list_gt_mtu_frame_data[] = static const guint8 rtp_h264_list_gt_mtu_frame_data[] =
/* not packetized, next NAL starts with 0001 */ /* not packetized, next NAL starts with 0001 */
@ -582,6 +606,32 @@ GST_START_TEST (rtp_h264_list_gt_mtu)
} }
GST_END_TEST; GST_END_TEST;
static const guint8 rtp_h264_list_gt_mtu_frame_data_avc[] =
/* packetized data */
{ 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
};
/* NAL = 4 bytes. When data does not fit into 1 mtu, 1 byte will be skipped */
static int rtp_h264_list_gt_mtu_bytes_sent_avc = 1 * (64 - 2 * 4 - 2 * 1);
GST_START_TEST (rtp_h264_list_gt_mtu_avc)
{
/* FIXME 0.11: fully specify h264 caps (and make payloader check) */
rtp_pipeline_test (rtp_h264_list_gt_mtu_frame_data_avc,
rtp_h264_list_gt_mtu_frame_data_size, rtp_h264_list_gt_mtu_frame_count,
"video/x-h264,stream-format=(string)avc,alignment=(string)au,"
"codec_data=(buffer)01640014ffe1001867640014acd94141fb0110000003001773594000f142996001000568ebecb22c",
"rtph264pay", "rtph264depay",
rtp_h264_list_gt_mtu_bytes_sent_avc, rtp_h264_list_gt_mtu_mty_size, TRUE);
}
GST_END_TEST;
static const guint8 rtp_L16_frame_data[] = static const guint8 rtp_L16_frame_data[] =
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
@ -806,7 +856,9 @@ rtp_payloading_suite (void)
tcase_add_test (tc_chain, rtp_h263p); tcase_add_test (tc_chain, rtp_h263p);
tcase_add_test (tc_chain, rtp_h264); tcase_add_test (tc_chain, rtp_h264);
tcase_add_test (tc_chain, rtp_h264_list_lt_mtu); tcase_add_test (tc_chain, rtp_h264_list_lt_mtu);
tcase_add_test (tc_chain, rtp_h264_list_lt_mtu_avc);
tcase_add_test (tc_chain, rtp_h264_list_gt_mtu); tcase_add_test (tc_chain, rtp_h264_list_gt_mtu);
tcase_add_test (tc_chain, rtp_h264_list_gt_mtu_avc);
tcase_add_test (tc_chain, rtp_L16); tcase_add_test (tc_chain, rtp_L16);
tcase_add_test (tc_chain, rtp_mp2t); tcase_add_test (tc_chain, rtp_mp2t);
tcase_add_test (tc_chain, rtp_mp4v); tcase_add_test (tc_chain, rtp_mp4v);