* 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"
-#include <framework/mlt_frame.h>
+#include <framework/mlt.h>
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
#include <string.h>
+#include <math.h>
-/** Luma class.
-*/
-
-typedef struct
+static inline int dissolve_yuv( mlt_frame this, mlt_frame that, float weight, int width, int height )
{
- struct mlt_transition_s parent;
- char *filename;
- int width;
- int height;
- double *bitmap;
-}
-transition_luma;
-
+ int ret = 0;
+ int width_src = width, height_src = height;
+ mlt_image_format format = mlt_image_yuv422;
+ uint8_t *p_src, *p_dest;
+ 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 );
+
+ if ( mlt_properties_get( &this->parent, "distort" ) )
+ mlt_properties_set( &that->parent, "distort", mlt_properties_get( &this->parent, "distort" ) );
+ 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;
-// forward declarations
-static void transition_close( mlt_transition parent );
+ 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;
+}
// image processing functions
-static inline double smoothstep( double edge1, double edge2, double a )
+static inline int32_t smoothstep( int32_t edge1, int32_t edge2, uint32_t a )
{
if ( a < edge1 )
- return 0.0;
+ return 0;
if ( a >= edge2 )
- return 1.0;
+ return 0x10000;
- a = ( a - edge1 ) / ( edge2 - edge1 );
+ a = ( ( a - edge1 ) << 16 ) / ( edge2 - edge1 );
- return ( a * a * ( 3 - 2 * a ) );
+ return ( ( ( a * a ) >> 16 ) * ( ( 3 << 16 ) - ( 2 * a ) ) ) >> 16;
}
/** powerful stuff
\param field_order -1 = progressive, 0 = lower field first, 1 = top field first
*/
-static void luma_composite( mlt_frame this, mlt_frame b_frame, int luma_width, int luma_height,
- double *luma_bitmap, double pos, double frame_delta, double softness, int field_order )
+static void luma_composite( mlt_frame a_frame, mlt_frame b_frame, int luma_width, int luma_height,
+ uint16_t *luma_bitmap, float pos, float frame_delta, float softness, int field_order,
+ int *width, int *height )
{
- int width_src, height_src;
- int width_dest, height_dest;
- mlt_image_format format_src, format_dest;
+ int width_src = *width, height_src = *height;
+ int width_dest = *width, height_dest = *height;
+ mlt_image_format format_src = mlt_image_yuv422, format_dest = mlt_image_yuv422;
uint8_t *p_src, *p_dest;
int i, j;
int stride_src;
int stride_dest;
- double weight = 0;
- int field;
+ uint16_t weight = 0;
- format_src = mlt_image_yuv422;
- format_dest = mlt_image_yuv422;
+ if ( mlt_properties_get( &a_frame->parent, "distort" ) )
+ mlt_properties_set( &b_frame->parent, "distort", mlt_properties_get( &a_frame->parent, "distort" ) );
+ 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 );
- mlt_frame_get_image( this, &p_dest, &format_dest, &width_dest, &height_dest, 1 /* writable */ );
- mlt_frame_get_image( b_frame, &p_src, &format_src, &width_src, &height_src, 0 /* writable */ );
+ 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;
+
stride_src = width_src * 2;
stride_dest = width_dest * 2;
- // composite using luma map
- for ( field = 0; field < ( field_order < 0 ? 1 : 2 ); ++field )
- {
- // Offset the position based on which field we're looking at ...
- double field_pos = pos + ( ( field_order == 0 ? 1 - field : field) * frame_delta * 0.5 );
-
- // adjust the position for the softness level
- field_pos *= ( 1.0 + softness );
-
- for ( i = field; i < height_src; i += ( field_order < 0 ? 1 : 2 ) )
- {
- uint8_t *p = &p_src[ i * stride_src ];
- uint8_t *q = &p_dest[ i * stride_dest ];
- uint8_t *o = &p_dest[ i * stride_dest ];
- double *l = &luma_bitmap[ i * luma_width ];
-
- for ( j = 0; j < width_src; j ++ )
- {
- uint8_t y = *p ++;
- uint8_t uv = *p ++;
- weight = *l ++;
- double value = smoothstep( weight, weight + softness, field_pos );
-
- *o ++ = (uint8_t)( y * value + *q++ * ( 1 - value ) );
- *o ++ = (uint8_t)( uv * value + *q++ * ( 1 - value ) );
- }
- }
- }
-}
+ // Offset the position based on which field we're looking at ...
+ int32_t field_pos[ 2 ];
+ field_pos[ 0 ] = ( pos + ( ( field_order == 0 ? 1 : 0 ) * frame_delta * 0.5 ) ) * ( 1 << 16 ) * ( 1.0 + softness );
+ field_pos[ 1 ] = ( pos + ( ( field_order == 0 ? 0 : 1 ) * frame_delta * 0.5 ) ) * ( 1 << 16 ) * ( 1.0 + softness );
-/** Get the image.
-*/
+ register uint8_t *p;
+ register uint8_t *q;
+ register uint8_t *o;
+ uint16_t *l;
-static int transition_get_image( mlt_frame this, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
-{
- // Get the properties of the a frame
- mlt_properties a_props = mlt_frame_properties( this );
+ uint32_t value;
- // Get the b frame from the stack
- mlt_frame b_frame = mlt_frame_pop_frame( this );
+ int32_t x_diff = ( luma_width << 16 ) / *width;
+ int32_t y_diff = ( luma_height << 16 ) / *height;
+ int32_t x_offset = 0;
+ int32_t y_offset = 0;
+ uint8_t *p_row;
+ uint8_t *q_row;
- // Get the properties of the b frame
- mlt_properties b_props = mlt_frame_properties( b_frame );
+ int32_t i_softness = softness * ( 1 << 16 );
- // Arbitrary composite defaults
- static double previous_mix = 0;
- double mix = 0;
- int luma_width = 0;
- int luma_height = 0;
- double *luma_bitmap = NULL;
- double luma_softness = 0;
- int progressive = 0;
- int top_field_first = 0;
-
- // mix is the offset time value in the duration of the transition
- // - also used as the mixing level for a dissolve
- if ( mlt_properties_get( b_props, "mix" ) != NULL )
- mix = mlt_properties_get_double( b_props, "mix" );
-
- // (mix - previous_mix) is the animation delta, if backwards reset previous
- if ( mix < previous_mix )
- previous_mix = 0;
-
- // Get the interlace and field properties of the frame
- if ( mlt_properties_get( b_props, "progressive" ) != NULL )
- progressive = mlt_properties_get_int( b_props, "progressive" );
- if ( mlt_properties_get( b_props, "top_field_first" ) != NULL )
- top_field_first = mlt_properties_get_int( b_props, "top_field_first" );
-
- // Get the luma map parameters
- if ( mlt_properties_get( b_props, "luma.width" ) != NULL )
- luma_width = mlt_properties_get_int( b_props, "luma.width" );
- if ( mlt_properties_get( b_props, "luma.height" ) != NULL )
- luma_height = mlt_properties_get_int( b_props, "luma.height" );
- if ( mlt_properties_get( b_props, "luma.softness" ) != NULL )
- luma_softness = mlt_properties_get_double( b_props, "luma.softness" );
- luma_bitmap = (double*) mlt_properties_get_data( b_props, "luma.bitmap", NULL );
+ int field_count = field_order < 0 ? 1 : 2;
+ int field_stride_src = field_count * stride_src;
+ int field_stride_dest = field_count * stride_dest;
+ int field = 0;
- if ( luma_width > 0 && luma_height > 0 && luma_bitmap != NULL )
- // Composite the frames using a luma map
- luma_composite( this, b_frame, luma_width, luma_height, luma_bitmap, mix, mix - previous_mix,
- luma_softness, progressive > 0 ? -1 : top_field_first );
- else
- // Dissolve the frames using the time offset for mix value
- mlt_frame_composite_yuv( this, b_frame, 0, 0, mix );
-
- // Extract the a_frame image info
- *width = mlt_properties_get_int( a_props, "width" );
- *height = mlt_properties_get_int( a_props, "height" );
- *image = mlt_properties_get_data( a_props, "image", NULL );
-
- // Close the b_frame
- mlt_frame_close( b_frame );
-
- previous_mix = mix;
-
- return 0;
-}
-
-static int transition_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples )
-{
- // Get the properties of the a frame
- mlt_properties a_props = mlt_frame_properties( frame );
-
- // Get the b frame from the stack
- mlt_frame b_frame = mlt_frame_pop_frame( frame );
-
- // Get the properties of the b frame
- mlt_properties b_props = mlt_frame_properties( b_frame );
+ // composite using luma map
+ while ( field < field_count )
+ {
+ p_row = p_src + field * stride_src;
+ q_row = p_dest + field * stride_dest;
+ y_offset = field << 16;
+ i = field;
- // Restore the original get_audio
- frame->get_audio = mlt_properties_get_data( a_props, "get_audio", NULL );
-
- double mix = 0;
- if ( mlt_properties_get( b_props, "mix" ) != NULL )
- mix = mlt_properties_get_double( b_props, "mix" );
- mlt_frame_mix_audio( frame, b_frame, mix, buffer, format, frequency, channels, samples );
+ while ( i < height_src )
+ {
+ p = p_row;
+ q = q_row;
+ o = q;
+ l = luma_bitmap + ( y_offset >> 16 ) * ( luma_width * field_count );
+ x_offset = 0;
+ j = width_src;
+
+ while( j -- )
+ {
+ weight = l[ x_offset >> 16 ];
+ value = smoothstep( weight, i_softness + weight, field_pos[ field ] );
+ *o ++ = ( *p ++ * value + *q++ * ( ( 1 << 16 ) - value ) ) >> 16;
+ *o ++ = ( *p ++ * value + *q++ * ( ( 1 << 16 ) - value ) ) >> 16;
+ x_offset += x_diff;
+ }
- // Push the b_frame back on for get_image
- mlt_frame_push_frame( frame, b_frame );
+ y_offset += y_diff;
+ i += field_count;
+ p_row += field_stride_src;
+ q_row += field_stride_dest;
+ }
- return 0;
+ field ++;
+ }
}
-
/** Load the luma map from PGM stream.
*/
-static void luma_read_pgm( FILE *f, double **map, int *width, int *height )
+static void luma_read_pgm( FILE *f, uint16_t **map, int *width, int *height )
{
uint8_t *data = NULL;
while (1)
{
char line[128];
+ char comment[128];
int i = 2;
int maxval;
int bpp;
- double *p;
-
+ uint16_t *p;
+
line[127] = '\0';
// get the magic code
if ( fgets( line, 127, f ) == NULL )
break;
+
+ // skip comments
+ while ( sscanf( line, " #%s", comment ) > 0 )
+ if ( fgets( line, 127, f ) == NULL )
+ break;
+
if ( line[0] != 'P' || line[1] != '5' )
break;
// skip white space and see if a new line must be fetched
for ( i = 2; i < 127 && line[i] != '\0' && isspace( line[i] ); i++ );
- if ( line[i] == '\0' && fgets( line, 127, f ) == NULL )
+ if ( ( line[i] == '\0' || line[i] == '#' ) && fgets( line, 127, f ) == NULL )
break;
+ // skip comments
+ while ( sscanf( line, " #%s", comment ) > 0 )
+ if ( fgets( line, 127, f ) == NULL )
+ break;
+
// get the dimensions
if ( line[0] == 'P' )
i = sscanf( line, "P5 %d %d %d", width, height, &maxval );
{
if ( fgets( line, 127, f ) == NULL )
break;
+
+ // skip comments
+ while ( sscanf( line, " #%s", comment ) > 0 )
+ if ( fgets( line, 127, f ) == NULL )
+ break;
+
i = sscanf( line, "%d", height );
if ( i == 0 )
break;
{
if ( fgets( line, 127, f ) == NULL )
break;
+
+ // skip comments
+ while ( sscanf( line, " #%s", comment ) > 0 )
+ if ( fgets( line, 127, f ) == NULL )
+ break;
+
i = sscanf( line, "%d", &maxval );
if ( i == 0 )
break;
// determine if this is one or two bytes per pixel
bpp = maxval > 255 ? 2 : 1;
- // allocate temporary storage for the raw data
- data = malloc( *width * *height * bpp );
+
+ // allocate temporary storage for the raw data
+ data = mlt_pool_alloc( *width * *height * bpp );
if ( data == NULL )
break;
// read the raw data
if ( fread( data, *width * *height * bpp, 1, f ) != 1 )
break;
-
+
// allocate the luma bitmap
- *map = p = (double*) malloc( *width * *height * sizeof( double ) );
+ *map = p = (uint16_t*)mlt_pool_alloc( *width * *height * sizeof( uint16_t ) );
if ( *map == NULL )
break;
for ( i = 0; i < *width * *height * bpp; i += bpp )
{
if ( bpp == 1 )
- *p++ = (double) data[ i ] / (double) maxval;
+ *p++ = data[ i ] << 8;
else
- *p++ = (double) ( ( data[ i ] << 8 ) + data[ i+1 ] ) / (double) maxval;
+ *p++ = ( data[ i ] << 8 ) + data[ i+1 ];
}
break;
}
-
+
if ( data != NULL )
- free( data );
+ mlt_pool_release( data );
}
+/** Generate a luma map from an RGB image.
+*/
-/** Luma transition processing.
+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 ) );
+ if ( *map == NULL )
+ return;
+
+ // proces the image data into the luma bitmap
+ for ( i = 0; i < size; i += 2 )
+ *p++ = ( image[ i ] - 16 ) * 299; // 299 = 65535 / 219
+}
+
+/** Get the image.
*/
-static mlt_frame transition_process( mlt_transition transition, mlt_frame a_frame, mlt_frame b_frame )
+static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
{
- transition_luma *this = (transition_luma*) transition->child;
+ // Get the b frame from the stack
+ mlt_frame b_frame = mlt_frame_pop_frame( a_frame );
+
+ // Get the transition object
+ mlt_transition transition = mlt_frame_pop_service( a_frame );
// Get the properties of the transition
- mlt_properties properties = mlt_transition_properties( transition );
-
+ mlt_properties properties = MLT_TRANSITION_PROPERTIES( transition );
+
+ // Get the properties of the a frame
+ mlt_properties a_props = MLT_FRAME_PROPERTIES( a_frame );
+
// Get the properties of the b frame
- mlt_properties b_props = mlt_frame_properties( b_frame );
+ mlt_properties b_props = MLT_FRAME_PROPERTIES( b_frame );
+ // This compositer is yuv422 only
+ *format = mlt_image_yuv422;
+
+ mlt_service_lock( MLT_TRANSITION_SERVICE( transition ) );
+
+ // The cached luma map information
+ 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 *luma_file = mlt_properties_get( properties, "filename" );
- if ( luma_file != NULL && luma_file != this->filename )
+ char *resource = mlt_properties_get( properties, "resource" );
+
+ // Correct width/height if not specified
+ if ( luma_width == 0 || luma_height == 0 )
{
- int width = mlt_properties_get_int( b_props, "width" );
- int height = mlt_properties_get_int( b_props, "height" );
- char command[ 512 ];
- FILE *pipe;
+ luma_width = *width;
+ luma_height = *height;
+ }
- command[ 511 ] = '\0';
- this->filename = luma_file;
- snprintf( command, 511, "anytopnm %s | pnmscale -width %d -height %d", luma_file, width, height );
- //pipe = popen( command, "r" );
- pipe = fopen( luma_file, "r" );
- if ( pipe != NULL )
+ if ( resource && ( !current_resource || strcmp( resource, current_resource ) ) )
+ {
+ char temp[ 512 ];
+ char *extension = strrchr( resource, '.' );
+ char *orig_resource = resource;
+
+ if ( strchr( resource, '%' ) )
{
- luma_read_pgm( pipe, &this->bitmap, &this->width, &this->height );
- //pclose( pipe );
- fclose( pipe );
+ FILE *test;
+ 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" );
+ else
+ fclose( test );
+ resource = temp;
+ extension = strrchr( resource, '.' );
+ }
+
+ // See if it is a PGM
+ if ( extension != NULL && strcmp( extension, ".pgm" ) == 0 )
+ {
+ // Open PGM
+ FILE *f = fopen( resource, "r" );
+ if ( f != NULL )
+ {
+ // Load from PGM
+ luma_read_pgm( f, &luma_bitmap, &luma_width, &luma_height );
+ fclose( 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", orig_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_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 )
+ {
+ // Get the producer properties
+ mlt_properties producer_properties = MLT_PRODUCER_PROPERTIES( producer );
+
+ // Ensure that we loop
+ mlt_properties_set( producer_properties, "eof", "loop" );
+
+ // Now pass all producer. properties on the transition down
+ mlt_properties_pass( producer_properties, properties, "producer." );
+
+ // We will get the alpha frame from the producer
+ mlt_frame luma_frame = NULL;
+
+ // Get the luma frame
+ if ( mlt_service_get_frame( MLT_PRODUCER_SERVICE( producer ), &luma_frame, 0 ) == 0 )
+ {
+ 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", "nearest" );
+ mlt_frame_get_image( luma_frame, &luma_image, &luma_format, &luma_width, &luma_height, 0 );
+
+ // Generate the luma map
+ if ( luma_image != NULL )
+ luma_read_yuv422( luma_image, &luma_bitmap, luma_width, luma_height );
+
+ // 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", orig_resource);
+ mlt_properties_set_data( properties, "bitmap", luma_bitmap, luma_width * luma_height * 2, mlt_pool_release, NULL );
+
+ // Cleanup the luma frame
+ mlt_frame_close( luma_frame );
+ }
+
+ // Cleanup the luma producer
+ mlt_producer_close( producer );
+ }
}
-
}
- // Determine the time position of this frame in the transition duration
- mlt_timecode in = mlt_transition_get_in( transition );
- mlt_timecode out = mlt_transition_get_out( transition );
- mlt_timecode time = mlt_frame_get_timecode( b_frame );
- double pos = ( time - in ) / ( out - in );
+ // Arbitrary composite defaults
+ float mix = mlt_transition_get_progress( transition, a_frame );
+ float frame_delta = mlt_transition_get_progress_delta( transition, a_frame );
+ float luma_softness = mlt_properties_get_double( properties, "softness" );
+ int progressive =
+ mlt_properties_get_int( a_props, "consumer_deinterlace" ) ||
+ mlt_properties_get_int( properties, "progressive" ) ||
+ mlt_properties_get_int( b_props, "luma.progressive" );
+ int top_field_first = mlt_properties_get_int( b_props, "top_field_first" );
+ int reverse = mlt_properties_get_int( properties, "reverse" );
+ int invert = mlt_properties_get_int( properties, "invert" );
+
+ // Honour the reverse here
+ if ( mix >= 1.0 )
+ mix -= floor( mix );
+
+ if ( mlt_properties_get( properties, "fixed" ) )
+ mix = mlt_properties_get_double( properties, "fixed" );
+
+ if ( luma_width > 0 && luma_height > 0 && luma_bitmap != NULL )
+ {
+ reverse = invert ? !reverse : reverse;
+ mix = reverse ? 1 - mix : mix;
+ frame_delta *= reverse ? -1.0 : 1.0;
+ // 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,
+ luma_softness, progressive ? -1 : top_field_first, width, height );
+ }
+ else
+ {
+ mix = ( reverse || invert ) ? 1 - mix : mix;
+ invert = 0;
+ // Dissolve the frames using the time offset for mix value
+ dissolve_yuv( a_frame, b_frame, mix, *width, *height );
+ }
- // Set the b frame properties
- mlt_properties_set_double( b_props, "mix", pos );
- mlt_properties_set_int( b_props, "luma.width", this->width );
- mlt_properties_set_int( b_props, "luma.height", this->height );
- mlt_properties_set_data( b_props, "luma.bitmap", this->bitmap, 0, NULL, NULL );
- if ( mlt_properties_get( properties, "softness" ) != NULL )
- mlt_properties_set_double( b_props, "luma.softness", mlt_properties_get_double( properties, "softness" ) );
+ mlt_service_unlock( MLT_TRANSITION_SERVICE( transition ) );
- mlt_frame_push_get_image( a_frame, transition_get_image );
- mlt_frame_push_frame( a_frame, b_frame );
+ // 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" );
+ *image = mlt_properties_get_data( !invert ? a_props : b_props, "image", NULL );
+
+ return 0;
+}
-/************************ AUDIO ***************************/
-#if 1
- // Backup the original get_audio (it's still needed)
- mlt_properties_set_data( mlt_frame_properties( a_frame ), "get_audio", a_frame->get_audio, 0, NULL, NULL );
- // Override the get_audio method
- a_frame->get_audio = transition_get_audio;
-#endif
+/** Luma transition processing.
+*/
+
+static mlt_frame transition_process( mlt_transition transition, mlt_frame a_frame, mlt_frame b_frame )
+{
+ // Push the transition on to the frame
+ mlt_frame_push_service( a_frame, transition );
+
+ // Push the b_frame on to the stack
+ mlt_frame_push_frame( a_frame, b_frame );
+
+ // Push the transition method
+ mlt_frame_push_get_image( a_frame, transition_get_image );
+
return a_frame;
}
/** 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 )
{
- transition_luma *this = calloc( sizeof( transition_luma ), 1 );
- if ( this != NULL )
+ mlt_transition transition = mlt_transition_new( );
+ if ( transition != NULL )
{
- mlt_transition transition = &this->parent;
- mlt_transition_init( transition, this );
+ // Set the methods
transition->process = transition_process;
- transition->close = transition_close;
+
+ // Default factory
+ mlt_properties_set( MLT_TRANSITION_PROPERTIES( transition ), "factory", mlt_environment( "MLT_PRODUCER" ) );
- if ( lumafile != NULL )
- mlt_properties_set( mlt_transition_properties( transition ), "filename", lumafile );
+ // Set the main property
+ mlt_properties_set( MLT_TRANSITION_PROPERTIES( transition ), "resource", lumafile );
- return &this->parent;
+ // 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;
}
-
-/** Close the transition.
-*/
-
-static void transition_close( mlt_transition parent )
-{
- transition_luma *this = (transition_luma*) parent->child;
-
- if ( this->bitmap )
- free( this->bitmap );
-
- parent->close = NULL;
- mlt_transition_close( parent );
- free( this );
-}
-
projects / mlt / blobdiff