mlt_frame_get_image( a_frame, &p_dest, &format_dest, &width_dest, &height_dest, 1 );
mlt_frame_get_image( b_frame, &p_src, &format_src, &width_src, &height_src, 0 );
+ if ( *width == 0 || *height == 0 )
+ return;
+
// Pick the lesser of two evils ;-)
width_src = width_src > width_dest ? width_dest : width_src;
height_src = height_src > height_dest ? height_dest : height_src;
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
// 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
if ( mlt_properties_get( properties, "fixed" ) )
mix = mlt_properties_get_double( properties, "fixed" );
-
if ( luma_width > 0 && luma_height > 0 && luma_bitmap != NULL )
// Composite the frames using a luma map
luma_composite( !invert ? a_frame : b_frame, !invert ? b_frame : a_frame, luma_width, luma_height, luma_bitmap, mix, frame_delta,
// Dissolve the frames using the time offset for mix value
dissolve_yuv( a_frame, b_frame, mix, *width, *height );
-
// Extract the a_frame image info
*width = mlt_properties_get_int( !invert ? a_props : b_props, "width" );
*height = mlt_properties_get_int( !invert ? a_props : b_props, "height" );