mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtpvrawdepay: map/unmap output frame only once, not for every input packet

Browse source 
Map output buffer after creating it and keep it mapped
until we're done with it instead of mapping/unmapping
it for every single input buffer.
This commit is contained in:
Tim-Philipp Müller 2015-05-23 13:23:22 +01:00
parent d03b9513f1
commit 2aafb3951d
2 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
gst/rtp/gstrtpvrawdepay.c
View file

@ -108,6 +108,7 @@ static void
gst_rtp_vraw_depay_reset (GstRtpVRawDepay * rtpvrawdepay) gst_rtp_vraw_depay_reset (GstRtpVRawDepay * rtpvrawdepay)
{ {
if (rtpvrawdepay->outbuf) { if (rtpvrawdepay->outbuf) {
gst_video_frame_unmap (&rtpvrawdepay->frame);
gst_buffer_unref (rtpvrawdepay->outbuf); gst_buffer_unref (rtpvrawdepay->outbuf);
rtpvrawdepay->outbuf = NULL; rtpvrawdepay->outbuf = NULL;
} }
@ -324,7 +325,7 @@ gst_rtp_vraw_depay_process (GstRTPBaseDepayload * depayload, GstBuffer * buf)
guint cont, ystride, uvstride, pgroup, payload_len; guint cont, ystride, uvstride, pgroup, payload_len;
gint width, height, xinc, yinc; gint width, height, xinc, yinc;
GstRTPBuffer rtp = { NULL }; GstRTPBuffer rtp = { NULL };
GstVideoFrame frame; GstVideoFrame *frame;
gboolean marker; gboolean marker;
GstBuffer *outbuf = NULL; GstBuffer *outbuf = NULL;
@ -341,6 +342,7 @@ gst_rtp_vraw_depay_process (GstRTPBaseDepayload * depayload, GstBuffer * buf)
GST_LOG_OBJECT (depayload, "new frame with timestamp %u", timestamp); GST_LOG_OBJECT (depayload, "new frame with timestamp %u", timestamp);
/* new timestamp, flush old buffer and create new output buffer */ /* new timestamp, flush old buffer and create new output buffer */
if (rtpvrawdepay->outbuf) { if (rtpvrawdepay->outbuf) {
gst_video_frame_unmap (&rtpvrawdepay->frame);
gst_rtp_base_depayload_push (depayload, rtpvrawdepay->outbuf); gst_rtp_base_depayload_push (depayload, rtpvrawdepay->outbuf);
rtpvrawdepay->outbuf = NULL; rtpvrawdepay->outbuf = NULL;
} }
@ -362,22 +364,26 @@ gst_rtp_vraw_depay_process (GstRTPBaseDepayload * depayload, GstBuffer * buf)
/* clear timestamp from alloc... */ /* clear timestamp from alloc... */
GST_BUFFER_TIMESTAMP (outbuf) = -1; GST_BUFFER_TIMESTAMP (outbuf) = -1;
if (!gst_video_frame_map (&rtpvrawdepay->frame, &rtpvrawdepay->vinfo,
outbuf, GST_MAP_WRITE | GST_VIDEO_FRAME_MAP_FLAG_NO_REF))
goto invalid_frame;
rtpvrawdepay->outbuf = outbuf; rtpvrawdepay->outbuf = outbuf;
rtpvrawdepay->timestamp = timestamp; rtpvrawdepay->timestamp = timestamp;
} }
if (!gst_video_frame_map (&frame, &rtpvrawdepay->vinfo, rtpvrawdepay->outbuf, frame = &rtpvrawdepay->frame;
GST_MAP_WRITE))
goto invalid_frame; g_assert (frame->buffer != NULL);
/* get pointer and strides of the planes */ /* get pointer and strides of the planes */
p0 = GST_VIDEO_FRAME_PLANE_DATA (&frame, 0); p0 = GST_VIDEO_FRAME_PLANE_DATA (frame, 0);
yp = GST_VIDEO_FRAME_COMP_DATA (&frame, 0); yp = GST_VIDEO_FRAME_COMP_DATA (frame, 0);
up = GST_VIDEO_FRAME_COMP_DATA (&frame, 1); up = GST_VIDEO_FRAME_COMP_DATA (frame, 1);
vp = GST_VIDEO_FRAME_COMP_DATA (&frame, 2); vp = GST_VIDEO_FRAME_COMP_DATA (frame, 2);
ystride = GST_VIDEO_FRAME_COMP_STRIDE (&frame, 0); ystride = GST_VIDEO_FRAME_COMP_STRIDE (frame, 0);
uvstride = GST_VIDEO_FRAME_COMP_STRIDE (&frame, 1); uvstride = GST_VIDEO_FRAME_COMP_STRIDE (frame, 1);
pgroup = rtpvrawdepay->pgroup; pgroup = rtpvrawdepay->pgroup;
width = GST_VIDEO_INFO_WIDTH (&rtpvrawdepay->vinfo); width = GST_VIDEO_INFO_WIDTH (&rtpvrawdepay->vinfo);
@ -550,12 +556,12 @@ gst_rtp_vraw_depay_process (GstRTPBaseDepayload * depayload, GstBuffer * buf)
payload_len -= length; payload_len -= length;
} }
gst_video_frame_unmap (&frame);
marker = gst_rtp_buffer_get_marker (&rtp); marker = gst_rtp_buffer_get_marker (&rtp);
gst_rtp_buffer_unmap (&rtp); gst_rtp_buffer_unmap (&rtp);
if (marker) { if (marker) {
GST_LOG_OBJECT (depayload, "marker, flushing frame"); GST_LOG_OBJECT (depayload, "marker, flushing frame");
gst_video_frame_unmap (&rtpvrawdepay->frame);
outbuf = rtpvrawdepay->outbuf; outbuf = rtpvrawdepay->outbuf;
rtpvrawdepay->outbuf = NULL; rtpvrawdepay->outbuf = NULL;
rtpvrawdepay->timestamp = -1; rtpvrawdepay->timestamp = -1;
@ -567,7 +573,6 @@ unknown_sampling:
{ {
GST_ELEMENT_ERROR (depayload, STREAM, FORMAT, GST_ELEMENT_ERROR (depayload, STREAM, FORMAT,
(NULL), ("unimplemented sampling")); (NULL), ("unimplemented sampling"));
gst_video_frame_unmap (&frame);
gst_rtp_buffer_unmap (&rtp); gst_rtp_buffer_unmap (&rtp);
return NULL; return NULL;
} }
@ -580,20 +585,18 @@ alloc_failed:
invalid_frame: invalid_frame:
{ {
GST_ERROR_OBJECT (depayload, "could not map video frame"); GST_ERROR_OBJECT (depayload, "could not map video frame");
gst_rtp_buffer_unmap (&rtp); gst_buffer_unref (outbuf);
return NULL; return NULL;
} }
wrong_length: wrong_length:
{ {
GST_WARNING_OBJECT (depayload, "length not multiple of pgroup"); GST_WARNING_OBJECT (depayload, "length not multiple of pgroup");
gst_video_frame_unmap (&frame);
gst_rtp_buffer_unmap (&rtp); gst_rtp_buffer_unmap (&rtp);
return NULL; return NULL;
} }
short_packet: short_packet:
{ {
GST_WARNING_OBJECT (depayload, "short packet"); GST_WARNING_OBJECT (depayload, "short packet");
gst_video_frame_unmap (&frame);
gst_rtp_buffer_unmap (&rtp); gst_rtp_buffer_unmap (&rtp);
return NULL; return NULL;
} }

2
gst/rtp/gstrtpvrawdepay.h
View file

@ -49,9 +49,9 @@ struct _GstRtpVRawDepay
GstBufferPool *pool; GstBufferPool *pool;
GstVideoInfo vinfo; GstVideoInfo vinfo;
GstVideoFrame frame;
GstBuffer *outbuf; GstBuffer *outbuf;
guint32 timestamp; guint32 timestamp;
guint outsize;
gint pgroup; gint pgroup;
gint xinc, yinc; gint xinc, yinc;