{
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 );
for ( j = 0; j < width_src; j ++ )
{
a = ( alpha == NULL ) ? 255 : *alpha ++;
- mix = ( luma == NULL ) ? weight : linearstep( luma[ j ], luma[ j ] + softness, weight );
- mix = ( mix * ( a + 1 ) ) >> 8;
+ 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;
*/
static inline void
-scale_luma ( uint16_t *dest_buf, int dest_width, int dest_height, const uint16_t *src_buf, int src_width, int src_height )
+scale_luma ( uint16_t *dest_buf, int dest_width, int dest_height, const uint16_t *src_buf, int src_width, int src_height, int invert )
{
register int i, j;
register int x_step = ( src_width << 16 ) / dest_width;
for ( j = 0; j < dest_width; j++ )
{
- *dest_buf++ = src[ x >> 16 ];
+ *dest_buf++ = src[ x >> 16 ] ^ invert;
x += x_step;
}
y += y_step;
int luma_width = mlt_properties_get_int( properties, "_luma.width" );
int luma_height = mlt_properties_get_int( properties, "_luma.height" );
uint16_t *luma_bitmap = mlt_properties_get_data( properties, "_luma.bitmap", NULL );
+ int invert = mlt_properties_get_int( properties, "luma_invert" );
// If the filename property changed, reload the map
char *resource = mlt_properties_get( properties, "luma" );
}
// Scale luma map
luma_bitmap = mlt_pool_alloc( width * height * sizeof( uint16_t ) );
- scale_luma( luma_bitmap, width, height, orig_bitmap, luma_width, luma_height );
+ scale_luma( luma_bitmap, width, height, orig_bitmap, luma_width, luma_height, invert * ( ( 1 << 16 ) - 1 ) );
// Remember the scaled luma size to prevent unnecessary scaling
mlt_properties_set_int( properties, "_luma.width", width );
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;
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 );
}
// 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
+ 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
// 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;
+ }
+
+ // 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" ) )
{
if ( mlt_properties_get_int( properties, "titles" ) )
{
- result.nw = result.item.w = *width;
- result.nh = result.item.h = *height;
+ result.item.w = *width * ( result.item.w / result.nw );
+ result.nw = result.item.w;
+ result.item.h = *height * ( result.item.h / result.nh );
+ result.nh = *height;
result.sw = width_b;
result.sh = height_b;
}
}
}
}
+ else
+ {
+ mlt_frame_get_image( a_frame, image, format, width, height, 1 );
+ }
return 0;
}
// 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 ) );
+ // 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" ) );
+
+ // 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 ) ) );
+ }
+ 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_properties_set_int( MLT_FRAME_PROPERTIES( b_frame ), "relative_position", mlt_properties_get_int( props, "_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 ) ) );
+ // Assign the current position to the name
+ mlt_properties_set_position( MLT_FRAME_PROPERTIES( a_frame ), name, mlt_properties_get_position( MLT_FRAME_PROPERTIES( b_frame ), "relative_position" ) );
+ }
mlt_frame_push_service( a_frame, this );
mlt_frame_push_frame( a_frame, b_frame );
this->process = composite_process;
// Default starting motion and zoom
- mlt_properties_set( properties, "start", arg != NULL ? arg : "85%,5%:10%x10%" );
+ mlt_properties_set( properties, "start", arg != NULL ? arg : "0,0:100%x100%" );
// 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 / melted / blobdiff