#include <ctype.h>
#include <string.h>
#include <math.h>
-
-/** Calculate the position for this frame.
-*/
-
-static float position_calculate( mlt_transition this, mlt_frame frame )
-{
- // Get the in and out position
- mlt_position in = mlt_transition_get_in( this );
- mlt_position out = mlt_transition_get_out( this );
-
- // Get the position of the frame
- char *name = mlt_properties_get( MLT_TRANSITION_PROPERTIES( this ), "_unique_id" );
- mlt_position position = mlt_properties_get_position( MLT_FRAME_PROPERTIES( frame ), name );
-
- // Now do the calcs
- return ( float )( position - in ) / ( float )( out - in + 1 );
-}
-
-/** Calculate the field delta for this frame - position between two frames.
-*/
-
-static float delta_calculate( mlt_transition this, mlt_frame frame )
-{
- // Get the in and out position
- mlt_position in = mlt_transition_get_in( this );
- mlt_position out = mlt_transition_get_out( this );
-
- // Get the position of the frame
- mlt_position position = mlt_frame_get_position( frame );
-
- // Now do the calcs
- float x = ( float )( position - in ) / ( float )( out - in + 1 );
- float y = ( float )( position + 1 - in ) / ( float )( out - in + 1 );
-
- return ( y - x ) / 2.0;
-}
+#include "transition_composite.h"
static inline int dissolve_yuv( mlt_frame this, mlt_frame that, float weight, int width, int height )
{
int ret = 0;
+ int i = height + 1;
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 );
+ int mix = weight * ( 1 << 16 );
if ( mlt_properties_get( &this->parent, "distort" ) )
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 );
// 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 )
+ while ( --i )
{
- *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;
+ composite_line_yuv( p_dest, p_src, width_src, alpha_src, alpha_dst, mix, NULL, 0, 0 );
+ p_src += width_src << 1;
+ p_dest += width << 1;
+ alpha_src += width_src;
+ alpha_dst += width;
}
return ret;
if ( mlt_properties_get( &a_frame->parent, "distort" ) )
mlt_properties_set( &b_frame->parent, "distort", mlt_properties_get( &a_frame->parent, "distort" ) );
- mlt_properties_set_int( &b_frame->parent, "consumer_deinterlace", mlt_properties_get_int( &a_frame->parent, "consumer_deinterlace" ) );
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 );
// 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" );
// 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" );
+ luma_width = *width;
+ luma_height = *height;
}
- if ( resource != current_resource )
+ if ( resource && ( !current_resource || strcmp( resource, current_resource ) ) )
{
char temp[ 512 ];
char *extension = strrchr( resource, '.' );
+ char *orig_resource = resource;
if ( strchr( resource, '%' ) )
{
if ( extension != NULL && strcmp( extension, ".pgm" ) == 0 )
{
// Open PGM
- FILE *f = fopen( resource, "r" );
+ FILE *f = fopen( resource, "rb" );
if ( f != NULL )
{
// Load from PGM
// 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( properties, "_resource", orig_resource );
mlt_properties_set_data( properties, "bitmap", luma_bitmap, luma_width * luma_height * 2, mlt_pool_release, NULL );
}
}
// 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( 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
}
// Arbitrary composite defaults
- float mix = position_calculate( transition, a_frame );
- float frame_delta = delta_calculate( transition, a_frame );
-
+ 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" ) ||
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 || !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 ( 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 )
mix -= floor( mix );
- mix = reverse || invert ? 1 - mix : mix;
- frame_delta *= reverse || invert ? -1.0 : 1.0;
-
- // Ensure we get scaling on the b_frame
- 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", mlt_properties_get( a_props, "rescale.interp" ) );
-
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 );
+ }
+
+ mlt_service_unlock( MLT_TRANSITION_SERVICE( transition ) );
// Extract the a_frame image info
*width = mlt_properties_get_int( !invert ? a_props : b_props, "width" );
static mlt_frame transition_process( mlt_transition transition, mlt_frame a_frame, mlt_frame b_frame )
{
- // Get a unique name to store the frame position
- char *name = mlt_properties_get( MLT_TRANSITION_PROPERTIES( transition ), "_unique_id" );
-
- // Assign the current position to the name
- mlt_properties_set_position( MLT_FRAME_PROPERTIES( a_frame ), name, mlt_frame_get_position( a_frame ) );
-
// Push the transition on to the frame
mlt_frame_push_service( a_frame, transition );
projects / mlt / blobdiff