Remove now unused FBOInput.

[mlt] / src / modules / opengl / mlt_movit_input.cpp

diff --git a/src/modules/opengl/mlt_movit_input.cpp b/src/modules/opengl/mlt_movit_input.cpp
index 7a1ca03c9051a8f21b56d1e4256e873cffad6b59..4339ac30e88a3f4db3e2b19d47244f057bdd2339 100644 (file)
--- a/src/modules/opengl/mlt_movit_input.cpp
+++ b/src/modules/opengl/mlt_movit_input.cpp
@@ -18,7 +18,6 @@
  */
 
 #include "mlt_movit_input.h"
-#include "fbo_input.h"
 
 MltInput::MltInput(unsigned width, unsigned height)
        : m_width(width)
@@ -34,7 +33,9 @@ MltInput::MltInput(unsigned width, unsigned height)
 
 MltInput::~MltInput()
 {
-       delete input;
+       // XXX: this is crashing when a producer is closed
+       // on Windows when using melt with qglsl.
+//     delete input;
 }
 
 std::string MltInput::output_fragment_shader()
@@ -81,7 +82,7 @@ GammaCurve MltInput::get_gamma_curve() const
        return input->get_gamma_curve();
 }
 
-void MltInput::useFlatInput(EffectChain* chain, MovitPixelFormat pix_fmt, unsigned width, unsigned height)
+void MltInput::useFlatInput(MovitPixelFormat pix_fmt, unsigned width, unsigned height)
 {
        if (!input) {
                m_width = width;
@@ -90,36 +91,20 @@ void MltInput::useFlatInput(EffectChain* chain, MovitPixelFormat pix_fmt, unsign
                image_format.color_space = COLORSPACE_sRGB;
                image_format.gamma_curve = GAMMA_sRGB;
                input = new FlatInput(image_format, pix_fmt, GL_UNSIGNED_BYTE, width, height);
-               chain->add_output(image_format, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED);
-               chain->set_dither_bits(8);
        }
 }
 
-void MltInput::useYCbCrInput(EffectChain* chain, const ImageFormat& image_format, const YCbCrFormat& ycbcr_format, unsigned width, unsigned height)
+void MltInput::useYCbCrInput(const ImageFormat& image_format, const YCbCrFormat& ycbcr_format, unsigned width, unsigned height)
 {
        if (!input) {
                m_width = width;
                m_height = height;
                input = new YCbCrInput(image_format, ycbcr_format, width, height);
-               ImageFormat output_format;
-               output_format.color_space = COLORSPACE_sRGB;
-               output_format.gamma_curve = GAMMA_sRGB;
-               chain->add_output(output_format, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED);
-               chain->set_dither_bits(8);
                isRGB = false;
                m_ycbcr_format = ycbcr_format;
        }
 }
 
-void MltInput::useFBOInput(EffectChain *chain, GLuint texture)
-{
-       if (!input) {
-               FBOInput* fboInput = new FBOInput(m_width, m_height);
-               input = fboInput;
-               fboInput->set_texture(texture);
-       }
-}
-
 void MltInput::set_pixel_data(const unsigned char* data)
 {
        assert(input);