Complete reorganization and renaming to usable state.

[mlt] / src / modules / plus / filter_affine.c

diff --git a/src/modules/plus/filter_affine.c b/src/modules/plus/filter_affine.c
index 465e412909fed53109d81b6e77f3ed922984d605..0ba2f9d5cc10141d3b9244ffa7afa0e04394e5b6 100644 (file)
--- a/src/modules/plus/filter_affine.c
+++ b/src/modules/plus/filter_affine.c
@@ -3,23 +3,22 @@
  * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
  * Author: Charles Yates <charles.yates@pandora.be>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "filter_affine.h"
-
+#include <framework/mlt_filter.h>
 #include <framework/mlt.h>
 
 #include <stdio.h>
@@ -38,7 +37,7 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
        mlt_properties properties = MLT_FILTER_PROPERTIES( filter );
 
        // Get the image
-       int error = mlt_frame_get_image( this, image, format, width, height, 0 );
+       int error = 0; //mlt_frame_get_image( this, image, format, width, height, 0 );
 
        // Only process if we have no error and a valid colour space
        if ( error == 0 && *format == mlt_image_yuv422 )
@@ -50,13 +49,15 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
                if ( producer == NULL )
                {
                        char *background = mlt_properties_get( properties, "background" );
-                       producer = mlt_factory_producer( "fezzik", background );
+                       mlt_profile profile = mlt_service_profile( MLT_FILTER_SERVICE( filter ) );
+                       producer = mlt_factory_producer( profile, NULL, background );
                        mlt_properties_set_data( properties, "producer", producer, 0, (mlt_destructor)mlt_producer_close, NULL );
                }
 
                if ( transition == NULL )
                {
-                       transition = mlt_factory_transition( "affine", NULL );
+                       mlt_profile profile = mlt_service_profile( MLT_FILTER_SERVICE( filter ) );
+                       transition = mlt_factory_transition( profile, "affine", NULL );
                        mlt_properties_set_data( properties, "transition", transition, 0, (mlt_destructor)mlt_transition_close, NULL );
                }
 
@@ -65,6 +66,7 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
                        char *name = mlt_properties_get( properties, "_unique_id" );
                        mlt_position position = mlt_properties_get_position( MLT_FRAME_PROPERTIES( this ), name );
                        mlt_properties frame_properties = MLT_FRAME_PROPERTIES( this );
+                       double consumer_ar = mlt_properties_get_double( frame_properties, "consumer_aspect_ratio" );
                        mlt_properties_set_position( MLT_TRANSITION_PROPERTIES( transition ), "in", mlt_filter_get_in( filter ) );
                        mlt_properties_set_position( MLT_TRANSITION_PROPERTIES( transition ), "out", mlt_filter_get_out( filter ) );
                        mlt_producer_seek( producer, position );
@@ -74,12 +76,19 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
                        mlt_service_get_frame( MLT_PRODUCER_SERVICE( producer ), &a_frame, 0 );
                        mlt_properties_set( MLT_FRAME_PROPERTIES( a_frame ), "rescale.interp", "nearest" );
                        mlt_properties_set_int( MLT_FRAME_PROPERTIES( a_frame ), "distort", 1 );
-                       mlt_properties_set_double( MLT_FRAME_PROPERTIES( a_frame ), "consumer_aspect_ratio", 
-                                                                          mlt_properties_get_double( frame_properties, "consumer_aspect_ratio" ) );
+
+                       // Special case - aspect_ratio = 0
+                       if ( mlt_properties_get_double( frame_properties, "aspect_ratio" ) == 0 )
+                               mlt_properties_set_double( frame_properties, "aspect_ratio", consumer_ar );
+                       if ( mlt_properties_get_double( MLT_FRAME_PROPERTIES( a_frame ), "aspect_ratio" ) == 0 )
+                               mlt_properties_set_double( MLT_FRAME_PROPERTIES( a_frame ), "aspect_ratio", consumer_ar );
+                       mlt_properties_set_double( MLT_FRAME_PROPERTIES( a_frame ), "consumer_aspect_ratio", consumer_ar );
+
                        mlt_transition_process( transition, a_frame, this );
                        mlt_frame_get_image( a_frame, image, format, width, height, writable );
                        mlt_properties_set_data( frame_properties, "affine_frame", a_frame, 0, (mlt_destructor)mlt_frame_close, NULL );
                        mlt_properties_set_data( frame_properties, "image", *image, *width * *height * 2, NULL, NULL );
+                       mlt_properties_set_data( frame_properties, "alpha", mlt_frame_get_alpha_mask( a_frame ), *width * *height, NULL, NULL );
                }
        }
 
@@ -110,14 +119,13 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 /** Constructor for the filter.
 */
 
-mlt_filter filter_affine_init( char *arg )
+mlt_filter filter_affine_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg )
 {
        mlt_filter this = mlt_filter_new( );
        if ( this != NULL )
        {
                this->process = filter_process;
                mlt_properties_set( MLT_FILTER_PROPERTIES( this ), "background", "colour:black" );
-               mlt_properties_set( MLT_FILTER_PROPERTIES( this ), "transition.rotate_x", "10" );
        }
        return this;
 }