+ Inherits deinterlace method from the consumer

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

diff --git a/src/modules/core/transition_luma.c b/src/modules/core/transition_luma.c
index 435aeb30b8ddff70209896e4ca927e1bcd1555ce..29eb09582d1de3192150c692a12ca170c7089662 100644 (file)
--- a/src/modules/core/transition_luma.c
+++ b/src/modules/core/transition_luma.c
@@ -325,6 +325,7 @@ static void luma_read_pgm( FILE *f, uint16_t **map, int *width, int *height )
 static void luma_read_yuv422( uint8_t *image, uint16_t **map, int width, int height )
 {
        int i;
+       int size = width * height * 2;
        
        // allocate the luma bitmap
        uint16_t *p = *map = ( uint16_t* )mlt_pool_alloc( width * height * sizeof( uint16_t ) );
@@ -332,7 +333,7 @@ static void luma_read_yuv422( uint8_t *image, uint16_t **map, int width, int hei
                return;
 
        // proces the image data into the luma bitmap
-       for ( i = 0; i < width * height * 2; i += 2 )
+       for ( i = 0; i < size; i += 2 )
                *p++ = ( image[ i ] - 16 ) * 299; // 299 = 65535 / 219
 }
 
@@ -370,6 +371,13 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
        // If the filename property changed, reload the map
        char *resource = mlt_properties_get( properties, "resource" );
 
+       // Correct width/height if not specified
+       if ( luma_width == 0 || luma_height == 0 )
+       {
+               luma_width = mlt_properties_get_int( a_props, "width" );
+               luma_height = mlt_properties_get_int( a_props, "height" );
+       }
+               
        if ( luma_bitmap == NULL && resource != NULL )
        {
                char temp[ 512 ];
@@ -377,7 +385,13 @@ 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 );
+                       test = fopen( temp, "r" );
+                       if ( test == NULL )
+                               strcat( temp, ".png" );
+                       else
+                               fclose( test ); 
                        resource = temp;
                        extension = strrchr( resource, '.' );
                }
@@ -425,11 +439,11 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
                                // Get the luma frame
                                if ( mlt_service_get_frame( MLT_PRODUCER_SERVICE( producer ), &luma_frame, 0 ) == 0 )
                                {
-                                       uint8_t *luma_image;
+                                       uint8_t *luma_image = NULL;
                                        mlt_image_format luma_format = mlt_image_yuv422;
 
                                        // Get image from the luma producer
-                                       mlt_properties_set( MLT_FRAME_PROPERTIES( luma_frame ), "rescale.interp", "none" );
+                                       mlt_properties_set( MLT_FRAME_PROPERTIES( luma_frame ), "rescale.interp", "nearest" );
                                        mlt_frame_get_image( luma_frame, &luma_image, &luma_format, &luma_width, &luma_height, 0 );
 
                                        // Generate the luma map
@@ -467,15 +481,16 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
        int reverse = mlt_properties_get_int( properties, "reverse" );
        int invert = mlt_properties_get_int( properties, "invert" );
 
-       if ( mlt_properties_get( a_props, "rescale.interp" ) == NULL )
+       if ( mlt_properties_get( a_props, "rescale.interp" ) == NULL || !strcmp( mlt_properties_get( a_props, "rescale.interp" ), "none" ) )
                mlt_properties_set( a_props, "rescale.interp", "nearest" );
 
        // Since we are the consumer of the b_frame, we must pass along this
        // consumer property from the a_frame
-       if ( !strcmp( mlt_properties_get( a_props, "rescale.interp" ), "none" ) )
-               mlt_properties_set_double( b_props, "consumer_aspect_ratio", mlt_properties_get_double( a_props, "aspect_ratio" ) );
-       else
-               mlt_properties_set_double( b_props, "consumer_aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) );
+       if ( mlt_properties_get_double( a_props, "aspect_ratio" ) == 0.0 )
+               mlt_properties_set_double( a_props, "aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) );
+       if ( mlt_properties_get_double( b_props, "aspect_ratio" ) == 0.0 )
+               mlt_properties_set_double( b_props, "aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) );
+       mlt_properties_set_double( b_props, "consumer_aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) );
 
        // Honour the reverse here
        if ( mix >= 1.0 )
@@ -485,7 +500,8 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
        frame_delta *= reverse || invert ? -1.0 : 1.0;
 
        // Ensure we get scaling on the b_frame
-       mlt_properties_set( b_props, "rescale.interp", "nearest" );
+       if ( mlt_properties_get( b_props, "rescale.interp" ) == NULL || !strcmp( mlt_properties_get( b_props, "rescale.interp" ), "none" ) )
+               mlt_properties_set( b_props, "rescale.interp", "nearest" );
 
        if ( mlt_properties_get( properties, "fixed" ) )
                mix = mlt_properties_get_double( properties, "fixed" );
@@ -547,6 +563,9 @@ mlt_transition transition_luma_init( char *lumafile )
                // Set the main property
                mlt_properties_set( MLT_TRANSITION_PROPERTIES( transition ), "resource", lumafile );
                
+               // Inform apps and framework that this is a video only transition
+               mlt_properties_set_int( MLT_TRANSITION_PROPERTIES( transition ), "_transition_type", 1 );
+
                return transition;
        }
        return NULL;