consumer_avformat.c: set consumer buffer prefill to 1 by default.

[melted] / src / modules / avformat / consumer_avformat.c

diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c
index d908db9..5a24e96 100644 (file)
--- a/src/modules/avformat/consumer_avformat.c
+++ b/src/modules/avformat/consumer_avformat.c
@@ -174,6 +174,7 @@ mlt_consumer consumer_avformat_init( mlt_profile profile, char *arg )
                
                // Default to separate processing threads for producer and consumer with no frame dropping!
                mlt_properties_set_int( properties, "real_time", -1 );
+               mlt_properties_set_int( properties, "prefill", 1 );
 
                // Set up start/stop/terminated callbacks
                this->start = consumer_start;
@@ -520,7 +521,8 @@ static AVStream *add_video_stream( mlt_consumer this, AVFormatContext *oc, int c
                c->height = mlt_properties_get_int( properties, "height" );
                c->time_base.num = mlt_properties_get_int( properties, "frame_rate_den" );
                c->time_base.den = mlt_properties_get_int( properties, "frame_rate_num" );
-               st->time_base = c->time_base;
+               if ( st->time_base.den == 0 )
+                       st->time_base = c->time_base;
                c->pix_fmt = pix_fmt ? avcodec_get_pix_fmt( pix_fmt ) : PIX_FMT_YUV420P;
 
                if ( mlt_properties_get( properties, "aspect" ) )
@@ -867,7 +869,9 @@ static void *consumer_thread( void *arg )
        video_codec_id = fmt->video_codec;
 
        // Check for audio codec overides
-       if ( acodec != NULL )
+       if ( ( acodec && strcmp( "acodec", "none" ) == 0 ) || mlt_properties_get_int( properties, "an" ) )
+               audio_codec_id = CODEC_ID_NONE;
+       else if ( acodec )
        {
                AVCodec *p = avcodec_find_encoder_by_name( acodec );
                if ( p != NULL )
@@ -877,7 +881,9 @@ static void *consumer_thread( void *arg )
        }
 
        // Check for video codec overides
-       if ( vcodec != NULL )
+       if ( ( vcodec && strcmp( "vcodec", "none" ) == 0 ) || mlt_properties_get_int( properties, "vn" ) )
+               video_codec_id = CODEC_ID_NONE;
+       else if ( vcodec )
        {
                AVCodec *p = avcodec_find_encoder_by_name( vcodec );
                if ( p != NULL )
@@ -915,9 +921,9 @@ static void *consumer_thread( void *arg )
        snprintf( oc->filename, sizeof(oc->filename), "%s", filename );
 
        // Add audio and video streams 
-       if ( fmt->video_codec != CODEC_ID_NONE )
+       if ( video_codec_id != CODEC_ID_NONE )
                video_st = add_video_stream( this, oc, video_codec_id );
-       if ( fmt->audio_codec != CODEC_ID_NONE )
+       if ( audio_codec_id != CODEC_ID_NONE )
                audio_st = add_audio_stream( this, oc, audio_codec_id );
 
        // Set the parameters (even though we have none...)