#include <string.h>
#include <math.h>
-typedef void ( *composite_line_fn )( uint8_t *dest, uint8_t *src, int width_src, uint8_t *alpha, int weight, uint16_t *luma, int softness );
-
-/* mmx function declarations */
-#ifdef USE_MMX
- void composite_line_yuv_mmx( uint8_t *dest, uint8_t *src, int width_src, uint8_t *alpha, int weight, uint16_t *luma, int softness );
- int composite_have_mmx( void );
-#endif
+typedef void ( *composite_line_fn )( uint8_t *dest, uint8_t *src, int width_src, uint8_t *alpha_b, uint8_t *alpha_a, int weight, uint16_t *luma, int softness );
/** Geometry struct.
*/
/** Calculate real geometry.
*/
-static void geometry_calculate( mlt_transition this, struct geometry_s *output, float position )
+static void geometry_calculate( mlt_transition this, struct geometry_s *output, double position )
{
mlt_properties properties = MLT_TRANSITION_PROPERTIES( this );
mlt_geometry geometry = mlt_properties_get_data( properties, "geometries", NULL );
+ int mirror_off = mlt_properties_get_int( properties, "mirror_off" );
+ int repeat_off = mlt_properties_get_int( properties, "repeat_off" );
int length = mlt_geometry_get_length( geometry );
// Allow wrapping
- if ( position >= length && length != 0 )
+ if ( !repeat_off && position >= length && length != 0 )
{
int section = position / length;
position -= section * length;
- if ( section % 2 == 1 )
+ if ( !mirror_off && section % 2 == 1 )
position = length - position;
}
mlt_position in = mlt_transition_get_in( this );
mlt_position out = mlt_transition_get_out( this );
int length = out - in + 1;
+ double cycle = mlt_properties_get_double( properties, "cycle" );
// Get the new style geometry string
char *property = mlt_properties_get( properties, "geometry" );
// Allow a geometry repeat cycle
- if ( mlt_properties_get_int( properties, "cycle" ) )
- length = mlt_properties_get_int( properties, "cycle" );
+ if ( cycle >= 1 )
+ length = cycle;
+ else if ( cycle > 0 )
+ length *= cycle;
// Parse the geometry if we have one
mlt_geometry_parse( geometry, property, length, normalised_width, normalised_height );
/** Calculate the field delta for this frame - position between two frames.
*/
-static inline float delta_calculate( mlt_transition this, mlt_frame frame )
+static inline double delta_calculate( mlt_transition this, mlt_frame frame, mlt_position position )
{
// Get the in and out position
mlt_position in = mlt_transition_get_in( this );
mlt_position out = mlt_transition_get_out( this );
- float length = out - in + 1;
-
- // 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 );
+ double length = out - in + 1;
// Now do the calcs
- float x = ( float )( position - in ) / length;
- float y = ( float )( position + 1 - in ) / length;
+ double x = ( double )( position - in ) / length;
+ double y = ( double )( position + 1 - in ) / length;
return length * ( y - x ) / 2.0;
}
/** Composite a source line over a destination line
*/
-static inline
-void composite_line_yuv( uint8_t *dest, uint8_t *src, int width_src, uint8_t *alpha, int weight, uint16_t *luma, int softness )
+static void composite_line_yuv( uint8_t *dest, uint8_t *src, int width, uint8_t *alpha_b, uint8_t *alpha_a, int weight, uint16_t *luma, int softness )
+{
+ register int j;
+ register int a;
+ register int mix;
+
+ for ( j = 0; j < width; j ++ )
+ {
+ a = *alpha_b ++;
+ mix = ( luma == NULL ) ? weight : smoothstep( luma[ j ], luma[ j ] + softness, weight + softness );
+ mix = ( mix * a ) >> 8;
+ *dest = ( *src++ * mix + *dest * ( ( 1 << 16 ) - mix ) ) >> 16;
+ dest++;
+ *dest = ( *src++ * mix + *dest * ( ( 1 << 16 ) - mix ) ) >> 16;
+ dest++;
+ *alpha_a = mix | *alpha_a;
+ alpha_a ++;
+ }
+}
+
+static void composite_line_yuv_or( uint8_t *dest, uint8_t *src, int width, uint8_t *alpha_b, uint8_t *alpha_a, int weight, uint16_t *luma, int softness )
{
register int j;
- int a, mix;
+ register int a;
+ register int mix;
- for ( j = 0; j < width_src; j ++ )
+ for ( j = 0; j < width; j ++ )
{
- a = ( alpha == NULL ) ? 255 : *alpha ++;
+ a = *alpha_b ++ | *alpha_a;
mix = ( luma == NULL ) ? weight : smoothstep( luma[ j ], luma[ j ] + softness, weight + softness );
mix = ( mix * a ) >> 8;
*dest = ( *src++ * mix + *dest * ( ( 1 << 16 ) - mix ) ) >> 16;
dest++;
*dest = ( *src++ * mix + *dest * ( ( 1 << 16 ) - mix ) ) >> 16;
dest++;
+ *alpha_a = mix | *alpha_a;
+ alpha_a ++;
+ }
+}
+
+static void composite_line_yuv_and( uint8_t *dest, uint8_t *src, int width, uint8_t *alpha_b, uint8_t *alpha_a, int weight, uint16_t *luma, int softness )
+{
+ register int j;
+ register int a;
+ register int mix;
+
+ for ( j = 0; j < width; j ++ )
+ {
+ a = *alpha_b ++ & *alpha_a;
+ mix = ( luma == NULL ) ? weight : smoothstep( luma[ j ], luma[ j ] + softness, weight + softness );
+ mix = ( mix * a ) >> 8;
+ *dest = ( *src++ * mix + *dest * ( ( 1 << 16 ) - mix ) ) >> 16;
+ dest++;
+ *dest = ( *src++ * mix + *dest * ( ( 1 << 16 ) - mix ) ) >> 16;
+ dest++;
+ *alpha_a = mix | *alpha_a;
+ alpha_a ++;
+ }
+}
+
+static void composite_line_yuv_xor( uint8_t *dest, uint8_t *src, int width, uint8_t *alpha_b, uint8_t *alpha_a, int weight, uint16_t *luma, int softness )
+{
+ register int j;
+ register int a;
+ register int mix;
+
+ for ( j = 0; j < width; j ++ )
+ {
+ a = *alpha_b ++ ^ *alpha_a;
+ mix = ( luma == NULL ) ? weight : smoothstep( luma[ j ], luma[ j ] + softness, weight + softness );
+ mix = ( mix * a ) >> 8;
+ *dest = ( *src++ * mix + *dest * ( ( 1 << 16 ) - mix ) ) >> 16;
+ dest++;
+ *dest = ( *src++ * mix + *dest * ( ( 1 << 16 ) - mix ) ) >> 16;
+ dest++;
+ *alpha_a = mix | *alpha_a;
+ alpha_a ++;
}
}
/** Composite function.
*/
-static int composite_yuv( uint8_t *p_dest, int width_dest, int height_dest, uint8_t *p_src, int width_src, int height_src, uint8_t *p_alpha, struct geometry_s geometry, int field, uint16_t *p_luma, int32_t softness, composite_line_fn line_fn )
+static int composite_yuv( uint8_t *p_dest, int width_dest, int height_dest, uint8_t *p_src, int width_src, int height_src, uint8_t *alpha_b, uint8_t *alpha_a, struct geometry_s geometry, int field, uint16_t *p_luma, int32_t softness, composite_line_fn line_fn )
{
int ret = 0;
int i;
p_dest += ( x < 0 ? 0 : x ) * bpp + ( y < 0 ? 0 : y ) * stride_dest;
// offset pointer into alpha channel based upon cropping
- if ( p_alpha )
- p_alpha += x_src + y_src * stride_src / bpp;
+ alpha_b += x_src + y_src * stride_src / bpp;
+ alpha_a += x + y * stride_dest / bpp;
// offset pointer into luma channel based upon cropping
if ( p_luma )
if ( field == 1 )
{
p_src += stride_src;
- if ( p_alpha )
- p_alpha += stride_src / bpp;
+ alpha_b += stride_src / bpp;
+ alpha_a += stride_dest / bpp;
height_src--;
}
stride_src *= step;
stride_dest *= step;
- int alpha_stride = stride_src / bpp;
+ int alpha_b_stride = stride_src / bpp;
+ int alpha_a_stride = stride_dest / bpp;
// Make sure than x and w are even
if ( x_uneven )
{
p_src += 2;
width_src --;
+ alpha_a ++;
}
// now do the compositing only to cropped extents
- if ( line_fn != NULL )
+ for ( i = 0; i < height_src; i += step )
{
- for ( i = 0; i < height_src; i += step )
- {
- line_fn( p_dest, p_src, width_src, p_alpha, weight, p_luma, softness );
-
- p_src += stride_src;
- p_dest += stride_dest;
- if ( p_alpha )
- p_alpha += alpha_stride;
- if ( p_luma )
- p_luma += alpha_stride;
- }
- }
- else
- {
- for ( i = 0; i < height_src; i += step )
- {
- composite_line_yuv( p_dest, p_src, width_src, p_alpha, weight, p_luma, softness );
-
- p_src += stride_src;
- p_dest += stride_dest;
- if ( p_alpha )
- p_alpha += alpha_stride;
- if ( p_luma )
- p_luma += alpha_stride;
- }
+ line_fn( p_dest, p_src, width_src, alpha_b, alpha_a, weight, p_luma, softness );
+
+ p_src += stride_src;
+ p_dest += stride_dest;
+ alpha_b += alpha_b_stride;
+ alpha_a += alpha_a_stride;
+ if ( p_luma )
+ p_luma += alpha_b_stride;
}
return ret;
char temp[ 512 ];
+ if ( luma_width == 0 || luma_height == 0 )
+ {
+ luma_width = width;
+ luma_height = height;
+ }
+
if ( resource != NULL && strchr( resource, '%' ) )
{
+ // TODO: Clean up quick and dirty compressed/existence check
+ 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;
}
// Load the original luma once
if ( orig_bitmap == NULL )
{
- char *extension = extension = strrchr( resource, '.' );
+ char *extension = strrchr( resource, '.' );
// See if it is a PGM
if ( extension != NULL && strcmp( extension, ".pgm" ) == 0 )
int real_height = get_value( b_props, "real_height", "height" );
double input_ar = mlt_frame_get_aspect_ratio( b_frame );
double output_ar = mlt_properties_get_double( b_props, "consumer_aspect_ratio" );
+ if ( input_ar == 0.0 ) input_ar = output_ar;
int scaled_width = input_ar / output_ar * real_width;
int scaled_height = real_height;
alignment_calculate( geometry );
// Adjust to consumer scale
- int x = geometry->item.x * *width / geometry->nw;
- int y = geometry->item.y * *height / geometry->nh;
*width = geometry->sw * *width / geometry->nw;
*height = geometry->sh * *height / geometry->nh;
- //x = ( x | 1 ) ^ 1;
-
- // optimization points - no work to do
- if ( *width < 1 || *height < 1 )
- return 1;
-
- if ( ( x < 0 && -x >= *width ) || ( y < 0 && -y >= *height ) )
- return 1;
-
ret = mlt_frame_get_image( b_frame, image, &format, width, height, 1 );
- return ret;
+ return ret && image != NULL;
}
-static mlt_geometry composite_calculate( mlt_transition this, struct geometry_s *result, mlt_frame a_frame, float position )
+static mlt_geometry composite_calculate( mlt_transition this, struct geometry_s *result, mlt_frame a_frame, double position )
{
// Get the properties from the transition
mlt_properties properties = MLT_TRANSITION_PROPERTIES( this );
else
{
int length = mlt_transition_get_out( this ) - mlt_transition_get_in( this ) + 1;
- if ( mlt_properties_get_int( properties, "cycle" ) )
- length = mlt_properties_get_int( properties, "cycle" );
+ double cycle = mlt_properties_get_double( properties, "cycle" );
+ if ( cycle > 1 )
+ length = cycle;
+ else if ( cycle > 0 )
+ length *= cycle;
mlt_geometry_refresh( start, mlt_properties_get( properties, "geometry" ), length, normalised_width, normalised_height );
}
// Will need to know region to copy
struct geometry_s result;
- float delta = delta_calculate( this, a_frame );
+ double delta = delta_calculate( this, a_frame, frame_position );
// Calculate the region now
composite_calculate( this, &result, a_frame, position + delta / 2 );
// Get the transition from the a frame
mlt_transition this = mlt_frame_pop_service( a_frame );
- // This compositer is yuv422 only
- *format = mlt_image_yuv422;
-
- // Get the image from the a frame
- mlt_frame_get_image( a_frame, image, format, width, height, 1 );
+ // Get in and out
+ double position = mlt_deque_pop_back_double( MLT_FRAME_IMAGE_STACK( a_frame ) );
+ int out = mlt_frame_pop_service_int( a_frame );
+ int in = mlt_frame_pop_service_int( a_frame );
// Get the properties from the transition
mlt_properties properties = MLT_TRANSITION_PROPERTIES( this );
+ // TODO: clean up always_active behaviour
+ if ( mlt_properties_get_int( properties, "always_active" ) )
+ {
+ mlt_events_block( properties, properties );
+ mlt_properties_set_int( properties, "in", in );
+ mlt_properties_set_int( properties, "out", out );
+ mlt_events_unblock( properties, properties );
+ }
+
+ // This compositer is yuv422 only
+ *format = mlt_image_yuv422;
+
if ( b_frame != NULL )
{
// Get the properties of the a frame
struct geometry_s result;
// Calculate the position
- float position = mlt_properties_get_double( b_props, "relative_position" );
- float delta = delta_calculate( this, a_frame );
+ double delta = delta_calculate( this, a_frame, position );
// Get the image from the b frame
uint8_t *image_b = NULL;
int width_b = *width;
int height_b = *height;
+ // Composites always need scaling... defaulting to lowest
+ char *rescale = mlt_properties_get( a_props, "rescale.interp" );
+ if ( rescale == NULL || !strcmp( rescale, "none" ) )
+ rescale = "nearest";
+ mlt_properties_set( a_props, "rescale.interp", rescale );
+ mlt_properties_set( b_props, "rescale.interp", rescale );
+
// Do the calculation
composite_calculate( this, &result, a_frame, position );
+ // Since we are the consumer of the b_frame, we must pass along these
+ // consumer properties from the a_frame
+ mlt_properties_set_double( b_props, "consumer_deinterlace", mlt_properties_get_double( a_props, "consumer_deinterlace" ) );
+ mlt_properties_set_double( b_props, "consumer_aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) );
+ mlt_properties_set_int( b_props, "normalised_width", mlt_properties_get_double( a_props, "normalised_width" ) );
+ mlt_properties_set_int( b_props, "normalised_height", mlt_properties_get_double( a_props, "normalised_height" ) );
+
+ // TODO: Dangerous/temporary optimisation - if nothing to do, then do nothing
+ if ( mlt_properties_get_int( properties, "no_alpha" ) &&
+ result.item.x == 0 && result.item.y == 0 && result.item.w == *width && result.item.h == *height && result.item.mix == 100 )
+ {
+ mlt_frame_get_image( b_frame, image, format, width, height, 1 );
+ if ( !mlt_frame_is_test_card( a_frame ) )
+ mlt_frame_replace_image( a_frame, *image, *format, *width, *height );
+ return 0;
+ }
+
+ if ( a_frame == b_frame )
+ get_b_frame_image( this, b_frame, &image_b, &width_b, &height_b, &result );
+
+ // Get the image from the a frame
+ mlt_frame_get_image( a_frame, image, format, width, height, 1 );
+
// Optimisation - no compositing required
if ( result.item.mix == 0 || ( result.item.w == 0 && result.item.h == 0 ) )
return 0;
mlt_properties_set_int( b_props, "dest_height", mlt_properties_get_int( a_props, "dest_height" ) );
}
- // Since we are the consumer of the b_frame, we must pass along these
- // consumer properties from the a_frame
- mlt_properties_set_double( b_props, "consumer_deinterlace", mlt_properties_get_double( a_props, "consumer_deinterlace" ) );
- mlt_properties_set_double( b_props, "consumer_aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) );
- mlt_properties_set_int( b_props, "normalised_width", mlt_properties_get_double( a_props, "normalised_width" ) );
- mlt_properties_set_int( b_props, "normalised_height", mlt_properties_get_double( a_props, "normalised_height" ) );
-
// Special case for titling...
if ( mlt_properties_get_int( properties, "titles" ) )
{
height_b = mlt_properties_get_int( a_props, "dest_height" );
}
- if ( get_b_frame_image( this, b_frame, &image_b, &width_b, &height_b, &result ) == 0 )
+ if ( image_b != NULL || get_b_frame_image( this, b_frame, &image_b, &width_b, &height_b, &result ) == 0 )
{
uint8_t *dest = *image;
uint8_t *src = image_b;
- uint8_t *alpha = mlt_frame_get_alpha_mask( b_frame );
+ uint8_t *alpha_b = mlt_frame_get_alpha_mask( b_frame );
+ uint8_t *alpha_a = mlt_frame_get_alpha_mask( a_frame );
int progressive =
mlt_properties_get_int( a_props, "consumer_deinterlace" ) ||
mlt_properties_get_int( properties, "progressive" );
int32_t luma_softness = mlt_properties_get_double( properties, "softness" ) * ( 1 << 16 );
uint16_t *luma_bitmap = get_luma( properties, width_b, height_b );
- //composite_line_fn line_fn = mlt_properties_get_int( properties, "_MMX" ) ? composite_line_yuv_mmx : NULL;
- composite_line_fn line_fn = NULL;
+ composite_line_fn line_fn = composite_line_yuv;
+
+ if ( mlt_properties_get_int( properties, "or" ) )
+ line_fn = composite_line_yuv_or;
+ if ( mlt_properties_get_int( properties, "and" ) )
+ line_fn = composite_line_yuv_and;
+ if ( mlt_properties_get_int( properties, "xor" ) )
+ line_fn = composite_line_yuv_xor;
+
+ if ( mlt_properties_get( properties, "alpha_a" ) )
+ memset( alpha_a, mlt_properties_get_int( properties, "alpha_a" ), *width * *height );
+
+ if ( mlt_properties_get( properties, "alpha_b" ) )
+ memset( alpha_b, mlt_properties_get_int( properties, "alpha_b" ), width_b * height_b );
for ( field = 0; field < ( progressive ? 1 : 2 ); field++ )
{
// Assume lower field (0) first
- float field_position = position + field * delta;
+ double field_position = position + field * delta;
// Do the calculation if we need to
composite_calculate( this, &result, a_frame, field_position );
alignment_calculate( &result );
// Composite the b_frame on the a_frame
- composite_yuv( dest, *width, *height, src, width_b, height_b, alpha, result, progressive ? -1 : field, luma_bitmap, luma_softness, line_fn );
+ composite_yuv( dest, *width, *height, src, width_b, height_b, alpha_b, alpha_a, result, progressive ? -1 : field, luma_bitmap, luma_softness, line_fn );
}
}
}
+ else
+ {
+ mlt_frame_get_image( a_frame, image, format, width, height, 1 );
+ }
return 0;
}
static mlt_frame composite_process( mlt_transition this, 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( this ), "_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 ) );
-
- // Propogate the transition properties to the b frame
- mlt_properties_set_double( MLT_FRAME_PROPERTIES( b_frame ), "relative_position", position_calculate( this, mlt_frame_get_position( a_frame ) ) );
+ // UGH - this is a TODO - find a more reliable means of obtaining in/out for the always_active case
+ if ( mlt_properties_get_int( MLT_TRANSITION_PROPERTIES( this ), "always_active" ) == 0 )
+ {
+ mlt_frame_push_service_int( a_frame, mlt_properties_get_int( MLT_TRANSITION_PROPERTIES( this ), "in" ) );
+ mlt_frame_push_service_int( a_frame, mlt_properties_get_int( MLT_TRANSITION_PROPERTIES( this ), "out" ) );
+ mlt_deque_push_back_double( MLT_FRAME_IMAGE_STACK( a_frame ), position_calculate( this, mlt_frame_get_position( a_frame ) ) );
+ }
+ else
+ {
+ mlt_properties props = mlt_properties_get_data( MLT_FRAME_PROPERTIES( b_frame ), "_producer", NULL );
+ mlt_frame_push_service_int( a_frame, mlt_properties_get_int( props, "in" ) );
+ mlt_frame_push_service_int( a_frame, mlt_properties_get_int( props, "out" ) );
+ mlt_deque_push_back_double( MLT_FRAME_IMAGE_STACK( a_frame ), mlt_properties_get_int( props, "_frame" ) - mlt_properties_get_int( props, "in" ) );
+ }
mlt_frame_push_service( a_frame, this );
mlt_frame_push_frame( a_frame, b_frame );
// Default factory
mlt_properties_set( properties, "factory", "fezzik" );
+ // Inform apps and framework that this is a video only transition
+ mlt_properties_set_int( properties, "_transition_type", 1 );
+
#ifdef USE_MMX
//mlt_properties_set_int( properties, "_MMX", composite_have_mmx() );
#endif
projects / mlt / blobdiff