mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 10:11:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

kmsallocator: inline gst_kms_allocator_alloc_empty()

Browse source 
No semantic change, just renamed the 'tmp' variable to a more meaningful
name and to use the same structure as in gst_kms_allocator_bo_alloc().

Needed as I'm going to move the gst_memory_init() call after the
allocation of the DUMB buffer.

https://bugzilla.gnome.org/show_bug.cgi?id=785029
This commit is contained in:
Guillaume Desmottes 2017-07-17 15:58:57 +02:00 committed by Nicolas Dufresne
parent 444776ae10
commit f9379b51b6
1 changed files with 19 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
sys/kms/gstkmsallocator.c
View file

@ -413,23 +413,6 @@ gst_kms_allocator_add_fb (GstKMSAllocator * alloc, GstKMSMemory * kmsmem,
return TRUE; return TRUE;
} }
static GstMemory *
gst_kms_allocator_alloc_empty (GstAllocator * allocator, GstVideoInfo * vinfo)
{
GstKMSMemory *kmsmem;
GstMemory *mem;
kmsmem = g_slice_new0 (GstKMSMemory);
if (!kmsmem)
return NULL;
mem = GST_MEMORY_CAST (kmsmem);
gst_memory_init (mem, GST_MEMORY_FLAG_NO_SHARE, allocator, NULL,
GST_VIDEO_INFO_SIZE (vinfo), 0, 0, GST_VIDEO_INFO_SIZE (vinfo));
return mem;
}
GstMemory * GstMemory *
gst_kms_allocator_bo_alloc (GstAllocator * allocator, GstVideoInfo * vinfo) gst_kms_allocator_bo_alloc (GstAllocator * allocator, GstVideoInfo * vinfo)
{ {
@ -437,12 +420,16 @@ gst_kms_allocator_bo_alloc (GstAllocator * allocator, GstVideoInfo * vinfo)
GstKMSMemory *kmsmem; GstKMSMemory *kmsmem;
GstMemory *mem; GstMemory *mem;
mem = gst_kms_allocator_alloc_empty (allocator, vinfo); kmsmem = g_slice_new0 (GstKMSMemory);
if (!mem) if (!kmsmem)
return NULL; return NULL;
alloc = GST_KMS_ALLOCATOR (allocator); alloc = GST_KMS_ALLOCATOR (allocator);
kmsmem = (GstKMSMemory *) mem;
mem = GST_MEMORY_CAST (kmsmem);
gst_memory_init (mem, GST_MEMORY_FLAG_NO_SHARE, allocator, NULL,
GST_VIDEO_INFO_SIZE (vinfo), 0, 0, GST_VIDEO_INFO_SIZE (vinfo));
if (!gst_kms_allocator_memory_create (alloc, kmsmem, vinfo)) if (!gst_kms_allocator_memory_create (alloc, kmsmem, vinfo))
goto fail; goto fail;
if (!gst_kms_allocator_add_fb (alloc, kmsmem, vinfo->offset, vinfo)) if (!gst_kms_allocator_add_fb (alloc, kmsmem, vinfo->offset, vinfo))
@ -461,30 +448,33 @@ gst_kms_allocator_dmabuf_import (GstAllocator * allocator, gint * prime_fds,
gint n_planes, gsize offsets[GST_VIDEO_MAX_PLANES], GstVideoInfo * vinfo) gint n_planes, gsize offsets[GST_VIDEO_MAX_PLANES], GstVideoInfo * vinfo)
{ {
GstKMSAllocator *alloc; GstKMSAllocator *alloc;
GstKMSMemory *kmsmem;
GstMemory *mem; GstMemory *mem;
GstKMSMemory *tmp;
gint i, ret; gint i, ret;
g_return_val_if_fail (n_planes <= GST_VIDEO_MAX_PLANES, FALSE); g_return_val_if_fail (n_planes <= GST_VIDEO_MAX_PLANES, FALSE);
mem = gst_kms_allocator_alloc_empty (allocator, vinfo); kmsmem = g_slice_new0 (GstKMSMemory);
if (!mem) if (!kmsmem)
return FALSE; return FALSE;
tmp = (GstKMSMemory *) mem; mem = GST_MEMORY_CAST (kmsmem);
gst_memory_init (mem, GST_MEMORY_FLAG_NO_SHARE, allocator, NULL,
GST_VIDEO_INFO_SIZE (vinfo), 0, 0, GST_VIDEO_INFO_SIZE (vinfo));
alloc = GST_KMS_ALLOCATOR (allocator); alloc = GST_KMS_ALLOCATOR (allocator);
for (i = 0; i < n_planes; i++) { for (i = 0; i < n_planes; i++) {
ret = drmPrimeFDToHandle (alloc->priv->fd, prime_fds[i], ret = drmPrimeFDToHandle (alloc->priv->fd, prime_fds[i],
&tmp->gem_handle[i]); &kmsmem->gem_handle[i]);
if (ret) if (ret)
goto import_fd_failed; goto import_fd_failed;
} }
if (!gst_kms_allocator_add_fb (alloc, tmp, offsets, vinfo)) if (!gst_kms_allocator_add_fb (alloc, kmsmem, offsets, vinfo))
goto failed; goto failed;
for (i = 0; i < n_planes; i++) { for (i = 0; i < n_planes; i++) {
struct drm_gem_close arg = { tmp->gem_handle[i], }; struct drm_gem_close arg = { kmsmem->gem_handle[i], };
gint err; gint err;
err = drmIoctl (alloc->priv->fd, DRM_IOCTL_GEM_CLOSE, &arg); err = drmIoctl (alloc->priv->fd, DRM_IOCTL_GEM_CLOSE, &arg);
@ -492,10 +482,10 @@ gst_kms_allocator_dmabuf_import (GstAllocator * allocator, gint * prime_fds,
GST_WARNING_OBJECT (allocator, GST_WARNING_OBJECT (allocator,
"Failed to close GEM handle: %s %d", strerror (errno), errno); "Failed to close GEM handle: %s %d", strerror (errno), errno);
tmp->gem_handle[i] = 0; kmsmem->gem_handle[i] = 0;
} }
return tmp; return kmsmem;
/* ERRORS */ /* ERRORS */
import_fd_failed: import_fd_failed: