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

[580/906] bufferpool: remove obselete gl meta buffer pool options

Browse source
This commit is contained in:
Matthew Waters 2012-09-19 00:29:57 +10:00
parent cfafeea297
commit 558e10be0f
2 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -48,8 +48,7 @@ G_DEFINE_TYPE (GstGLBufferPool, gst_gl_buffer_pool, GST_TYPE_BUFFER_POOL);
static const gchar ** static const gchar **
gst_gl_buffer_pool_get_options (GstBufferPool * pool) gst_gl_buffer_pool_get_options (GstBufferPool * pool)
{ {
static const gchar *options[] = { GST_BUFFER_POOL_OPTION_VIDEO_META, static const gchar *options[] = { GST_BUFFER_POOL_OPTION_VIDEO_META, NULL
GST_BUFFER_POOL_OPTION_GL_META, NULL
}; };
return options; return options;
@ -98,8 +97,6 @@ gst_gl_buffer_pool_set_config (GstBufferPool * pool, GstStructure * config)
priv->info = info; priv->info = info;
priv->add_videometa = gst_buffer_pool_config_has_option (config, priv->add_videometa = gst_buffer_pool_config_has_option (config,
GST_BUFFER_POOL_OPTION_GL_META) ||
gst_buffer_pool_config_has_option (config,
GST_BUFFER_POOL_OPTION_VIDEO_META); GST_BUFFER_POOL_OPTION_VIDEO_META);
return GST_BUFFER_POOL_CLASS (parent_class)->set_config (pool, config); return GST_BUFFER_POOL_CLASS (parent_class)->set_config (pool, config);
@ -159,7 +156,7 @@ gst_gl_buffer_pool_alloc (GstBufferPool * pool, GstBuffer ** buffer,
if (priv->add_videometa) { if (priv->add_videometa) {
GST_DEBUG_OBJECT (pool, "adding GstGLMeta"); GST_DEBUG_OBJECT (pool, "adding GstGLMeta");
/* these are just the defaults for now */ /* these are just the defaults for now */
gst_buffer_add_video_meta (buf, glpool->display, 0, gst_buffer_add_video_meta (buf, 0,
GST_VIDEO_INFO_FORMAT (info), GST_VIDEO_INFO_WIDTH (info), GST_VIDEO_INFO_FORMAT (info), GST_VIDEO_INFO_WIDTH (info),
GST_VIDEO_INFO_HEIGHT (info)); GST_VIDEO_INFO_HEIGHT (info));
} }

9
gst-libs/gst/gl/gstglbufferpool.h
View file

@ -26,19 +26,10 @@
#include <gst/video/gstvideopool.h> #include <gst/video/gstvideopool.h>
#include "gstgldisplay.h" #include "gstgldisplay.h"
#include "gstglmeta.h"
#include "gstglmemory.h" #include "gstglmemory.h"
G_BEGIN_DECLS G_BEGIN_DECLS
/**
* GST_BUFFER_POOL_OPTION_VIDEO_META:
*
* An option that can be activated on bufferpool to request OpenGL metadata
* on buffers from the pool.
*/
#define GST_BUFFER_POOL_OPTION_GL_META "GstBufferPoolOptionGLMeta"
typedef struct _GstGLBufferPool GstGLBufferPool; typedef struct _GstGLBufferPool GstGLBufferPool;
typedef struct _GstGLBufferPoolClass GstGLBufferPoolClass; typedef struct _GstGLBufferPoolClass GstGLBufferPoolClass;
typedef struct _GstGLBufferPoolPrivate GstGLBufferPoolPrivate; typedef struct _GstGLBufferPoolPrivate GstGLBufferPoolPrivate;