Cleanup copyrights and attributions, and move Jean-Baptiste's services to a new kdenl...
[melted] / src / modules / core / transition_luma.c
index 435aeb3..4b87b2a 100644 (file)
@@ -3,19 +3,22 @@
  * 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"
@@ -69,8 +72,10 @@ static inline int dissolve_yuv( mlt_frame this, mlt_frame that, float weight, in
        int width_src = width, height_src = height;
        mlt_image_format format = mlt_image_yuv422;
        uint8_t *p_src, *p_dest;
-       uint8_t *p;
+       uint8_t *p, *q;
        uint8_t *limit;
+       uint8_t *alpha_src;
+       uint8_t *alpha_dst;
 
        int32_t weigh = weight * ( 1 << 16 );
        int32_t weigh_complement = ( 1 - weight ) * ( 1 << 16 );
@@ -79,19 +84,23 @@ static inline int dissolve_yuv( mlt_frame this, mlt_frame that, float weight, in
                mlt_properties_set( &that->parent, "distort", mlt_properties_get( &this->parent, "distort" ) );
        mlt_properties_set_int( &that->parent, "consumer_deinterlace", mlt_properties_get_int( &this->parent, "consumer_deinterlace" ) );
        mlt_frame_get_image( this, &p_dest, &format, &width, &height, 1 );
+       alpha_dst = mlt_frame_get_alpha_mask( this );
        mlt_frame_get_image( that, &p_src, &format, &width_src, &height_src, 0 );
+       alpha_src = mlt_frame_get_alpha_mask( that );
 
        // Pick the lesser of two evils ;-)
        width_src = width_src > width ? width : width_src;
        height_src = height_src > height ? height : height_src;
        
        p = p_dest;
+       q = alpha_dst;
        limit = p_dest + height_src * width_src * 2;
 
        while ( p < limit )
        {
                *p_dest++ = ( *p_src++ * weigh + *p++ * weigh_complement ) >> 16;
                *p_dest++ = ( *p_src++ * weigh + *p++ * weigh_complement ) >> 16;
+               *alpha_dst++ = ( *alpha_src++ * weigh + *q++ * weigh_complement ) >> 16;
        }
 
        return ret;
@@ -325,6 +334,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 +342,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
 }
 
@@ -362,6 +372,9 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
        // Get the properties of the b frame
        mlt_properties b_props = MLT_FRAME_PROPERTIES( b_frame );
 
+       // This compositer is yuv422 only
+       *format = mlt_image_yuv422;
+
        // The cached luma map information
        int luma_width = mlt_properties_get_int( properties, "width" );
        int luma_height = mlt_properties_get_int( properties, "height" );
@@ -370,6 +383,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 +397,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 +451,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 +493,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,11 +512,13 @@ 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" );
 
+
        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,
@@ -498,6 +527,7 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
                // 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" );
@@ -547,6 +577,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;