mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-03 21:25:54 +00:00
Code Issues 1 Projects Releases Wiki Activity

xvimagepool: Update size, stride, and offset with allocated XvImage

Browse source 
Memory layout of XvImage might be different from that of GstVideoInfo.
If so, the image size, stride, and offset would be wrongly informed.

Fixes: https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/issues/677
This commit is contained in:
Seungha Yang 2019-11-08 17:28:44 +09:00 committed by Sebastian Dröge
parent ce5e2f6917
commit b4e37d8a4b
2 changed files with 45 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
sys/xvimage/xvimagepool.c
View file

@ -128,6 +128,39 @@ xvimage_buffer_pool_set_config (GstBufferPool * pool, GstStructure * config)
xvpool->crop.w = xvpool->info.width;
xvpool->crop.h = xvpool->info.height;
/* update offset, stride and size with actual xvimage buffer */
if (xvpool->pre_alloc_mem)
gst_memory_unref (xvpool->pre_alloc_mem);
xvpool->pre_alloc_mem = gst_xvimage_allocator_alloc (xvpool->allocator,
xvpool->im_format, &info, xvpool->padded_width,
xvpool->padded_height, &xvpool->crop, NULL);
if (!xvpool->pre_alloc_mem) {
GST_ERROR_OBJECT (pool, "couldn't allocate image");
gst_structure_free (config);
return FALSE;
} else {
gint i;
XvImage *img;
img = gst_xvimage_memory_get_xvimage ((GstXvImageMemory *)
xvpool->pre_alloc_mem);
info.size = img->data_size;
for (i = 0; i < img->num_planes; i++) {
info.stride[i] = img->pitches[i];
info.offset[i] = img->offsets[i];
}
if (!gst_video_info_is_equal (&xvpool->info, &info) ||
xvpool->info.size != info.size) {
GST_WARNING_OBJECT (pool, "different size, stride and/or offset, update");
xvpool->info = info;
}
}
gst_buffer_pool_config_set_params (config, caps, info.size, min_buffers,
max_buffers);
@ -173,8 +206,13 @@ xvimage_buffer_pool_alloc (GstBufferPool * pool, GstBuffer ** buffer,
xvimage = gst_buffer_new ();
mem = gst_xvimage_allocator_alloc (xvpool->allocator, xvpool->im_format,
info, xvpool->padded_width, xvpool->padded_height, &xvpool->crop, &err);
if (xvpool->pre_alloc_mem) {
mem = xvpool->pre_alloc_mem;
xvpool->pre_alloc_mem = NULL;
} else {
mem = gst_xvimage_allocator_alloc (xvpool->allocator, xvpool->im_format,
info, xvpool->padded_width, xvpool->padded_height, &xvpool->crop, &err);
}
if (mem == NULL) {
gst_buffer_unref (xvimage);
@ -247,6 +285,8 @@ gst_xvimage_buffer_pool_finalize (GObject * object)
GST_LOG_OBJECT (pool, "finalize XvImage buffer pool %p", pool);
if (pool->pre_alloc_mem)
gst_memory_unref (pool->pre_alloc_mem);
if (pool->caps)
gst_caps_unref (pool->caps);
if (pool->allocator)

3
sys/xvimage/xvimagepool.h
View file

@ -50,6 +50,9 @@ struct _GstXvImageBufferPool
guint padded_height;
gboolean add_metavideo;
gboolean need_alignment;
/* used for calculating actual size, stride, and offset */
GstMemory *pre_alloc_mem;
};
struct _GstXvImageBufferPoolClass