filter_watermark.c, filter_composite.c: support explicit deinterlace of

[mlt] / src / modules / core / filter_watermark.c

diff --git a/src/modules/core/filter_watermark.c b/src/modules/core/filter_watermark.c
index b4bd6a70b0999d306f553f66d12c4e9126b14eef..8136958c8388613d1ea7a5fd65803dcba511a64a 100644 (file)
--- a/src/modules/core/filter_watermark.c
+++ b/src/modules/core/filter_watermark.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_watermark.h"
-
+#include <framework/mlt_filter.h>
 #include <framework/mlt_factory.h>
 #include <framework/mlt_frame.h>
 #include <framework/mlt_producer.h>
@@ -59,7 +58,8 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format
        if ( composite == NULL )
        {
                // Create composite via the factory
-               composite = mlt_factory_transition( "composite", NULL );
+               mlt_profile profile = mlt_service_profile( MLT_FILTER_SERVICE( this ) );
+               composite = mlt_factory_transition( profile, "composite", NULL );
 
                // Register the composite for reuse/destruction
                if ( composite != NULL )
@@ -75,6 +75,9 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format
                // Pass all the composite. properties on the filter down
                mlt_properties_pass( composite_properties, properties, "composite." );
 
+               if ( mlt_properties_get( properties, "composite.out" ) == NULL )
+                       mlt_properties_set_int( composite_properties, "out", mlt_properties_get_int( properties, "_out" ) );
+
                // Force a refresh
                mlt_properties_set_int( composite_properties, "refresh", 1 );
        }
@@ -86,7 +89,8 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format
                char *factory = mlt_properties_get( properties, "factory" );
 
                // Create the producer
-               producer = mlt_factory_producer( factory, resource );
+               mlt_profile profile = mlt_service_profile( MLT_FILTER_SERVICE( this ) );
+               producer = mlt_factory_producer( profile, factory, resource );
 
                // If we have one
                if ( producer != NULL )
@@ -142,7 +146,14 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format
                        // Set the b frame to be in the same position and have same consumer requirements
                        mlt_frame_set_position( b_frame, position );
                        mlt_properties_set_double( b_props, "consumer_aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) );
-                       mlt_properties_set_int( b_props, "consumer_deinterlace", mlt_properties_get_double( a_props, "consumer_deinterlace" ) );
+                       mlt_properties_set_int( b_props, "consumer_deinterlace", mlt_properties_get_int( a_props, "consumer_deinterlace" ) || mlt_properties_get_int( properties, "deinterlace" ) );
+                       mlt_properties_set_int( b_props, "output_ratio", mlt_properties_get_double( a_props, "output_ratio" ) );
+
+                       // Check for the special case - no aspect ratio means no problem :-)
+                       if ( mlt_frame_get_aspect_ratio( b_frame ) == 0 )
+                               mlt_properties_set_double( b_props, "aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) );
+                       if ( mlt_frame_get_aspect_ratio( frame ) == 0 )
+                               mlt_properties_set_double( a_props, "aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) );
 
                        mlt_properties_set_int( b_props, "normalised_width", mlt_properties_get_int( a_props, "normalised_width" ) );
                        mlt_properties_set_int( b_props, "normalised_height", mlt_properties_get_int( a_props, "normalised_height" ) );
@@ -174,7 +185,6 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format
                                if ( rescale == NULL || !strcmp( rescale, "none" ) )
                                        rescale = "hyper";
                                mlt_transition_process( composite, b_frame, frame );
-                               mlt_properties_set_double( b_props, "consumer_aspect_ratio", mlt_properties_get_int( a_props, "consumer_aspect_ratio" ) );
                                mlt_properties_set_int( a_props, "consumer_deinterlace", 1 );
                                mlt_properties_set_int( b_props, "consumer_deinterlace", 1 );
                                mlt_properties_set( a_props, "rescale.interp", rescale );
@@ -218,6 +228,9 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
        // Get a unique name to store the frame position
        char *name = mlt_properties_get( MLT_FILTER_PROPERTIES( this ), "_unique_id" );
 
+       // Assign the frame out point to the filter (just in case we need it later)
+       mlt_properties_set_int( MLT_FILTER_PROPERTIES( this ), "_out", mlt_properties_get_int( properties, "out" ) );
+
        // Assign the current position to the name
        mlt_properties_set_position( properties, name, mlt_frame_get_position( frame ) - mlt_filter_get_in( this ) );
 
@@ -233,7 +246,7 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 /** Constructor for the filter.
 */
 
-mlt_filter filter_watermark_init( void *arg )
+mlt_filter filter_watermark_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg )
 {
        mlt_filter this = mlt_filter_new( );
        if ( this != NULL )