From 5bfcd164082e345a4e7820ccdcabc87bf5461964 Mon Sep 17 00:00:00 2001 From: lilo_booter Date: Mon, 21 Jun 2004 20:45:09 +0000 Subject: [PATCH] consumer avformat fix and silly stuff in lumas git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@334 d19143bc-622f-0410-bfdd-b5b2a6649095 --- src/modules/avformat/consumer_avformat.c | 7 +++++-- src/modules/core/filter_luma.c | 2 +- src/modules/core/transition_luma.c | 3 +++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c index 7532802..1e801ce 100644 --- a/src/modules/avformat/consumer_avformat.c +++ b/src/modules/avformat/consumer_avformat.c @@ -920,8 +920,11 @@ static void *consumer_thread( void *arg ) if ( real_time_output && frames % 25 == 0 ) { long passed = time_difference( &ante ); - long pending = ( ( ( long )sample_fifo_used( fifo ) * 1000 ) / frequency ) * 1000; - passed -= pending; + if ( fifo != NULL ) + { + long pending = ( ( ( long )sample_fifo_used( fifo ) * 1000 ) / frequency ) * 1000; + passed -= pending; + } if ( passed < total_time ) { long total = ( total_time - passed ); diff --git a/src/modules/core/filter_luma.c b/src/modules/core/filter_luma.c index e36ee3a..62277a4 100644 --- a/src/modules/core/filter_luma.c +++ b/src/modules/core/filter_luma.c @@ -52,7 +52,7 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format * { mlt_properties luma_properties = mlt_transition_properties( luma ); mlt_properties_set_int( luma_properties, "in", 0 ); - mlt_properties_set_int( luma_properties, "out", 24 ); + mlt_properties_set_int( luma_properties, "out", out ); mlt_properties_set_int( luma_properties, "reverse", 1 ); mlt_properties_pass( luma_properties, properties, "luma." ); mlt_properties_set_data( properties, "luma", luma, 0, ( mlt_destructor )mlt_transition_close, NULL ); diff --git a/src/modules/core/transition_luma.c b/src/modules/core/transition_luma.c index 0243974..28d89a4 100644 --- a/src/modules/core/transition_luma.c +++ b/src/modules/core/transition_luma.c @@ -469,6 +469,9 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f // 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, -- 1.7.4.4