summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorMatthew Waters <matthew@centricular.com>2016-06-15 15:08:39 +1000
committerMatthew Waters <matthew@centricular.com>2016-06-15 15:08:39 +1000
commit4010faf4a1948552f2b74daff81e45054477ca74 (patch)
tree94c2b0c9b587dcbe1dfcb075ad2a3934fde6bf58 /ext
parent6b7f94abb2903a0b8e78059404f0f59ea044ca66 (diff)
downloadgstreamer-plugins-bad-4010faf4a1948552f2b74daff81e45054477ca74.tar.gz
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.
Diffstat (limited to 'ext')
-rw-r--r--ext/gl/gstgldeinterlace.c18
1 files 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;
}