Minor mods to playout via avformat and miracle unit generation on an xfer

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@680 d19143bc-622f-0410-bfdd-b5b2a6649095

diff --git a/src/miracle/miracle_unit.c b/src/miracle/miracle_unit.c
index 6158b82..370eb11 100644 (file)
--- a/src/miracle/miracle_unit.c
+++ b/src/miracle/miracle_unit.c
@@ -464,6 +464,8 @@ int miracle_unit_transfer( miracle_unit dest_unit, miracle_unit src_unit )
                        mlt_playlist_append_io( dest_playlist, info.producer, info.frame_in, info.frame_out );
        }
 
+       update_generation( dest_unit );
+
        mlt_playlist_close( tmp_playlist );
 
        return 0;

diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c
index f5a7cc2..e5a4ddd 100644 (file)
--- a/src/modules/avformat/consumer_avformat.c
+++ b/src/modules/avformat/consumer_avformat.c
@@ -778,6 +778,9 @@ static void *consumer_thread( void *arg )
                                        mlt_properties_set_data( properties, "sample_fifo", fifo, 0, ( mlt_destructor )sample_fifo_close, NULL );
                                }
 
+                               if ( mlt_properties_get_double( frame_properties, "_speed" ) != 1.0 )
+                                       memset( pcm, 0, samples * channels * 2 );
+
                                // Append the samples
                                sample_fifo_append( fifo, pcm, samples * channels );
                                total_time += ( samples * 1000000 ) / frequency;
@@ -928,7 +931,7 @@ static void *consumer_thread( void *arg )
                        }
                }
 
-               if ( real_time_output && frames % 25 == 0 )
+               if ( real_time_output && frames % 12 == 0 )
                {
                        long passed = time_difference( &ante );
                        if ( fifo != NULL )