mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-05 14:02:26 +00:00
Code Issues 1 Projects Releases Wiki Activity

[583/906] deinterlace: change for new API

Browse source 
also allow elements to call the _filter_texture vfunc if they want
This commit is contained in:
Matthew Waters 2012-09-20 23:06:49 +10:00
parent 79ed68478f
commit d9d8946351
4 changed files with 52 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst-libs/gst/gl/gstglfilter.c
View file

@ -571,7 +571,7 @@ gst_gl_filter_decide_allocation (GstBaseTransform * trans, GstQuery * query)
return TRUE; return TRUE;
} }
static gboolean gboolean
gst_gl_filter_filter_texture (GstGLFilter * filter, GstBuffer * inbuf, gst_gl_filter_filter_texture (GstGLFilter * filter, GstBuffer * inbuf,
GstBuffer * outbuf) GstBuffer * outbuf)
{ {

2
gst-libs/gst/gl/gstglfilter.h
View file

@ -97,6 +97,8 @@ struct _GstGLFilterClass
GType gst_gl_filter_get_type(void); GType gst_gl_filter_get_type(void);
gboolean gst_gl_filter_filter_texture (GstGLFilter * filter, GstBuffer * inbuf,
GstBuffer * outbuf);
void void
gst_gl_filter_render_to_target (GstGLFilter *filter, gst_gl_filter_render_to_target (GstGLFilter *filter,

77
gst/gl/gstgldeinterlace.c
View file

@ -61,6 +61,8 @@ static void gst_gl_deinterlace_reset (GstGLFilter * filter);
static gboolean gst_gl_deinterlace_init_shader (GstGLFilter * filter); static gboolean gst_gl_deinterlace_init_shader (GstGLFilter * filter);
static gboolean gst_gl_deinterlace_filter (GstGLFilter * filter, static gboolean gst_gl_deinterlace_filter (GstGLFilter * filter,
GstBuffer * inbuf, GstBuffer * outbuf); GstBuffer * inbuf, GstBuffer * outbuf);
static gboolean gst_gl_deinterlace_filter_texture (GstGLFilter * filter,
guint in_tex, guint out_tex);
static void gst_gl_deinterlace_callback (gint width, gint height, static void gst_gl_deinterlace_callback (gint width, gint height,
guint texture, gpointer stuff); guint texture, gpointer stuff);
@ -91,6 +93,8 @@ gst_gl_deinterlace_class_init (GstGLDeinterlaceClass * klass)
"Julien Isorce <julien.isorce@mail.com>"); "Julien Isorce <julien.isorce@mail.com>");
GST_GL_FILTER_CLASS (klass)->filter = gst_gl_deinterlace_filter; GST_GL_FILTER_CLASS (klass)->filter = gst_gl_deinterlace_filter;
GST_GL_FILTER_CLASS (klass)->filter_texture =
gst_gl_deinterlace_filter_texture;
GST_GL_FILTER_CLASS (klass)->onInitFBO = gst_gl_deinterlace_init_shader; GST_GL_FILTER_CLASS (klass)->onInitFBO = gst_gl_deinterlace_init_shader;
GST_GL_FILTER_CLASS (klass)->onReset = gst_gl_deinterlace_reset; GST_GL_FILTER_CLASS (klass)->onReset = gst_gl_deinterlace_reset;
} }
@ -99,7 +103,8 @@ static void
gst_gl_deinterlace_init (GstGLDeinterlace * filter) gst_gl_deinterlace_init (GstGLDeinterlace * filter)
{ {
filter->shader = NULL; filter->shader = NULL;
filter->buffer_prev = NULL; filter->prev_buffer = NULL;
filter->prev_tex = 0;
} }
static void static void
@ -107,9 +112,9 @@ gst_gl_deinterlace_reset (GstGLFilter * filter)
{ {
GstGLDeinterlace *deinterlace_filter = GST_GL_DEINTERLACE (filter); GstGLDeinterlace *deinterlace_filter = GST_GL_DEINTERLACE (filter);
if (deinterlace_filter->buffer_prev) { if (deinterlace_filter->prev_buffer) {
gst_buffer_unref (deinterlace_filter->buffer_prev); gst_buffer_unref (deinterlace_filter->prev_buffer);
deinterlace_filter->buffer_prev = NULL; deinterlace_filter->prev_buffer = NULL;
} }
//blocking call, wait the opengl thread has destroyed the shader //blocking call, wait the opengl thread has destroyed the shader
gst_gl_display_del_shader (filter->display, deinterlace_filter->shader); gst_gl_display_del_shader (filter->display, deinterlace_filter->shader);
@ -151,34 +156,31 @@ gst_gl_deinterlace_init_shader (GstGLFilter * filter)
&deinterlace_filter->shader); &deinterlace_filter->shader);
} }
static gboolean
gst_gl_deinterlace_filter_texture (GstGLFilter * filter, guint in_tex,
guint out_tex)
{
GstGLDeinterlace *deinterlace_filter = GST_GL_DEINTERLACE (filter);
//blocking call, use a FBO
gst_gl_filter_render_to_target (filter, in_tex, out_tex,
gst_gl_deinterlace_callback, deinterlace_filter);
return TRUE;
}
static gboolean static gboolean
gst_gl_deinterlace_filter (GstGLFilter * filter, GstBuffer * inbuf, gst_gl_deinterlace_filter (GstGLFilter * filter, GstBuffer * inbuf,
GstBuffer * outbuf) GstBuffer * outbuf)
{ {
GstGLDeinterlace *deinterlace_filter = GST_GL_DEINTERLACE (filter); GstGLDeinterlace *deinterlace_filter = GST_GL_DEINTERLACE (filter);
GstGLMeta *in_meta, *out_meta;
GstVideoMeta *in_v_meta;
in_meta = gst_buffer_get_gl_meta (inbuf); gst_gl_filter_filter_texture (filter, inbuf, outbuf);
out_meta = gst_buffer_get_gl_meta (outbuf);
in_v_meta = gst_buffer_get_video_meta (inbuf);
if (!in_meta || !out_meta || !in_v_meta) { if (deinterlace_filter->prev_buffer) {
GST_WARNING ("A buffer does not contain required GstGLMeta or" gst_buffer_unref (deinterlace_filter->prev_buffer);
" GstVideoMeta");
return FALSE;
} }
//blocking call, use a FBO deinterlace_filter->prev_buffer = gst_buffer_ref (inbuf);
gst_gl_display_use_fbo (filter->display, filter->width, filter->height,
filter->fbo, filter->depthbuffer, out_meta->memory->tex_id,
gst_gl_deinterlace_callback, in_v_meta->width, in_v_meta->height,
in_meta->memory->tex_id, 0, filter->width, 0, filter->height,
GST_GL_DISPLAY_PROJECTION_ORTHO2D, (gpointer) deinterlace_filter);
if (deinterlace_filter->buffer_prev)
gst_buffer_unref (deinterlace_filter->buffer_prev);
deinterlace_filter->buffer_prev = gst_buffer_ref (inbuf);
return TRUE; return TRUE;
} }
@ -190,9 +192,7 @@ gst_gl_deinterlace_callback (gint width, gint height, guint texture,
{ {
GstGLDeinterlace *deinterlace_filter = GST_GL_DEINTERLACE (stuff); GstGLDeinterlace *deinterlace_filter = GST_GL_DEINTERLACE (stuff);
GstGLFilter *filter = GST_GL_FILTER (stuff); GstGLFilter *filter = GST_GL_FILTER (stuff);
GstBuffer *buffer_prev = deinterlace_filter->buffer_prev; guint temp;
GstGLMeta *prev_meta;
glMatrixMode (GL_PROJECTION); glMatrixMode (GL_PROJECTION);
glLoadIdentity (); glLoadIdentity ();
@ -201,11 +201,16 @@ gst_gl_deinterlace_callback (gint width, gint height, guint texture,
glEnable (GL_TEXTURE_RECTANGLE_ARB); glEnable (GL_TEXTURE_RECTANGLE_ARB);
if (buffer_prev) { if (G_UNLIKELY (deinterlace_filter->prev_tex == 0)) {
prev_meta = gst_buffer_get_gl_meta (buffer_prev); gst_gl_display_gen_texture_thread (filter->display,
&deinterlace_filter->prev_tex,
GST_VIDEO_INFO_FORMAT (&filter->out_info),
GST_VIDEO_INFO_WIDTH (&filter->out_info),
GST_VIDEO_INFO_HEIGHT (&filter->out_info));
} else {
glActiveTexture (GL_TEXTURE1_ARB); glActiveTexture (GL_TEXTURE1_ARB);
gst_gl_shader_set_uniform_1i (deinterlace_filter->shader, "tex_prev", 1); gst_gl_shader_set_uniform_1i (deinterlace_filter->shader, "tex_prev", 1);
glBindTexture (GL_TEXTURE_RECTANGLE_ARB, prev_meta->memory->tex_id); glBindTexture (GL_TEXTURE_RECTANGLE_ARB, deinterlace_filter->prev_tex);
} }
glActiveTexture (GL_TEXTURE0_ARB); glActiveTexture (GL_TEXTURE0_ARB);
@ -220,9 +225,9 @@ gst_gl_deinterlace_callback (gint width, gint height, guint texture,
30.0f / 255.0f); 30.0f / 255.0f);
gst_gl_shader_set_uniform_1i (deinterlace_filter->shader, "width", gst_gl_shader_set_uniform_1i (deinterlace_filter->shader, "width",
filter->width); GST_VIDEO_INFO_WIDTH (&filter->out_info));
gst_gl_shader_set_uniform_1i (deinterlace_filter->shader, "height", gst_gl_shader_set_uniform_1i (deinterlace_filter->shader, "height",
filter->height); GST_VIDEO_INFO_HEIGHT (&filter->out_info));
glBegin (GL_QUADS); glBegin (GL_QUADS);
glMultiTexCoord2iARB (GL_TEXTURE0_ARB, 0, 0); glMultiTexCoord2iARB (GL_TEXTURE0_ARB, 0, 0);
@ -240,4 +245,12 @@ gst_gl_deinterlace_callback (gint width, gint height, guint texture,
glEnd (); glEnd ();
glDisable (GL_TEXTURE_RECTANGLE_ARB); glDisable (GL_TEXTURE_RECTANGLE_ARB);
if (texture == filter->in_tex_id) {
temp = filter->in_tex_id;
filter->in_tex_id = deinterlace_filter->prev_tex;
deinterlace_filter->prev_tex = temp;
} else {
deinterlace_filter->prev_tex = texture;
}
} }

3
gst/gl/gstgldeinterlace.h
View file

@ -39,7 +39,8 @@ struct _GstGLDeinterlace
{ {
GstGLFilter filter; GstGLFilter filter;
GstGLShader *shader; GstGLShader *shader;
GstBuffer *buffer_prev; GstBuffer *prev_buffer;
guint prev_tex;
}; };
struct _GstGLDeinterlaceClass struct _GstGLDeinterlaceClass