producer_avformat.c: improve audio synchronization after seek (including in point)

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

diff --git a/src/modules/core/transition_luma.c b/src/modules/core/transition_luma.c
index f8ce18a..f08d84f 100644 (file)
--- a/src/modules/core/transition_luma.c
+++ b/src/modules/core/transition_luma.c
@@ -3,6 +3,9 @@
  * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
  * Author: Dan Dennedy <dan@dennedy.org>
  *
+ * Adapted from Kino Plugin Timfx, which is
+ * Copyright (C) 2002 Timothy M. Shead <tshead@k-3d.com>
+ *
  * 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
@@ -18,7 +21,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "transition_luma.h"
 #include <framework/mlt.h>
 
 #include <stdio.h>
@@ -144,6 +146,9 @@ static void luma_composite( mlt_frame a_frame, mlt_frame b_frame, int luma_width
        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;
@@ -376,6 +381,7 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
        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" );
@@ -387,7 +393,7 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
                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, '.' );
@@ -395,7 +401,7 @@ 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 );
+                       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" );
@@ -419,16 +425,24 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
                                // 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 )
@@ -465,6 +479,7 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
                                        // 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
@@ -515,7 +530,6 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
        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,
@@ -524,7 +538,6 @@ 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" );
@@ -560,7 +573,7 @@ static mlt_frame transition_process( mlt_transition transition, mlt_frame a_fram
 /** 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 )