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

rtph264pay: use buffer lists

Browse source 
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=679994
This commit is contained in:
Patricia Muscalu 2012-07-16 11:07:44 +02:00 committed by Wim Taymans
parent b01cf1561c
commit d38ac43a27
1 changed files with 33 additions and 106 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

139
gst/rtp/gstrtph264pay.c
View file

@ -783,7 +783,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, const guint8 * data, guint size, GstClockTime dts, GstClockTime pts,
GstBuffer * buffer_orig, 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,
@ -800,7 +800,7 @@ gst_rtp_h264_pay_send_sps_pps (GstRTPBasePayload * basepayload,
/* resend SPS */ /* resend SPS */
gst_buffer_map (sps_buf, &map, GST_MAP_READ); gst_buffer_map (sps_buf, &map, GST_MAP_READ);
ret = gst_rtp_h264_pay_payload_nal (basepayload, ret = gst_rtp_h264_pay_payload_nal (basepayload,
map.data, map.size, dts, pts, sps_buf, FALSE); map.data, map.size, dts, pts, FALSE);
gst_buffer_unmap (sps_buf, &map); 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)
@ -813,7 +813,7 @@ gst_rtp_h264_pay_send_sps_pps (GstRTPBasePayload * basepayload,
/* resend PPS */ /* resend PPS */
gst_buffer_map (pps_buf, &map, GST_MAP_READ); gst_buffer_map (pps_buf, &map, GST_MAP_READ);
ret = gst_rtp_h264_pay_payload_nal (basepayload, ret = gst_rtp_h264_pay_payload_nal (basepayload,
map.data, map.size, dts, pts, pps_buf, FALSE); map.data, map.size, dts, pts, FALSE);
gst_buffer_unmap (pps_buf, &map); 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)
@ -829,7 +829,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, const guint8 * data, guint size, GstClockTime dts, GstClockTime pts,
GstBuffer * buffer_orig, gboolean end_of_au) gboolean end_of_au)
{ {
GstRtpH264Pay *rtph264pay; GstRtpH264Pay *rtph264pay;
GstFlowReturn ret; GstFlowReturn ret;
@ -837,9 +837,7 @@ gst_rtp_h264_pay_payload_nal (GstRTPBasePayload * basepayload,
guint packet_len, payload_len, mtu; guint packet_len, payload_len, mtu;
GstBuffer *outbuf; GstBuffer *outbuf;
guint8 *payload; guint8 *payload;
#if 0
GstBufferList *list = NULL; GstBufferList *list = NULL;
#endif
gboolean send_spspps; gboolean send_spspps;
GstRTPBuffer rtp = { NULL }; GstRTPBuffer rtp = { NULL };
@ -904,19 +902,10 @@ gst_rtp_h264_pay_payload_nal (GstRTPBasePayload * basepayload,
"NAL Unit fit in one packet datasize=%d mtu=%d", size, mtu); "NAL Unit fit in one packet datasize=%d mtu=%d", size, mtu);
/* will fit in one packet */ /* will fit in one packet */
#if 0 /* use buffer lists
if (rtph264pay->buffer_list) { * create buffer without payload containing only the RTP header
/* use buffer lists * (memory block at index 0) */
* first create buffer without payload containing only the RTP header outbuf = gst_rtp_buffer_new_allocate (0, 0, 0);
* and then another buffer containing the payload. both buffers will
* be then added to the list */
outbuf = gst_rtp_buffer_new_allocate (0, 0, 0);
} else
#endif
{
/* use the old-fashioned way with a single buffer and memcpy */
outbuf = gst_rtp_buffer_new_allocate (size, 0, 0);
}
gst_rtp_buffer_map (outbuf, GST_MAP_WRITE, &rtp); gst_rtp_buffer_map (outbuf, GST_MAP_WRITE, &rtp);
@ -929,37 +918,20 @@ gst_rtp_h264_pay_payload_nal (GstRTPBasePayload * basepayload,
GST_BUFFER_PTS (outbuf) = pts; GST_BUFFER_PTS (outbuf) = pts;
GST_BUFFER_DTS (outbuf) = dts; GST_BUFFER_DTS (outbuf) = dts;
#if 0 /* insert payload memory block */
if (rtph264pay->buffer_list) { gst_buffer_append_memory (outbuf,
GstBuffer *paybuf; gst_memory_new_wrapped (GST_MEMORY_FLAG_READONLY, (guint8*) data,
size, 0, size, NULL, NULL));
/* create another buffer with the payload. */ list = gst_buffer_list_new ();
if (buffer_orig)
paybuf = gst_buffer_create_sub (buffer_orig, data -
GST_BUFFER_DATA (buffer_orig), size);
else {
paybuf = gst_buffer_new_and_alloc (size);
gst_buffer_fill (paybuf, 0, data, size);
}
list = gst_buffer_list_new (); /* add the buffer to the buffer list */
gst_buffer_list_add (list, outbuf);
/* add both buffers to the buffer list */ gst_rtp_buffer_unmap (&rtp);
gst_buffer_list_add (list, outbuf);
gst_buffer_list_add (list, paybuf);
/* push the list to the next element in the pipe */ /* push the list to the next element in the pipe */
ret = gst_rtp_base_payload_push_list (basepayload, list); ret = gst_rtp_base_payload_push_list (basepayload, list);
} else
#endif
{
payload = gst_rtp_buffer_get_payload (&rtp);
GST_DEBUG_OBJECT (basepayload, "Copying %d bytes to outbuf", size);
memcpy (payload, data, size);
gst_rtp_buffer_unmap (&rtp);
ret = gst_rtp_base_payload_push (basepayload, outbuf);
}
} else { } else {
/* fragmentation Units FU-A */ /* fragmentation Units FU-A */
guint8 nalHeader; guint8 nalHeader;
@ -981,12 +953,7 @@ gst_rtp_h264_pay_payload_nal (GstRTPBasePayload * basepayload,
/* We keep 2 bytes for FU indicator and FU Header */ /* We keep 2 bytes for FU indicator and FU Header */
payload_len = gst_rtp_buffer_calc_payload_len (mtu - 2, 0, 0); payload_len = gst_rtp_buffer_calc_payload_len (mtu - 2, 0, 0);
#if 0 list = gst_buffer_list_new ();
if (rtph264pay->buffer_list) {
list = gst_buffer_list_new ();
it = gst_buffer_list_iterate (list);
}
#endif
while (end == 0) { while (end == 0) {
limitedSize = size < payload_len ? size : payload_len; limitedSize = size < payload_len ? size : payload_len;
@ -994,20 +961,10 @@ gst_rtp_h264_pay_payload_nal (GstRTPBasePayload * basepayload,
"Inside FU-A fragmentation limitedSize=%d iteration=%d", limitedSize, "Inside FU-A fragmentation limitedSize=%d iteration=%d", limitedSize,
ii); ii);
#if 0 /* use buffer lists
if (rtph264pay->buffer_list) { * create buffer without payload containing only the RTP header
/* use buffer lists * (memory block at index 0) */
* first create buffer without payload containing only the RTP header outbuf = gst_rtp_buffer_new_allocate (2, 0, 0);
* and then another buffer containing the payload. both buffers will
* be then added to the list */
outbuf = gst_rtp_buffer_new_allocate (2, 0, 0);
} else
#endif
{
/* use the old-fashioned way with a single buffer and memcpy
* first create buffer to hold the payload */
outbuf = gst_rtp_buffer_new_allocate (limitedSize + 2, 0, 0);
}
gst_rtp_buffer_map (outbuf, GST_MAP_WRITE, &rtp); gst_rtp_buffer_map (outbuf, GST_MAP_WRITE, &rtp);
@ -1029,39 +986,15 @@ 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);
#if 0 /* insert payload memory block */
if (rtph264pay->buffer_list) { gst_buffer_append_memory (outbuf,
GstBuffer *paybuf; gst_memory_new_wrapped (GST_MEMORY_FLAG_READONLY, (guint8 *) data + pos,
limitedSize, 0, limitedSize, NULL, NULL));
/* create another buffer to hold the payload */ /* add the buffer to the buffer list */
if (buffer_orig) gst_buffer_list_add (list, outbuf);
paybuf = gst_buffer_create_sub (buffer_orig, data -
GST_BUFFER_DATA (buffer_orig) + pos, limitedSize);
else {
paybuf = gst_buffer_new_and_alloc (limitedSize);
memcpy (GST_BUFFER_DATA (paybuf), data + pos, limitedSize);
}
/* create a new group to hold the header and the payload */ gst_rtp_buffer_unmap (&rtp);
gst_buffer_list_iterator_add_group (it);
/* add both buffers to the buffer list */
gst_buffer_list_iterator_add (it, outbuf);
gst_buffer_list_iterator_add (it, paybuf);
} else
#endif
{
memcpy (&payload[2], data + pos, limitedSize);
gst_rtp_buffer_unmap (&rtp);
GST_DEBUG_OBJECT (basepayload,
"recorded %d payload bytes into packet iteration=%d",
limitedSize + 2, ii);
ret = gst_rtp_base_payload_push (basepayload, outbuf);
if (ret != GST_FLOW_OK)
break;
}
size -= limitedSize; size -= limitedSize;
pos += limitedSize; pos += limitedSize;
@ -1069,13 +1002,7 @@ gst_rtp_h264_pay_payload_nal (GstRTPBasePayload * basepayload,
start = 0; start = 0;
} }
#if 0 ret = gst_rtp_base_payload_push_list (basepayload, list);
if (rtph264pay->buffer_list) {
/* free iterator and push the whole buffer list at once */
gst_buffer_list_iterator_free (it);
ret = gst_rtp_base_payload_push_list (basepayload, list);
}
#endif
} }
return ret; return ret;
} }
@ -1166,7 +1093,7 @@ gst_rtp_h264_pay_handle_buffer (GstRTPBasePayload * basepayload,
ret = ret =
gst_rtp_h264_pay_payload_nal (basepayload, data, nal_len, dts, pts, gst_rtp_h264_pay_payload_nal (basepayload, data, nal_len, dts, pts,
buffer, end_of_au); end_of_au);
if (ret != GST_FLOW_OK) if (ret != GST_FLOW_OK)
break; break;
@ -1290,7 +1217,7 @@ gst_rtp_h264_pay_handle_buffer (GstRTPBasePayload * basepayload,
/* 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, data, size, dts, pts,
buffer, end_of_au); end_of_au);
if (ret != GST_FLOW_OK) { if (ret != GST_FLOW_OK) {
break; break;
} }