* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "transition_luma.h"
#include <framework/mlt.h>
#include <stdio.h>
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" );
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, '.' );
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" );
// 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 )
// 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
/** 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 )