Change how the Movit chain is built.

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

diff --git a/src/modules/opengl/filter_movit_resize.cpp b/src/modules/opengl/filter_movit_resize.cpp
index ef87c7e9c7a6f87b4396d36ef74c053d46298860..04953d9ced500c7071bd8f0c58c829d6d7521421 100644 (file)
--- a/src/modules/opengl/filter_movit_resize.cpp
+++ b/src/modules/opengl/filter_movit_resize.cpp
@@ -26,6 +26,7 @@
 #include "filter_glsl_manager.h"
 #include <movit/init.h>
 #include <movit/padding_effect.h>
+#include "optional_effect.h"
 
 static float alignment_parse( char* align )
 {
@@ -156,16 +157,22 @@ static int get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format
        }
 
        if ( !error ) {
+               mlt_properties filter_properties = MLT_FILTER_PROPERTIES( filter );
                GlslManager::get_instance()->lock_service( frame );
-               Effect* effect = GlslManager::get_effect( MLT_FILTER_SERVICE( filter ), frame );
-               if ( effect ) {
-                       bool ok = effect->set_int( "width", *width );
-                       ok |= effect->set_int( "height", *height );
-                       ok |= effect->set_float( "left", rect.x );
-                       ok |= effect->set_float( "top", rect.y );
-                       assert(ok);
-               }
+               mlt_properties_set_int( filter_properties, "movit.parms.int.width", *width );
+               mlt_properties_set_int( filter_properties, "movit.parms.int.height", *height );
+               mlt_properties_set_double( filter_properties, "movit.parms.float.left", rect.x );
+               mlt_properties_set_double( filter_properties, "movit.parms.float.top", rect.y );
+
+               bool disable = ( *width == owidth && *height == oheight );
+               mlt_properties_set_int( filter_properties, "movit.disable", disable );
+
                GlslManager::get_instance()->unlock_service( frame );
+
+               GlslManager::set_effect_input( MLT_FILTER_SERVICE( filter ), frame, (mlt_service) *image );
+               GlslManager::set_effect( MLT_FILTER_SERVICE( filter ), frame, new OptionalEffect<PaddingEffect> );
+               *image = (uint8_t *) MLT_FILTER_SERVICE( filter );
+               return error;
        }
 
        return error;
@@ -173,8 +180,6 @@ static int get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format
 
 static mlt_frame process( mlt_filter filter, mlt_frame frame )
 {
-       if ( !GlslManager::get_effect( MLT_FILTER_SERVICE( filter ), frame ) )
-               GlslManager::add_effect( MLT_FILTER_SERVICE( filter ), frame, new PaddingEffect );
        mlt_frame_push_service( frame, filter );
        mlt_frame_push_get_image( frame, get_image );
        return frame;