From 41fffb7a1b11ad7dc05236043108d8edab1f6b91 Mon Sep 17 00:00:00 2001 From: lilo_booter Date: Thu, 23 Feb 2006 09:29:54 +0000 Subject: [PATCH] + Alternative mixing mechanism introduced (specify a property of combine=1 on the mix transition to activate) git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@889 d19143bc-622f-0410-bfdd-b5b2a6649095 --- src/modules/core/transition_mix.c | 31 +++++++++++++++++++++---------- 1 files changed, 21 insertions(+), 10 deletions(-) diff --git a/src/modules/core/transition_mix.c b/src/modules/core/transition_mix.c index ce0d06f..a9bef5c 100644 --- a/src/modules/core/transition_mix.c +++ b/src/modules/core/transition_mix.c @@ -33,21 +33,31 @@ static int transition_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_fo // Get the b frame from the stack mlt_frame b_frame = mlt_frame_pop_audio( frame ); + // Get the effect + mlt_transition effect = mlt_frame_pop_audio( frame ); + // Get the properties of the b frame mlt_properties b_props = MLT_FRAME_PROPERTIES( b_frame ); - double mix_start = 0.5, mix_end = 0.5; - if ( mlt_properties_get( b_props, "audio.previous_mix" ) != NULL ) - mix_start = mlt_properties_get_double( b_props, "audio.previous_mix" ); - if ( mlt_properties_get( b_props, "audio.mix" ) != NULL ) - mix_end = mlt_properties_get_double( b_props, "audio.mix" ); - if ( mlt_properties_get_int( b_props, "audio.reverse" ) ) + if ( mlt_properties_get_int( MLT_TRANSITION_PROPERTIES( effect ), "combine" ) == 0 ) { - mix_start = 1 - mix_start; - mix_end = 1 - mix_end; - } + double mix_start = 0.5, mix_end = 0.5; + if ( mlt_properties_get( b_props, "audio.previous_mix" ) != NULL ) + mix_start = mlt_properties_get_double( b_props, "audio.previous_mix" ); + if ( mlt_properties_get( b_props, "audio.mix" ) != NULL ) + mix_end = mlt_properties_get_double( b_props, "audio.mix" ); + if ( mlt_properties_get_int( b_props, "audio.reverse" ) ) + { + mix_start = 1 - mix_start; + mix_end = 1 - mix_end; + } - mlt_frame_mix_audio( frame, b_frame, mix_start, mix_end, buffer, format, frequency, channels, samples ); + mlt_frame_mix_audio( frame, b_frame, mix_start, mix_end, buffer, format, frequency, channels, samples ); + } + else + { + mlt_frame_combine_audio( frame, b_frame, buffer, format, frequency, channels, samples ); + } return 0; } @@ -130,6 +140,7 @@ static mlt_frame transition_process( mlt_transition this, mlt_frame a_frame, mlt } // Override the get_audio method + mlt_frame_push_audio( a_frame, this ); mlt_frame_push_audio( a_frame, b_frame ); mlt_frame_push_audio( a_frame, transition_get_audio ); -- 1.7.4.4