From 2a545d3bd1cda86258510703aa5806b012c6b521 Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Wed, 15 Jun 2016 15:08:39 +1000 Subject: [PATCH] gldeinterlace: remove dead code accessing filter->in_tex_id It's not set by anyone or anything and gldeinterlace is the only user of it now. --- ext/gl/gstgldeinterlace.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/ext/gl/gstgldeinterlace.c b/ext/gl/gstgldeinterlace.c index bacd1d7cb..c1429a98a 100644 --- a/ext/gl/gstgldeinterlace.c +++ b/ext/gl/gstgldeinterlace.c @@ -469,7 +469,6 @@ gst_gl_deinterlace_greedyh_callback (gint width, gint height, guint texture, GstGLDeinterlace *deinterlace_filter = GST_GL_DEINTERLACE (filter); GstGLContext *context = GST_GL_BASE_FILTER (filter)->context; GstGLFuncs *gl = context->gl_vtable; - guint temp; shader = gst_gl_deinterlace_get_fragment_shader (filter, "greedhy", @@ -487,13 +486,7 @@ gst_gl_deinterlace_greedyh_callback (gint width, gint height, guint texture, gst_gl_shader_use (shader); - if (G_UNLIKELY (deinterlace_filter->prev_tex == 0)) { - gst_gl_context_gen_texture (GST_GL_BASE_FILTER (filter)->context, - &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 { + if (G_LIKELY (deinterlace_filter->prev_tex != 0)) { gl->ActiveTexture (GL_TEXTURE1); gst_gl_shader_set_uniform_1i (shader, "tex_prev", 1); gl->BindTexture (GL_TEXTURE_2D, deinterlace_filter->prev_tex); @@ -514,11 +507,6 @@ gst_gl_deinterlace_greedyh_callback (gint width, gint height, guint texture, gst_gl_filter_draw_texture (filter, texture, width, height); - 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; - } + /* we keep the previous buffer around so this is safe */ + deinterlace_filter->prev_tex = texture; } -- 2.34.1