* 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
+ * it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program 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.
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Lesser 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.
*/
int invert = mlt_properties_get_int( MLT_FILTER_PROPERTIES( filter ), "invert" ) * 255;
// Render the frame
- if ( mlt_frame_get_image( this, image, format, width, height, writable ) == 0 )
+ if ( mlt_frame_get_image( this, image, format, width, height, writable ) == 0 && ( !use_luminance || ( int )mix != 1 ) )
{
// Get the alpha mask of the source
uint8_t *alpha = mlt_frame_get_alpha_mask( this );
p ++;
}
}
- else if ( mix != 1.0 )
+ else if ( ( int )mix != 1 )
{
uint8_t *q = mask_img;
+ // Ensure softness tends to zero has mix tends to 1
+ softness *= ( 1.0 - mix );
while( size -- )
{
a = ( ( double )*q - 16 ) / 235.0;
{
// Obtain the shape instance
char *resource = mlt_properties_get( MLT_FILTER_PROPERTIES( this ), "resource" );
+ char *last_resource = mlt_properties_get( MLT_FILTER_PROPERTIES( this ), "_resource" );
mlt_producer producer = mlt_properties_get_data( MLT_FILTER_PROPERTIES( this ), "instance", NULL );
// Get the key framed values
{
in = mlt_properties_get_int( MLT_FRAME_PROPERTIES( frame ), "in" );
out = mlt_properties_get_int( MLT_FRAME_PROPERTIES( frame ), "out" );
+ position -= in;
}
// Duration of the shape
length = out - in + 1;
// If we haven't created the instance or it's changed
- if ( producer == NULL || strcmp( resource, mlt_properties_get( MLT_PRODUCER_PROPERTIES( producer ), "resource" ) ) )
+ if ( producer == NULL || strcmp( resource, last_resource ) )
{
+ char temp[ 512 ];
+ char *extension = strrchr( resource, '.' );
+
+ // Store the last resource now
+ mlt_properties_set( MLT_FILTER_PROPERTIES( this ), "_resource", resource );
+
+ // This is a hack - the idea is that we can indirectly reference the
+ // luma modules pgm or png images by a short cut like %luma01.pgm - we then replace
+ // the % with the full path to the image and use it if it exists, if not, check for
+ // the file ending in a .png, and failing that, default to a fade in
+ if ( strchr( resource, '%' ) )
+ {
+ FILE *test;
+ sprintf( temp, "%s/lumas/%s/%s", mlt_factory_prefix( ), mlt_environment( "MLT_NORMALISATION" ), strchr( resource, '%' ) + 1 );
+ test = fopen( temp, "r" );
+
+ if ( test == NULL )
+ {
+ strcat( temp, ".png" );
+ test = fopen( temp, "r" );
+ }
+
+ if ( test )
+ fclose( test );
+ else
+ strcpy( temp, "colour:0x00000080" );
+
+ resource = temp;
+ extension = strrchr( resource, '.' );
+ }
+
producer = mlt_factory_producer( NULL, resource );
if ( producer != NULL )
mlt_properties_set( MLT_PRODUCER_PROPERTIES( producer ), "eof", "loop" );
mlt_deque_push_back_double( MLT_FRAME_IMAGE_STACK( frame ), alpha_mix / 100.0 );
mlt_frame_push_get_image( frame, filter_get_image );
if ( mlt_properties_get_int( MLT_FILTER_PROPERTIES( this ), "audio_match" ) )
+ {
+ mlt_properties_set_int( MLT_FRAME_PROPERTIES( frame ), "meta.mixdown", 1 );
mlt_properties_set_double( MLT_FRAME_PROPERTIES( frame ), "meta.volume", alpha_mix / 100.0 );
+ }
}
}