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;
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 )
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" ) ||
+ int progressive =
mlt_properties_get_int( a_props, "consumer_progressive" ) ||
+ 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" );
// 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" ) );
+ 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,