mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-13 19:05:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

[876/906] glmem: use GstVideoInfo for format configuration

Browse source 
Allows use of strides
This commit is contained in:
Matthew Waters 2014-02-01 03:14:48 +11:00 committed by Tim-Philipp Müller
parent d84bb0b3b2
commit d233bb66a9
4 changed files with 40 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst-libs/gst/gl/gstglbufferpool.c
View file

@ -167,9 +167,7 @@ gst_gl_buffer_pool_alloc (GstBufferPool * pool, GstBuffer ** buffer,
goto no_buffer; goto no_buffer;
} }
if (!(gl_mem = if (!(gl_mem = gst_gl_memory_alloc (glpool->context, priv->info)))
gst_gl_memory_alloc (glpool->context, GST_VIDEO_INFO_FORMAT (info),
GST_VIDEO_INFO_WIDTH (info), GST_VIDEO_INFO_HEIGHT (info))))
goto mem_create_failed; goto mem_create_failed;
gst_buffer_append_memory (buf, gl_mem); gst_buffer_append_memory (buf, gl_mem);

86
gst-libs/gst/gl/gstglmemory.c
View file

@ -62,44 +62,41 @@ typedef struct
static void static void
_gl_mem_init (GstGLMemory * mem, GstAllocator * allocator, GstMemory * parent, _gl_mem_init (GstGLMemory * mem, GstAllocator * allocator, GstMemory * parent,
GstGLContext * context, GstVideoFormat v_format, gsize width, gsize height, GstGLContext * context, GstVideoInfo v_info, gpointer user_data,
gpointer user_data, GDestroyNotify notify) GDestroyNotify notify)
{ {
gsize maxsize; gsize maxsize;
GstVideoInfo info;
gst_video_info_set_format (&info, v_format, width, height); maxsize = v_info.size;
maxsize = info.size;
gst_memory_init (GST_MEMORY_CAST (mem), GST_MEMORY_FLAG_NO_SHARE, gst_memory_init (GST_MEMORY_CAST (mem), GST_MEMORY_FLAG_NO_SHARE,
allocator, parent, maxsize, 0, 0, maxsize); allocator, parent, maxsize, 0, 0, maxsize);
mem->context = gst_object_ref (context); mem->context = gst_object_ref (context);
mem->gl_format = GL_RGBA; mem->gl_format = GL_RGBA;
mem->v_format = v_format; mem->v_info = v_info;
mem->width = width;
mem->height = height;
mem->notify = notify; mem->notify = notify;
mem->user_data = user_data; mem->user_data = user_data;
mem->wrapped = FALSE; mem->wrapped = FALSE;
mem->upload = gst_gl_upload_new (context); mem->upload = gst_gl_upload_new (context);
mem->download = gst_gl_download_new (context); mem->download = gst_gl_download_new (context);
GST_CAT_DEBUG (GST_CAT_GL_MEMORY, GST_CAT_DEBUG (GST_CAT_GL_MEMORY, "new GL texture memory:%p format:%u "
"new GL texture memory:%p format:%u dimensions:%" G_GSIZE_FORMAT "dimensions:%ux%u", mem, GST_VIDEO_INFO_FORMAT (&v_info),
"x%" G_GSIZE_FORMAT, mem, v_format, width, height); GST_VIDEO_INFO_WIDTH (&v_info), GST_VIDEO_INFO_HEIGHT (&v_info));
} }
static GstGLMemory * static GstGLMemory *
_gl_mem_new (GstAllocator * allocator, GstMemory * parent, _gl_mem_new (GstAllocator * allocator, GstMemory * parent,
GstGLContext * context, GstVideoFormat v_format, gsize width, gsize height, GstGLContext * context, GstVideoInfo v_info, gpointer user_data,
gpointer user_data, GDestroyNotify notify) GDestroyNotify notify)
{ {
GstGLMemory *mem; GstGLMemory *mem;
GLuint tex_id; GLuint tex_id;
gst_gl_context_gen_texture (context, &tex_id, v_format, width, height); gst_gl_context_gen_texture (context, &tex_id,
GST_VIDEO_INFO_FORMAT (&v_info), GST_VIDEO_INFO_WIDTH (&v_info),
GST_VIDEO_INFO_HEIGHT (&v_info));
if (!tex_id) { if (!tex_id) {
GST_CAT_WARNING (GST_CAT_GL_MEMORY, GST_CAT_WARNING (GST_CAT_GL_MEMORY,
"Could not create GL texture with context:%p", context); "Could not create GL texture with context:%p", context);
@ -108,8 +105,7 @@ _gl_mem_new (GstAllocator * allocator, GstMemory * parent,
GST_CAT_TRACE (GST_CAT_GL_MEMORY, "created texture %u", tex_id); GST_CAT_TRACE (GST_CAT_GL_MEMORY, "created texture %u", tex_id);
mem = g_slice_alloc (sizeof (GstGLMemory)); mem = g_slice_alloc (sizeof (GstGLMemory));
_gl_mem_init (mem, allocator, parent, context, v_format, width, height, _gl_mem_init (mem, allocator, parent, context, v_info, user_data, notify);
user_data, notify);
mem->tex_id = tex_id; mem->tex_id = tex_id;
@ -130,14 +126,8 @@ _gl_mem_map (GstGLMemory * gl_mem, gsize maxsize, GstMapFlags flags)
if (GST_GL_MEMORY_FLAG_IS_SET (gl_mem, GST_GL_MEMORY_FLAG_NEED_UPLOAD)) { if (GST_GL_MEMORY_FLAG_IS_SET (gl_mem, GST_GL_MEMORY_FLAG_NEED_UPLOAD)) {
if (!GST_GL_MEMORY_FLAG_IS_SET (gl_mem, if (!GST_GL_MEMORY_FLAG_IS_SET (gl_mem,
GST_GL_MEMORY_FLAG_UPLOAD_INITTED)) { GST_GL_MEMORY_FLAG_UPLOAD_INITTED)) {
GstVideoInfo in_info, out_info; if (!gst_gl_upload_init_format (gl_mem->upload, gl_mem->v_info,
gl_mem->v_info)) {
gst_video_info_set_format (&in_info, gl_mem->v_format, gl_mem->width,
gl_mem->height);
gst_video_info_set_format (&out_info, GST_VIDEO_FORMAT_RGBA,
gl_mem->width, gl_mem->height);
if (!gst_gl_upload_init_format (gl_mem->upload, in_info, out_info)) {
goto error; goto error;
} }
GST_GL_MEMORY_FLAG_SET (gl_mem, GST_GL_MEMORY_FLAG_UPLOAD_INITTED); GST_GL_MEMORY_FLAG_SET (gl_mem, GST_GL_MEMORY_FLAG_UPLOAD_INITTED);
@ -161,8 +151,10 @@ _gl_mem_map (GstGLMemory * gl_mem, gsize maxsize, GstMapFlags flags)
if (GST_GL_MEMORY_FLAG_IS_SET (gl_mem, GST_GL_MEMORY_FLAG_NEED_DOWNLOAD)) { if (GST_GL_MEMORY_FLAG_IS_SET (gl_mem, GST_GL_MEMORY_FLAG_NEED_DOWNLOAD)) {
if (!GST_GL_MEMORY_FLAG_IS_SET (gl_mem, if (!GST_GL_MEMORY_FLAG_IS_SET (gl_mem,
GST_GL_MEMORY_FLAG_DOWNLOAD_INITTED)) { GST_GL_MEMORY_FLAG_DOWNLOAD_INITTED)) {
if (!gst_gl_download_init_format (gl_mem->download, gl_mem->v_format, if (!gst_gl_download_init_format (gl_mem->download,
gl_mem->width, gl_mem->height)) { GST_VIDEO_INFO_FORMAT (&gl_mem->v_info),
GST_VIDEO_INFO_WIDTH (&gl_mem->v_info),
GST_VIDEO_INFO_HEIGHT (&gl_mem->v_info))) {
goto error; goto error;
} }
GST_GL_MEMORY_FLAG_SET (gl_mem, GST_GL_MEMORY_FLAG_DOWNLOAD_INITTED); GST_GL_MEMORY_FLAG_SET (gl_mem, GST_GL_MEMORY_FLAG_DOWNLOAD_INITTED);
@ -219,9 +211,9 @@ _gl_mem_copy_thread (GstGLContext * context, gpointer data)
copy_params = (GstGLMemoryCopyParams *) data; copy_params = (GstGLMemoryCopyParams *) data;
src = copy_params->src; src = copy_params->src;
tex_id = copy_params->tex_id; tex_id = copy_params->tex_id;
width = src->width; width = GST_VIDEO_INFO_WIDTH (&src->v_info);
height = src->height; height = GST_VIDEO_INFO_HEIGHT (&src->v_info);
v_format = src->v_format; v_format = GST_VIDEO_INFO_FORMAT (&src->v_info);
gl_format = src->gl_format; gl_format = src->gl_format;
gl = src->context->gl_vtable; gl = src->context->gl_vtable;
@ -318,8 +310,8 @@ _gl_mem_copy (GstGLMemory * src, gssize offset, gssize size)
GstGLMemoryCopyParams copy_params; GstGLMemoryCopyParams copy_params;
if (GST_GL_MEMORY_FLAG_IS_SET (src, GST_GL_MEMORY_FLAG_NEED_UPLOAD)) { if (GST_GL_MEMORY_FLAG_IS_SET (src, GST_GL_MEMORY_FLAG_NEED_UPLOAD)) {
dest = _gl_mem_new (src->mem.allocator, NULL, src->context, src->v_format, dest = _gl_mem_new (src->mem.allocator, NULL, src->context, src->v_info,
src->width, src->height, NULL, NULL); NULL, NULL);
dest->data = g_malloc (src->mem.maxsize); dest->data = g_malloc (src->mem.maxsize);
memcpy (dest->data, src->data, src->mem.maxsize); memcpy (dest->data, src->data, src->mem.maxsize);
GST_GL_MEMORY_FLAG_SET (dest, GST_GL_MEMORY_FLAG_NEED_UPLOAD); GST_GL_MEMORY_FLAG_SET (dest, GST_GL_MEMORY_FLAG_NEED_UPLOAD);
@ -330,8 +322,8 @@ _gl_mem_copy (GstGLMemory * src, gssize offset, gssize size)
gst_gl_context_thread_add (src->context, _gl_mem_copy_thread, &copy_params); gst_gl_context_thread_add (src->context, _gl_mem_copy_thread, &copy_params);
dest = g_slice_alloc (sizeof (GstGLMemory)); dest = g_slice_alloc (sizeof (GstGLMemory));
_gl_mem_init (dest, src->mem.allocator, NULL, src->context, src->v_format, _gl_mem_init (dest, src->mem.allocator, NULL, src->context, src->v_info,
src->width, src->height, NULL, NULL); NULL, NULL);
if (!copy_params.result) { if (!copy_params.result) {
GST_CAT_WARNING (GST_CAT_GL_MEMORY, "Could not copy GL Memory"); GST_CAT_WARNING (GST_CAT_GL_MEMORY, "Could not copy GL Memory");
@ -424,21 +416,17 @@ gst_gl_memory_copy_into_texture (GstGLMemory * gl_mem, guint tex_id)
/** /**
* gst_gl_memory_alloc: * gst_gl_memory_alloc:
* @context:a #GstGLContext * @context:a #GstGLContext
* @format: the format for the texture * @v_info: the #GstVideoInfo of the memory
* @width: width of the texture
* @height: height of the texture
* *
* Returns: a #GstMemory object with a GL texture specified by @format, @width and @height * Returns: a #GstMemory object with a GL texture specified by @v_info
* from @context * from @context
*/ */
GstMemory * GstMemory *
gst_gl_memory_alloc (GstGLContext * context, GstVideoFormat format, gst_gl_memory_alloc (GstGLContext * context, GstVideoInfo v_info)
gsize width, gsize height)
{ {
GstGLMemory *mem; GstGLMemory *mem;
mem = _gl_mem_new (_gl_allocator, NULL, context, format, width, height, mem = _gl_mem_new (_gl_allocator, NULL, context, v_info, NULL, NULL);
NULL, NULL);
mem->data = g_malloc (mem->mem.maxsize); mem->data = g_malloc (mem->mem.maxsize);
if (mem->data == NULL) { if (mem->data == NULL) {
@ -452,25 +440,21 @@ gst_gl_memory_alloc (GstGLContext * context, GstVideoFormat format,
/** /**
* gst_gl_memory_wrapped * gst_gl_memory_wrapped
* @context:a #GstGLContext * @context:a #GstGLContext
* @format: the format for the texture * @v_info: the #GstVideoInfo of the memory and data
* @width: width of the texture
* @height: height of the texture
* @data: the data to wrap * @data: the data to wrap
* @user_data: data called with for @notify * @user_data: data called with for @notify
* @notify: function called with @user_data when @data needs to be freed * @notify: function called with @user_data when @data needs to be freed
* *
* Returns: a #GstGLMemory object with a GL texture specified by @format, @width and @height * Returns: a #GstGLMemory object with a GL texture specified by @v_info
* from @context and contents specified by @data * from @context and contents specified by @data
*/ */
GstGLMemory * GstGLMemory *
gst_gl_memory_wrapped (GstGLContext * context, GstVideoFormat format, gst_gl_memory_wrapped (GstGLContext * context, GstVideoInfo v_info,
guint width, guint height, gpointer data, gpointer data, gpointer user_data, GDestroyNotify notify)
gpointer user_data, GDestroyNotify notify)
{ {
GstGLMemory *mem; GstGLMemory *mem;
mem = _gl_mem_new (_gl_allocator, NULL, context, format, width, height, mem = _gl_mem_new (_gl_allocator, NULL, context, v_info, user_data, notify);
user_data, notify);
mem->data = data; mem->data = data;
mem->wrapped = TRUE; mem->wrapped = TRUE;

10
gst-libs/gst/gl/gstglmemory.h
View file

@ -84,10 +84,8 @@ struct _GstGLMemory
GstGLContext *context; GstGLContext *context;
GLuint tex_id; GLuint tex_id;
GstVideoFormat v_format; GstVideoInfo v_info;
GLenum gl_format; GLenum gl_format;
GLuint width;
GLuint height;
GstGLDownload *download; GstGLDownload *download;
GstGLUpload *upload; GstGLUpload *upload;
@ -145,11 +143,9 @@ struct _GstGLMemory
void gst_gl_memory_init (void); void gst_gl_memory_init (void);
GstMemory * gst_gl_memory_alloc (GstGLContext * context, GstVideoFormat format, GstMemory * gst_gl_memory_alloc (GstGLContext * context, GstVideoInfo info);
gsize width, gsize height);
GstGLMemory * gst_gl_memory_wrapped (GstGLContext * context, GstVideoFormat format, GstGLMemory * gst_gl_memory_wrapped (GstGLContext * context, GstVideoInfo info, gpointer data,
guint width, guint height, gpointer data,
gpointer user_data, GDestroyNotify notify); gpointer user_data, GDestroyNotify notify);
gboolean gst_is_gl_memory (GstMemory * mem); gboolean gst_is_gl_memory (GstMemory * mem);

7
gst-libs/gst/gl/gstglupload.c
View file

@ -705,12 +705,7 @@ gst_gl_upload_perform_with_memory (GstGLUpload * upload, GstGLMemory * gl_mem)
g_return_val_if_fail (upload != NULL, FALSE); g_return_val_if_fail (upload != NULL, FALSE);
if (!GST_GL_MEMORY_FLAG_IS_SET (gl_mem, GST_GL_MEMORY_FLAG_UPLOAD_INITTED)) { if (!GST_GL_MEMORY_FLAG_IS_SET (gl_mem, GST_GL_MEMORY_FLAG_UPLOAD_INITTED)) {
GstVideoInfo info; gst_gl_upload_init_format (upload, gl_mem->v_info, gl_mem->v_info);
gst_video_info_set_format (&info, gl_mem->v_format, gl_mem->width,
gl_mem->height);
gst_gl_upload_init_format (upload, info, info);
} }
if (!GST_GL_MEMORY_FLAG_IS_SET (gl_mem, GST_GL_MEMORY_FLAG_NEED_UPLOAD)) if (!GST_GL_MEMORY_FLAG_IS_SET (gl_mem, GST_GL_MEMORY_FLAG_NEED_UPLOAD))