mlt_position out = mlt_transition_get_out( this );
// Get the position of the frame
- mlt_position position = mlt_frame_get_position( 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 );
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_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 );
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;
limit = p_dest + height_src * width_src * 2;
// image processing functions
-static inline uint32_t smoothstep( int32_t edge1, int32_t edge2, uint32_t a )
+static inline int32_t smoothstep( int32_t edge1, int32_t edge2, uint32_t a )
{
if ( a < edge1 )
return 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_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 );
+ // 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;
int32_t i_softness = softness * ( 1 << 16 );
- int field_count = field_order <= 0 ? 1 : 2;
+ 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;
// composite using luma map
{
p_row = p_src + field * stride_src;
q_row = p_dest + field * stride_dest;
- y_offset = ( field * luma_width ) << 16;
+ y_offset = field << 16;
i = field;
while ( i < height_src )
static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
{
+ // 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 a frame
mlt_properties a_props = mlt_frame_properties( a_frame );
- // Get the b frame from the stack
- mlt_frame b_frame = mlt_frame_pop_frame( a_frame );
-
// Get the properties of the b frame
mlt_properties b_props = mlt_frame_properties( b_frame );
uint8_t *luma_image;
mlt_image_format luma_format = mlt_image_yuv422;
- // Request a luma image the size of transition image request
- luma_width = *width;
- luma_height = *height;
-
// Get image from the luma producer
+ mlt_properties_set( mlt_frame_properties( luma_frame ), "rescale.interp", "none" );
mlt_frame_get_image( luma_frame, &luma_image, &luma_format, &luma_width, &luma_height, 0 );
// Generate the luma map
float frame_delta = delta_calculate( transition, a_frame );
float luma_softness = mlt_properties_get_double( properties, "softness" );
- int progressive = mlt_properties_get_int( b_props, "progressive" ) ||
- mlt_properties_get_int( a_props, "consumer_progressive" ) ||
+ 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" );
+ if ( mlt_properties_get( a_props, "rescale.interp" ) == NULL )
+ 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
- mlt_properties_set_double( b_props, "consumer_aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) );
- mlt_properties_set_double( b_props, "consumer_scale", mlt_properties_get_double( a_props, "consumer_scale" ) );
+ if ( !strcmp( mlt_properties_get( a_props, "rescale.interp" ), "none" ) )
+ mlt_properties_set_double( b_props, "consumer_aspect_ratio", mlt_properties_get_double( a_props, "aspect_ratio" ) );
+ else
+ 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 )
// Ensure we get scaling on the b_frame
mlt_properties_set( b_props, "rescale.interp", "nearest" );
+ 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( a_frame, b_frame, luma_width, luma_height, luma_bitmap, mix, frame_delta,
// Push the transition on to the frame
mlt_frame_push_service( a_frame, transition );
- // Push the transition method
- mlt_frame_push_get_image( a_frame, transition_get_image );
-
// 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;
}