X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ftransition_mix.c;h=b2b3790a4882f72fe4735dbfb6464692ca44d4c8;hb=f4963a6aa07644399b273b5d2b1f9299c9047414;hp=d3bad10c0fc33c471dd3265fa86537c3c5c22b5e;hpb=d33f444d4ef4c7bc4074d07a49eca0ab7d108394;p=melted diff --git a/src/modules/core/transition_mix.c b/src/modules/core/transition_mix.c index d3bad10..b2b3790 100644 --- a/src/modules/core/transition_mix.c +++ b/src/modules/core/transition_mix.c @@ -104,14 +104,17 @@ static mlt_frame transition_process( mlt_transition this, mlt_frame a_frame, mlt mlt_properties_set_double( b_props, "audio.mix", mix ); // Initialise transition previous mix value to prevent an inadvertant jump from 0 - if ( mlt_properties_get( properties, "previous_mix" ) == NULL ) - mlt_properties_set_double( properties, "previous_mix", mlt_properties_get_double( b_props, "audio.mix" ) ); + mlt_position last_position = mlt_properties_get_position( properties, "_last_position" ); + mlt_position current_position = mlt_frame_get_position( b_frame ); + if ( mlt_properties_get( properties, "_previous_mix" ) == NULL + || current_position != last_position + 1 ) + mlt_properties_set_double( properties, "_previous_mix", mix ); // Tell b frame what the previous mix level was - mlt_properties_set_double( b_props, "audio.previous_mix", mlt_properties_get_double( properties, "previous_mix" ) ); + mlt_properties_set_double( b_props, "audio.previous_mix", mlt_properties_get_double( properties, "_previous_mix" ) ); // Save the current mix level for the next iteration - mlt_properties_set_double( properties, "previous_mix", mlt_properties_get_double( b_props, "audio.mix" ) ); + mlt_properties_set_double( properties, "_previous_mix", mlt_properties_get_double( b_props, "audio.mix" ) ); mlt_properties_set_double( b_props, "audio.reverse", mlt_properties_get_double( properties, "reverse" ) ); }