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

rfbsrc: Implement decide_allocation virtual

Browse source 
This way we can use the base class for buffer allocation, hence use
fill() instead of create() virtual. This also adds a strict check on the
select pool buffer size as we don't support strides and padding.

This is based on initial patch proposed by Sebastien Dröge, from which I
also fixed a buffer pool leak.

https://bugzilla.gnome.org/show_bug.cgi?id=763441
This commit is contained in:
Nicolas Dufresne 2016-04-05 21:07:32 -04:00
parent d3d34b5a8c
commit 7e293f15dd
2 changed files with 41 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
gst/librfb/gstrfbsrc.c
View file

@ -76,8 +76,9 @@ static gboolean gst_rfb_src_negotiate (GstBaseSrc * bsrc);
static gboolean gst_rfb_src_stop (GstBaseSrc * bsrc); static gboolean gst_rfb_src_stop (GstBaseSrc * bsrc);
static gboolean gst_rfb_src_event (GstBaseSrc * bsrc, GstEvent * event); static gboolean gst_rfb_src_event (GstBaseSrc * bsrc, GstEvent * event);
static gboolean gst_rfb_src_unlock (GstBaseSrc * bsrc); static gboolean gst_rfb_src_unlock (GstBaseSrc * bsrc);
static GstFlowReturn gst_rfb_src_create (GstPushSrc * psrc, static gboolean gst_rfb_src_decide_allocation (GstBaseSrc * bsrc,
GstBuffer ** outbuf); GstQuery * query);
static GstFlowReturn gst_rfb_src_fill (GstPushSrc * psrc, GstBuffer * outbuf);
#define gst_rfb_src_parent_class parent_class #define gst_rfb_src_parent_class parent_class
G_DEFINE_TYPE (GstRfbSrc, gst_rfb_src, GST_TYPE_PUSH_SRC); G_DEFINE_TYPE (GstRfbSrc, gst_rfb_src, GST_TYPE_PUSH_SRC);
@ -151,7 +152,9 @@ gst_rfb_src_class_init (GstRfbSrcClass * klass)
gstbasesrc_class->stop = GST_DEBUG_FUNCPTR (gst_rfb_src_stop); gstbasesrc_class->stop = GST_DEBUG_FUNCPTR (gst_rfb_src_stop);
gstbasesrc_class->event = GST_DEBUG_FUNCPTR (gst_rfb_src_event); gstbasesrc_class->event = GST_DEBUG_FUNCPTR (gst_rfb_src_event);
gstbasesrc_class->unlock = GST_DEBUG_FUNCPTR (gst_rfb_src_unlock); gstbasesrc_class->unlock = GST_DEBUG_FUNCPTR (gst_rfb_src_unlock);
gstpushsrc_class->create = GST_DEBUG_FUNCPTR (gst_rfb_src_create); gstpushsrc_class->fill = GST_DEBUG_FUNCPTR (gst_rfb_src_fill);
gstbasesrc_class->decide_allocation =
GST_DEBUG_FUNCPTR (gst_rfb_src_decide_allocation);
gstelement_class = GST_ELEMENT_CLASS (klass); gstelement_class = GST_ELEMENT_CLASS (klass);
@ -184,10 +187,7 @@ gst_rfb_src_init (GstRfbSrc * src)
src->view_only = FALSE; src->view_only = FALSE;
src->pool = NULL;
src->decoder = rfb_decoder_new (); src->decoder = rfb_decoder_new ();
} }
static void static void
@ -196,10 +196,7 @@ gst_rfb_src_finalize (GObject * object)
GstRfbSrc *src = GST_RFB_SRC (object); GstRfbSrc *src = GST_RFB_SRC (object);
g_free (src->host); g_free (src->host);
if (src->pool) {
gst_object_unref (src->pool);
src->pool = NULL;
}
if (src->decoder) { if (src->decoder) {
rfb_decoder_free (src->decoder); rfb_decoder_free (src->decoder);
src->decoder = NULL; src->decoder = NULL;
@ -341,49 +338,48 @@ gst_rfb_src_get_property (GObject * object, guint prop_id,
} }
} }
static void static gboolean
gst_rfb_negotiate_pool (GstRfbSrc * src, GstCaps * caps) gst_rfb_src_decide_allocation (GstBaseSrc * bsrc, GstQuery * query)
{ {
GstQuery *query;
GstBufferPool *pool = NULL; GstBufferPool *pool = NULL;
guint size, min, max; guint size, min = 1, max = 0;
GstStructure *config; GstStructure *config;
GstCaps *caps;
GstVideoInfo info;
gint i;
gboolean ret;
/* find a pool for the negotiated caps now */ gst_query_parse_allocation (query, &caps, NULL);
query = gst_query_new_allocation (caps, TRUE);
if (!gst_pad_peer_query (GST_BASE_SRC_PAD (src), query)) { if (!caps || !gst_video_info_from_caps (&info, caps))
/* not a problem, we use the defaults of query */ return FALSE;
GST_DEBUG_OBJECT (src, "could not get downstream ALLOCATION hints");
}
if (gst_query_get_n_allocation_pools (query) > 0) { for (i = 0; i < gst_query_get_n_allocation_pools (query); i++) {
/* we got configuration from our peer, parse them */
gst_query_parse_nth_allocation_pool (query, 0, &pool, &size, &min, &max); gst_query_parse_nth_allocation_pool (query, 0, &pool, &size, &min, &max);
} else {
GST_DEBUG_OBJECT (src, "didn't get downstream pool hints"); /* TODO We restrict to the exact size as we don't support strides or
size = GST_BASE_SRC (src)->blocksize; * special padding */
min = max = 0; if (size == info.size)
break;
gst_object_unref (pool);
pool = NULL;
} }
if (pool == NULL) { if (pool == NULL) {
/* we did not get a pool, make one ourselves then */ /* we did not get a pool, make one ourselves then */
pool = gst_video_buffer_pool_new (); pool = gst_video_buffer_pool_new ();
size = info.size;
min = max = 0;
} }
if (src->pool)
gst_object_unref (src->pool);
src->pool = pool;
config = gst_buffer_pool_get_config (pool); config = gst_buffer_pool_get_config (pool);
gst_buffer_pool_config_set_params (config, caps, size, min, max); gst_buffer_pool_config_set_params (config, caps, size, min, max);
gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META);
gst_buffer_pool_set_config (pool, config); ret = gst_buffer_pool_set_config (pool, config);
// and activate gst_object_unref (pool);
gst_buffer_pool_set_active (pool, TRUE);
gst_query_unref (query); return ret;
} }
static gboolean static gboolean
@ -444,13 +440,6 @@ gst_rfb_src_negotiate (GstBaseSrc * bsrc)
decoder->rect_height = decoder->rect_height =
(decoder->rect_height ? decoder->rect_height : decoder->height); (decoder->rect_height ? decoder->rect_height : decoder->height);
g_object_set (bsrc, "blocksize",
src->decoder->width * src->decoder->height * (decoder->bpp / 8), NULL);
decoder->frame = g_malloc (bsrc->blocksize);
if (decoder->use_copyrect) {
decoder->prev_frame = g_malloc (bsrc->blocksize);
}
decoder->decoder_private = src; decoder->decoder_private = src;
/* calculate some many used values */ /* calculate some many used values */
@ -473,10 +462,13 @@ gst_rfb_src_negotiate (GstBaseSrc * bsrc)
gst_video_info_set_format (&vinfo, vformat, decoder->rect_width, gst_video_info_set_format (&vinfo, vformat, decoder->rect_width,
decoder->rect_height); decoder->rect_height);
decoder->frame = g_malloc (vinfo.size);
if (decoder->use_copyrect)
decoder->prev_frame = g_malloc (vinfo.size);
caps = gst_video_info_to_caps (&vinfo); caps = gst_video_info_to_caps (&vinfo);
gst_base_src_set_caps (bsrc, caps); gst_base_src_set_caps (bsrc, caps);
gst_rfb_negotiate_pool (src, caps);
gst_caps_unref (caps); gst_caps_unref (caps);
@ -504,12 +496,11 @@ gst_rfb_src_stop (GstBaseSrc * bsrc)
} }
static GstFlowReturn static GstFlowReturn
gst_rfb_src_create (GstPushSrc * psrc, GstBuffer ** outbuf) gst_rfb_src_fill (GstPushSrc * psrc, GstBuffer * outbuf)
{ {
GstRfbSrc *src = GST_RFB_SRC (psrc); GstRfbSrc *src = GST_RFB_SRC (psrc);
RfbDecoder *decoder = src->decoder; RfbDecoder *decoder = src->decoder;
GstMapInfo info; GstMapInfo info;
GstFlowReturn ret;
rfb_decoder_send_update_request (decoder, src->incremental_update, rfb_decoder_send_update_request (decoder, src->incremental_update,
decoder->offset_x, decoder->offset_y, decoder->rect_width, decoder->offset_x, decoder->offset_y, decoder->rect_width,
@ -530,22 +521,19 @@ gst_rfb_src_create (GstPushSrc * psrc, GstBuffer ** outbuf)
} }
} }
/* Create the buffer. */ if (!gst_buffer_map (outbuf, &info, GST_MAP_WRITE)) {
ret = gst_buffer_pool_acquire_buffer (src->pool, outbuf, NULL); GST_ELEMENT_ERROR (src, RESOURCE, WRITE,
("Could not map the output frame"), (NULL));
if (G_UNLIKELY (ret != GST_FLOW_OK)) {
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} }
gst_buffer_map (*outbuf, &info, GST_MAP_WRITE);
memcpy (info.data, decoder->frame, info.size); memcpy (info.data, decoder->frame, info.size);
GST_BUFFER_PTS (*outbuf) = GST_BUFFER_PTS (outbuf) =
gst_clock_get_time (GST_ELEMENT_CLOCK (src)) - gst_clock_get_time (GST_ELEMENT_CLOCK (src)) -
GST_ELEMENT_CAST (src)->base_time; GST_ELEMENT_CAST (src)->base_time;
gst_buffer_unmap (*outbuf, &info); gst_buffer_unmap (outbuf, &info);
return GST_FLOW_OK; return GST_FLOW_OK;
} }

2
gst/librfb/gstrfbsrc.h
View file

@ -61,8 +61,6 @@ struct _GstRfbSrc
guint button_mask; guint button_mask;
GstBufferPool *pool;
/* protocol version */ /* protocol version */
guint version_major; guint version_major;
guint version_minor; guint version_minor;