X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Fconsumer_avformat.c;h=5a24e96ebb73847b1301624dc906fc4edb5d3b06;hb=6107edade91b4c2764aa666c5dff5086c4a77a02;hp=fd8314c0071a1af8bb19b79d9dd31d609bcd119f;hpb=f6d5dd39ab3fef2895d09a63e2324f70c964663c;p=melted diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c index fd8314c..5a24e96 100644 --- a/src/modules/avformat/consumer_avformat.c +++ b/src/modules/avformat/consumer_avformat.c @@ -31,6 +31,7 @@ #include #include #include +#include // avformat header files #include @@ -173,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; @@ -191,9 +193,44 @@ static int consumer_start( mlt_consumer this ) { // Get the properties mlt_properties properties = MLT_CONSUMER_PROPERTIES( this ); + int error = 0; + + // Report information about available muxers and codecs as YAML Tiny + char *s = mlt_properties_get( properties, "f" ); + if ( s && strcmp( s, "list" ) == 0 ) + { + fprintf( stderr, "---\nformats:\n" ); + AVOutputFormat *format = NULL; + while ( ( format = av_oformat_next( format ) ) ) + fprintf( stderr, " - %s\n", format->name ); + fprintf( stderr, "...\n" ); + error = 1; + } + s = mlt_properties_get( properties, "acodec" ); + if ( s && strcmp( s, "list" ) == 0 ) + { + fprintf( stderr, "---\naudio_codecs:\n" ); + AVCodec *codec = NULL; + while ( ( codec = av_codec_next( codec ) ) ) + if ( codec->encode && codec->type == CODEC_TYPE_AUDIO ) + fprintf( stderr, " - %s\n", codec->name ); + fprintf( stderr, "...\n" ); + error = 1; + } + s = mlt_properties_get( properties, "vcodec" ); + if ( s && strcmp( s, "list" ) == 0 ) + { + fprintf( stderr, "---\nvideo_codecs:\n" ); + AVCodec *codec = NULL; + while ( ( codec = av_codec_next( codec ) ) ) + if ( codec->encode && codec->type == CODEC_TYPE_VIDEO ) + fprintf( stderr, " - %s\n", codec->name ); + fprintf( stderr, "...\n" ); + error = 1; + } // Check that we're not already running - if ( !mlt_properties_get_int( properties, "running" ) ) + if ( !error && !mlt_properties_get_int( properties, "running" ) ) { // Allocate a thread pthread_t *thread = calloc( 1, sizeof( pthread_t ) ); @@ -265,7 +302,7 @@ static int consumer_start( mlt_consumer this ) // Create the thread pthread_create( thread, NULL, consumer_thread, this ); } - return 0; + return error; } /** Stop the consumer. @@ -314,7 +351,9 @@ static void apply_properties( void *obj, mlt_properties properties, int flags ) const char *opt_name = mlt_properties_get_name( properties, i ); const AVOption *opt = av_find_opt( obj, opt_name, NULL, flags, flags ); if ( opt != NULL ) -#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(59<<8)+0) +#if LIBAVCODEC_VERSION_INT >= ((52<<16)+(7<<8)+0) + av_set_string3( obj, opt_name, mlt_properties_get( properties, opt_name), 0, NULL ); +#elif LIBAVCODEC_VERSION_INT >= ((51<<16)+(59<<8)+0) av_set_string2( obj, opt_name, mlt_properties_get( properties, opt_name), 0 ); #else av_set_string( obj, opt_name, mlt_properties_get( properties, opt_name) ); @@ -482,51 +521,11 @@ 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" ); + 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 ( codec_id == CODEC_ID_DVVIDEO ) - { - // Compensate for FFmpeg's notion of DV aspect ratios, which are - // based upon a width of 704. Since we do not have a normaliser - // that crops (nor is cropping 720 wide ITU-R 601 video always desirable) - // we just coerce the values to facilitate a passive behaviour through - // the rescale normaliser when using equivalent producers and consumers. - // = display_aspect / (width * height) - double ar = mlt_properties_get_double( properties, "aspect_ratio" ); - if ( ar == 8.0/9.0 ) // 4:3 NTSC - { - c->sample_aspect_ratio.num = 10; - c->sample_aspect_ratio.den = 11; -#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(21<<8)+0) - st->sample_aspect_ratio = c->sample_aspect_ratio; -#endif - } - else if ( ar == 16.0/15.0 ) // 4:3 PAL - { - c->sample_aspect_ratio.num = 159; - c->sample_aspect_ratio.den = 54; -#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(21<<8)+0) - st->sample_aspect_ratio = c->sample_aspect_ratio; -#endif - } - else if ( ar == 32.0/27.0 ) // 16:9 NTSC - { - c->sample_aspect_ratio.num = 40; - c->sample_aspect_ratio.den = 33; -#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(21<<8)+0) - st->sample_aspect_ratio = c->sample_aspect_ratio; -#endif - } - else // 16:9 PAL - { - c->sample_aspect_ratio.num = 118; - c->sample_aspect_ratio.den = 81; -#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(21<<8)+0) - st->sample_aspect_ratio = c->sample_aspect_ratio; -#endif - } - } - else if ( mlt_properties_get( properties, "aspect" ) ) + if ( mlt_properties_get( properties, "aspect" ) ) { // "-aspect" on ffmpeg command line is display aspect ratio double ar = mlt_properties_get_double( properties, "aspect" ); @@ -547,9 +546,6 @@ static AVStream *add_video_stream( mlt_consumer this, AVFormatContext *oc, int c // Now compute the sample aspect ratio rational = av_d2q( ar * c->height / c->width, 255 ); c->sample_aspect_ratio = rational; -#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(21<<8)+0) - st->sample_aspect_ratio = c->sample_aspect_ratio; -#endif // Update the profile and properties as well since this is an alias // for mlt properties that correspond to profile settings mlt_properties_set_int( properties, "sample_aspect_num", rational.num ); @@ -560,16 +556,15 @@ static AVStream *add_video_stream( mlt_consumer this, AVFormatContext *oc, int c profile->sample_aspect_den = rational.den; mlt_properties_set_double( properties, "aspect_ratio", mlt_profile_sar( profile ) ); } - } else { c->sample_aspect_ratio.num = mlt_properties_get_int( properties, "sample_aspect_num" ); c->sample_aspect_ratio.den = mlt_properties_get_int( properties, "sample_aspect_den" ); + } #if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(21<<8)+0) - st->sample_aspect_ratio = c->sample_aspect_ratio; + st->sample_aspect_ratio = c->sample_aspect_ratio; #endif - } if ( mlt_properties_get_double( properties, "qscale" ) > 0 ) { @@ -639,7 +634,7 @@ static AVStream *add_video_stream( mlt_consumer this, AVFormatContext *oc, int c c->flags |= CODEC_FLAG_PASS1; else if ( i == 2 ) c->flags |= CODEC_FLAG_PASS2; - if ( c->flags & ( CODEC_FLAG_PASS1 | CODEC_FLAG_PASS2 ) ) + if ( codec_id != CODEC_ID_H264 && ( c->flags & ( CODEC_FLAG_PASS1 | CODEC_FLAG_PASS2 ) ) ) { char logfilename[1024]; FILE *f; @@ -666,6 +661,7 @@ static AVStream *add_video_stream( mlt_consumer this, AVFormatContext *oc, int c } else { + mlt_properties_set( properties, "_logfilename", logfilename ); fseek( f, 0, SEEK_END ); size = ftell( f ); fseek( f, 0, SEEK_SET ); @@ -873,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 ) @@ -883,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 ) @@ -921,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...) @@ -1324,6 +1324,28 @@ static void *consumer_thread( void *arg ) mlt_consumer_stopped( this ); + if ( mlt_properties_get_int( properties, "pass" ) == 2 ) + { + // Remove the dual pass log file + if ( mlt_properties_get( properties, "_logfilename" ) ) + remove( mlt_properties_get( properties, "_logfilename" ) ); + + // Remove the x264 dual pass logs + char *cwd = getcwd( NULL, 0 ); + char *file = "x264_2pass.log"; + char *full = malloc( strlen( cwd ) + strlen( file ) + 2 ); + sprintf( full, "%s/%s", cwd, file ); + remove( full ); + free( full ); + file = "x264_2pass.log.temp"; + full = malloc( strlen( cwd ) + strlen( file ) + 2 ); + sprintf( full, "%s/%s", cwd, file ); + remove( full ); + free( full ); + free( cwd ); + remove( "x264_2pass.log.temp" ); + } + return NULL; }