consumer_sdl.c: let it work without filter_avcolour_space

[melted] / src / modules / core / transition_luma.c

diff --git a/src/modules/core/transition_luma.c b/src/modules/core/transition_luma.c
index 2f4b17d..258eefa 100644 (file)
--- a/src/modules/core/transition_luma.c
+++ b/src/modules/core/transition_luma.c
@@ -3,22 +3,24 @@
  * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
  * Author: Dan Dennedy <dan@dennedy.org>
  *
- * 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.
+ * Adapted from Kino Plugin Timfx, which is
+ * Copyright (C) 2002 Timothy M. Shead <tshead@k-3d.com>
  *
- * This program is distributed in the hope that it will be useful,
+ * 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 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 "transition_luma.h"
 #include <framework/mlt.h>
 
 #include <stdio.h>
@@ -376,6 +378,7 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
        int luma_width = mlt_properties_get_int( properties, "width" );
        int luma_height = mlt_properties_get_int( properties, "height" );
        uint16_t *luma_bitmap = mlt_properties_get_data( properties, "bitmap", NULL );
+       char *current_resource = mlt_properties_get( properties, "_resource" );
        
        // If the filename property changed, reload the map
        char *resource = mlt_properties_get( properties, "resource" );
@@ -387,7 +390,7 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
                luma_height = mlt_properties_get_int( a_props, "height" );
        }
                
-       if ( luma_bitmap == NULL && resource != NULL )
+       if ( resource != current_resource )
        {
                char temp[ 512 ];
                char *extension = strrchr( resource, '.' );
@@ -395,7 +398,7 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
                if ( strchr( resource, '%' ) )
                {
                        FILE *test;
-                       sprintf( temp, "%s/lumas/%s/%s", mlt_factory_prefix( ), mlt_environment( "MLT_NORMALISATION" ), strchr( resource, '%' ) + 1 );
+                       sprintf( temp, "%s/lumas/%s/%s", mlt_environment( "MLT_DATA" ), mlt_environment( "MLT_NORMALISATION" ), strchr( resource, '%' ) + 1 );
                        test = fopen( temp, "r" );
                        if ( test == NULL )
                                strcat( temp, ".png" );
@@ -419,16 +422,24 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
                                // Set the transition properties
                                mlt_properties_set_int( properties, "width", luma_width );
                                mlt_properties_set_int( properties, "height", luma_height );
+                               mlt_properties_set( properties, "_resource", resource );
                                mlt_properties_set_data( properties, "bitmap", luma_bitmap, luma_width * luma_height * 2, mlt_pool_release, NULL );
                        }
                }
+               else if (!*resource) 
+               {
+                   luma_bitmap = NULL;
+                   mlt_properties_set( properties, "_resource", NULL );
+                   mlt_properties_set_data( properties, "bitmap", luma_bitmap, 0, mlt_pool_release, NULL );
+               }
                else
                {
                        // Get the factory producer service
                        char *factory = mlt_properties_get( properties, "factory" );
 
                        // Create the producer
-                       mlt_producer producer = mlt_factory_producer( factory, resource );
+                       mlt_profile profile = mlt_service_profile( MLT_TRANSITION_SERVICE( transition ) );
+                       mlt_producer producer = mlt_factory_producer( profile, factory, resource );
 
                        // If we have one
                        if ( producer != NULL )
@@ -465,6 +476,7 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
                                        // Set the transition properties
                                        mlt_properties_set_int( properties, "width", luma_width );
                                        mlt_properties_set_int( properties, "height", luma_height );
+                                       mlt_properties_set( properties, "_resource", resource);
                                        mlt_properties_set_data( properties, "bitmap", luma_bitmap, luma_width * luma_height * 2, mlt_pool_release, NULL );
 
                                        // Cleanup the luma frame
@@ -560,7 +572,7 @@ static mlt_frame transition_process( mlt_transition transition, mlt_frame a_fram
 /** Constructor for the filter.
 */
 
-mlt_transition transition_luma_init( char *lumafile )
+mlt_transition transition_luma_init( mlt_profile profile, mlt_service_type type, const char *id, char *lumafile )
 {
        mlt_transition transition = mlt_transition_new( );
        if ( transition != NULL )