X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Fconsumer_avformat.c;h=8776de886f43e90288b7725cf082865f1456a6fa;hb=70cf289632d6f1a1d3f67dc1978489bef2e6abb0;hp=179815cd3def5aee5dc0fad8aa010811de7c5437;hpb=3d3561b875207ecc61d673b1903436a51430b6d2;p=mlt diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c index 179815cd..8776de88 100644 --- a/src/modules/avformat/consumer_avformat.c +++ b/src/modules/avformat/consumer_avformat.c @@ -1,7 +1,8 @@ /* * consumer_avformat.c -- an encoder based on avformat - * Copyright (C) 2003-2004 Ushodaya Enterprises Limited + * Copyright (C) 2003-2012 Ushodaya Enterprises Limited * Author: Charles Yates + * Author: Dan Dennedy * Much code borrowed from ffmpeg.c: Copyright (c) 2000-2003 Fabrice Bellard * * This library is free software; you can redistribute it and/or @@ -38,17 +39,10 @@ // avformat header files #include #include -#ifdef SWSCALE #include -#endif -#if LIBAVUTIL_VERSION_INT >= ((50<<16)+(8<<8)+0) #include -#endif - -#if LIBAVUTIL_VERSION_INT < (50<<16) -#define PIX_FMT_RGB32 PIX_FMT_RGBA32 -#define PIX_FMT_YUYV422 PIX_FMT_YUV422 -#endif +#include +#include #if LIBAVCODEC_VERSION_MAJOR >= 53 #include @@ -59,21 +53,31 @@ #include #endif +#if LIBAVCODEC_VERSION_MAJOR < 55 +#define AV_CODEC_ID_PCM_S16LE CODEC_ID_PCM_S16LE +#define AV_CODEC_ID_PCM_S16BE CODEC_ID_PCM_S16BE +#define AV_CODEC_ID_PCM_U16LE CODEC_ID_PCM_U16LE +#define AV_CODEC_ID_PCM_U16BE CODEC_ID_PCM_U16BE +#define AV_CODEC_ID_H264 CODEC_ID_H264 +#define AV_CODEC_ID_NONE CODEC_ID_NONE +#define AV_CODEC_ID_AC3 CODEC_ID_AC3 +#define AV_CODEC_ID_VORBIS CODEC_ID_VORBIS +#define AV_CODEC_ID_RAWVIDEO CODEC_ID_RAWVIDEO +#define AV_CODEC_ID_MJPEG CODEC_ID_MJPEG +#endif + #define MAX_AUDIO_STREAMS (8) #define AUDIO_ENCODE_BUFFER_SIZE (48000 * 2 * MAX_AUDIO_STREAMS) #define AUDIO_BUFFER_SIZE (1024 * 42) #define VIDEO_BUFFER_SIZE (2048 * 1024) -void avformat_lock( ); -void avformat_unlock( ); - // // This structure should be extended and made globally available in mlt // typedef struct { - int16_t *buffer; + uint8_t *buffer; int size; int used; double time; @@ -90,42 +94,16 @@ sample_fifo sample_fifo_init( int frequency, int channels ) return fifo; } -// sample_fifo_clear and check are temporarily aborted (not working as intended) - -void sample_fifo_clear( sample_fifo fifo, double time ) -{ - int words = ( float )( time - fifo->time ) * fifo->frequency * fifo->channels; - if ( ( int )( ( float )time * 100 ) < ( int )( ( float )fifo->time * 100 ) && fifo->used > words && words > 0 ) - { - memmove( fifo->buffer, &fifo->buffer[ words ], ( fifo->used - words ) * sizeof( int16_t ) ); - fifo->used -= words; - fifo->time = time; - } - else if ( ( int )( ( float )time * 100 ) != ( int )( ( float )fifo->time * 100 ) ) - { - fifo->used = 0; - fifo->time = time; - } -} - -void sample_fifo_check( sample_fifo fifo, double time ) -{ - if ( fifo->used == 0 ) - { - if ( ( int )( ( float )time * 100 ) < ( int )( ( float )fifo->time * 100 ) ) - fifo->time = time; - } -} - -void sample_fifo_append( sample_fifo fifo, int16_t *samples, int count ) +// count is the number of samples multiplied by the number of bytes per sample +void sample_fifo_append( sample_fifo fifo, uint8_t *samples, int count ) { if ( ( fifo->size - fifo->used ) < count ) { fifo->size += count * 5; - fifo->buffer = realloc( fifo->buffer, fifo->size * sizeof( int16_t ) ); + fifo->buffer = realloc( fifo->buffer, fifo->size ); } - memcpy( &fifo->buffer[ fifo->used ], samples, count * sizeof( int16_t ) ); + memcpy( &fifo->buffer[ fifo->used ], samples, count ); fifo->used += count; } @@ -134,14 +112,14 @@ int sample_fifo_used( sample_fifo fifo ) return fifo->used; } -int sample_fifo_fetch( sample_fifo fifo, int16_t *samples, int count ) +int sample_fifo_fetch( sample_fifo fifo, uint8_t *samples, int count ) { if ( count > fifo->used ) count = fifo->used; - memcpy( samples, fifo->buffer, count * sizeof( int16_t ) ); + memcpy( samples, fifo->buffer, count ); fifo->used -= count; - memmove( fifo->buffer, &fifo->buffer[ count ], fifo->used * sizeof( int16_t ) ); + memmove( fifo->buffer, &fifo->buffer[ count ], fifo->used ); fifo->time += ( double )count / fifo->channels / fifo->frequency; @@ -155,6 +133,7 @@ void sample_fifo_close( sample_fifo fifo ) } // Forward references. +static void property_changed( mlt_properties owner, mlt_consumer self, char *name ); static int consumer_start( mlt_consumer consumer ); static int consumer_stop( mlt_consumer consumer ); static int consumer_is_stopped( mlt_consumer consumer ); @@ -209,12 +188,79 @@ mlt_consumer consumer_avformat_init( mlt_profile profile, char *arg ) consumer->is_stopped = consumer_is_stopped; mlt_events_register( properties, "consumer-fatal-error", NULL ); + mlt_event event = mlt_events_listen( properties, consumer, "property-changed", ( mlt_listener )property_changed ); + mlt_properties_set_data( properties, "property-changed event", event, 0, NULL, NULL ); } // Return consumer return consumer; } +static void recompute_aspect_ratio( mlt_properties properties ) +{ + double ar = mlt_properties_get_double( properties, "aspect" ); + AVRational rational = av_d2q( ar, 255 ); + int width = mlt_properties_get_int( properties, "width" ); + int height = mlt_properties_get_int( properties, "height" ); + + // 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, "display_aspect_num", rational.num ); + mlt_properties_set_int( properties, "display_aspect_den", rational.den ); + + // Now compute the sample aspect ratio + rational = av_d2q( ar * height / FFMAX(width, 1), 255 ); + + // 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 ); + mlt_properties_set_int( properties, "sample_aspect_den", rational.den ); +} + +static void property_changed( mlt_properties owner, mlt_consumer self, char *name ) +{ + mlt_properties properties = MLT_CONSUMER_PROPERTIES( self ); + + if ( !strcmp( name, "s" ) ) + { + // Obtain the size property + char *size = mlt_properties_get( properties, "s" ); + int width = mlt_properties_get_int( properties, "width" ); + int height = mlt_properties_get_int( properties, "height" ); + int tw, th; + + if ( sscanf( size, "%dx%d", &tw, &th ) == 2 && tw > 0 && th > 0 ) + { + width = tw; + height = th; + } + else + { + mlt_log_warning( MLT_CONSUMER_SERVICE(self), "Invalid size property %s - ignoring.\n", size ); + } + + // Now ensure we honour the multiple of two requested by libavformat + width = ( width / 2 ) * 2; + height = ( height / 2 ) * 2; + mlt_properties_set_int( properties, "width", width ); + mlt_properties_set_int( properties, "height", height ); + recompute_aspect_ratio( properties ); + } + // "-aspect" on ffmpeg command line is display aspect ratio + else if ( !strcmp( name, "aspect" ) || !strcmp( name, "width" ) || !strcmp( name, "height" ) ) + { + recompute_aspect_ratio( properties ); + } + // Handle the ffmpeg command line "-r" property for frame rate + else if ( !strcmp( name, "r" ) ) + { + double frame_rate = mlt_properties_get_double( properties, "r" ); + AVRational rational = av_d2q( frame_rate, 255 ); + mlt_properties_set_int( properties, "frame_rate_num", rational.num ); + mlt_properties_set_int( properties, "frame_rate_den", rational.den ); + } +} + /** Start the consumer. */ @@ -240,7 +286,9 @@ static int consumer_start( mlt_consumer consumer ) snprintf( key, sizeof(key), "%d", mlt_properties_count( formats ) ); mlt_properties_set( formats, key, format->name ); } - fprintf( stdout, "%s", mlt_properties_serialise_yaml( doc ) ); + s = mlt_properties_serialise_yaml( doc ); + fprintf( stdout, "%s", s ); + free( s ); mlt_properties_close( doc ); error = 1; } @@ -255,12 +303,20 @@ static int consumer_start( mlt_consumer consumer ) mlt_properties_set_data( properties, "acodec", codecs, 0, (mlt_destructor) mlt_properties_close, NULL ); mlt_properties_set_data( doc, "audio_codecs", codecs, 0, NULL, NULL ); while ( ( codec = av_codec_next( codec ) ) ) +#if (defined(FFUDIV) && LIBAVCODEC_VERSION_INT >= ((54<<16)+(56<<8)+100)) || (LIBAVCODEC_VERSION_INT >= ((54<<16)+(27<<8)+0)) + if ( codec->encode2 && codec->type == CODEC_TYPE_AUDIO ) +#elif LIBAVCODEC_VERSION_INT >= ((54<<16)+(0<<8)+0) + if ( ( codec->encode || codec->encode2 ) && codec->type == CODEC_TYPE_AUDIO ) +#else if ( codec->encode && codec->type == CODEC_TYPE_AUDIO ) +#endif { snprintf( key, sizeof(key), "%d", mlt_properties_count( codecs ) ); mlt_properties_set( codecs, key, codec->name ); } - fprintf( stdout, "%s", mlt_properties_serialise_yaml( doc ) ); + s = mlt_properties_serialise_yaml( doc ); + fprintf( stdout, "%s", s ); + free( s ); mlt_properties_close( doc ); error = 1; } @@ -275,12 +331,20 @@ static int consumer_start( mlt_consumer consumer ) mlt_properties_set_data( properties, "vcodec", codecs, 0, (mlt_destructor) mlt_properties_close, NULL ); mlt_properties_set_data( doc, "video_codecs", codecs, 0, NULL, NULL ); while ( ( codec = av_codec_next( codec ) ) ) +#if (defined(FFUDIV) && LIBAVCODEC_VERSION_INT >= ((54<<16)+(56<<8)+100)) || (LIBAVCODEC_VERSION_INT >= ((54<<16)+(27<<8)+0)) + if ( codec->encode2 && codec->type == CODEC_TYPE_VIDEO ) +#elif LIBAVCODEC_VERSION_INT >= ((54<<16)+(0<<8)+0) + if ( (codec->encode || codec->encode2) && codec->type == CODEC_TYPE_VIDEO ) +#else if ( codec->encode && codec->type == CODEC_TYPE_VIDEO ) +#endif { snprintf( key, sizeof(key), "%d", mlt_properties_count( codecs ) ); mlt_properties_set( codecs, key, codec->name ); } - fprintf( stdout, "%s", mlt_properties_serialise_yaml( doc ) ); + s = mlt_properties_serialise_yaml( doc ); + fprintf( stdout, "%s", s ); + free( s ); mlt_properties_close( doc ); error = 1; } @@ -291,58 +355,8 @@ static int consumer_start( mlt_consumer consumer ) // Allocate a thread pthread_t *thread = calloc( 1, sizeof( pthread_t ) ); - // Get the width and height - int width = mlt_properties_get_int( properties, "width" ); - int height = mlt_properties_get_int( properties, "height" ); - - // Obtain the size property - char *size = mlt_properties_get( properties, "s" ); + mlt_event_block( mlt_properties_get_data( properties, "property-changed event", NULL ) ); - // Interpret it - if ( size != NULL ) - { - int tw, th; - if ( sscanf( size, "%dx%d", &tw, &th ) == 2 && tw > 0 && th > 0 ) - { - width = tw; - height = th; - } - else - { - mlt_log_warning( MLT_CONSUMER_SERVICE( consumer ), "Invalid size property %s - ignoring.\n", size ); - } - } - - // Now ensure we honour the multiple of two requested by libavformat - width = ( width / 2 ) * 2; - height = ( height / 2 ) * 2; - mlt_properties_set_int( properties, "width", width ); - mlt_properties_set_int( properties, "height", height ); - - // We need to set these on the profile as well because the s property is - // an alias to mlt properties that correspond to profile settings. - mlt_profile profile = mlt_service_profile( MLT_CONSUMER_SERVICE( consumer ) ); - if ( profile ) - { - profile->width = width; - profile->height = height; - } - - // Handle the ffmpeg command line "-r" property for frame rate - if ( mlt_properties_get( properties, "r" ) ) - { - double frame_rate = mlt_properties_get_double( properties, "r" ); - AVRational rational = av_d2q( frame_rate, 255 ); - mlt_properties_set_int( properties, "frame_rate_num", rational.num ); - mlt_properties_set_int( properties, "frame_rate_den", rational.den ); - if ( profile ) - { - profile->frame_rate_num = rational.num; - profile->frame_rate_den = rational.den; - mlt_properties_set_double( properties, "fps", mlt_profile_fps( profile ) ); - } - } - // Apply AVOptions that are synonyms for standard mlt_consumer options if ( mlt_properties_get( properties, "ac" ) ) mlt_properties_set_int( properties, "channels", mlt_properties_get_int( properties, "ac" ) ); @@ -352,11 +366,11 @@ static int consumer_start( mlt_consumer consumer ) // Assign the thread to properties mlt_properties_set_data( properties, "thread", thread, sizeof( pthread_t ), free, NULL ); - // Set the running state - mlt_properties_set_int( properties, "running", 1 ); - // Create the thread pthread_create( thread, NULL, consumer_thread, consumer ); + + // Set the running state + mlt_properties_set_int( properties, "running", 1 ); } return error; } @@ -368,18 +382,19 @@ static int consumer_stop( mlt_consumer consumer ) { // Get the properties mlt_properties properties = MLT_CONSUMER_PROPERTIES( consumer ); + pthread_t *thread = mlt_properties_get_data( properties, "thread", NULL ); // Check that we're running - if ( mlt_properties_get_int( properties, "running" ) ) + if ( thread ) { - // Get the thread - pthread_t *thread = mlt_properties_get_data( properties, "thread", NULL ); - // Stop the thread mlt_properties_set_int( properties, "running", 0 ); // Wait for termination pthread_join( *thread, NULL ); + + mlt_properties_set_data( properties, "thread", NULL, 0, NULL, NULL ); + mlt_event_unblock( mlt_properties_get_data( properties, "property-changed event", NULL ) ); } return 0; @@ -402,24 +417,150 @@ static void apply_properties( void *obj, mlt_properties properties, int flags ) { int i; int count = mlt_properties_count( properties ); +#if LIBAVUTIL_VERSION_INT < ((51<<16)+(12<<8)+0) int alloc = 1; +#endif for ( i = 0; i < count; i++ ) { const char *opt_name = mlt_properties_get_name( properties, i ); +#if LIBAVUTIL_VERSION_INT >= ((51<<16)+(10<<8)+0) + const AVOption *opt = av_opt_find( obj, opt_name, NULL, flags, flags ); +#else const AVOption *opt = av_find_opt( obj, opt_name, NULL, flags, flags ); +#endif - if ( opt != NULL ) -#if LIBAVCODEC_VERSION_INT >= ((52<<16)+(7<<8)+0) - av_set_string3( obj, opt_name, mlt_properties_get_value( properties, i), alloc, NULL ); -#elif LIBAVCODEC_VERSION_INT >= ((51<<16)+(59<<8)+0) - av_set_string2( obj, opt_name, mlt_properties_get_value( properties, i), alloc ); + // If option not found, see if it was prefixed with a or v (-vb) + if ( !opt && ( + ( opt_name[0] == 'v' && ( flags & AV_OPT_FLAG_VIDEO_PARAM ) ) || + ( opt_name[0] == 'a' && ( flags & AV_OPT_FLAG_AUDIO_PARAM ) ) ) ) +#if LIBAVUTIL_VERSION_INT >= ((51<<16)+(10<<8)+0) + opt = av_opt_find( obj, ++opt_name, NULL, flags, flags ); +#else + opt = av_find_opt( obj, ++opt_name, NULL, flags, flags ); +#endif + // Apply option if found + if ( opt ) +#if LIBAVUTIL_VERSION_INT >= ((51<<16)+(12<<8)+0) + av_opt_set( obj, opt_name, mlt_properties_get_value( properties, i), 0 ); #else - av_set_string( obj, opt_name, mlt_properties_get_value( properties, i) ); + av_set_string3( obj, opt_name, mlt_properties_get_value( properties, i), alloc, NULL ); +#endif + } +} + +static enum PixelFormat pick_pix_fmt( mlt_image_format img_fmt ) +{ + switch ( img_fmt ) + { + case mlt_image_rgb24: + return PIX_FMT_RGB24; + case mlt_image_rgb24a: + return PIX_FMT_RGBA; + case mlt_image_yuv420p: + return PIX_FMT_YUV420P; + default: + return PIX_FMT_YUYV422; + } +} + +static int get_mlt_audio_format( int av_sample_fmt ) +{ + switch ( av_sample_fmt ) + { + case AV_SAMPLE_FMT_U8: + return mlt_audio_u8; + case AV_SAMPLE_FMT_S32: + return mlt_audio_s32le; + case AV_SAMPLE_FMT_FLT: + return mlt_audio_f32le; +#if LIBAVUTIL_VERSION_INT >= ((51<<16)+(17<<8)+0) + case AV_SAMPLE_FMT_U8P: + return mlt_audio_u8; + case AV_SAMPLE_FMT_S32P: + return mlt_audio_s32le; + case AV_SAMPLE_FMT_FLTP: + return mlt_audio_f32le; #endif + default: + return mlt_audio_s16; } } +static int pick_sample_fmt( mlt_properties properties, AVCodec *codec ) +{ + int sample_fmt = AV_SAMPLE_FMT_S16; + const char *format = mlt_properties_get( properties, "mlt_audio_format" ); + const int *p = codec->sample_fmts; + + // get default av_sample_fmt from mlt_audio_format + if ( format ) + { + if ( !strcmp( format, "s32le" ) ) + sample_fmt = AV_SAMPLE_FMT_S32; + else if ( !strcmp( format, "f32le" ) ) + sample_fmt = AV_SAMPLE_FMT_FLT; + else if ( !strcmp( format, "u8" ) ) + sample_fmt = AV_SAMPLE_FMT_U8; +#if LIBAVUTIL_VERSION_INT >= ((51<<16)+(17<<8)+0) + else if ( !strcmp( format, "s32" ) ) + sample_fmt = AV_SAMPLE_FMT_S32P; + else if ( !strcmp( format, "float" ) ) + sample_fmt = AV_SAMPLE_FMT_FLTP; +#endif + } + // check if codec supports our mlt_audio_format + for ( ; *p != -1; p++ ) + { + if ( *p == sample_fmt ) + return sample_fmt; + } + // no match - pick first one we support + for ( p = codec->sample_fmts; *p != -1; p++ ) + { + switch (*p) + { + case AV_SAMPLE_FMT_U8: + case AV_SAMPLE_FMT_S16: + case AV_SAMPLE_FMT_S32: + case AV_SAMPLE_FMT_FLT: +#if LIBAVUTIL_VERSION_INT >= ((51<<16)+(17<<8)+0) + case AV_SAMPLE_FMT_U8P: + case AV_SAMPLE_FMT_S16P: + case AV_SAMPLE_FMT_S32P: + case AV_SAMPLE_FMT_FLTP: +#endif + return *p; + default: + break; + } + } + mlt_log_error( properties, "audio codec sample_fmt not compatible" ); + + return AV_SAMPLE_FMT_NONE; +} + +static uint8_t* interleaved_to_planar( int samples, int channels, uint8_t* audio, int bytes_per_sample ) +{ + uint8_t *buffer = mlt_pool_alloc( AUDIO_ENCODE_BUFFER_SIZE ); + uint8_t *p = buffer; + int c; + + memset( buffer, 0, AUDIO_ENCODE_BUFFER_SIZE ); + for ( c = 0; c < channels; c++ ) + { + uint8_t *q = audio + c * bytes_per_sample; + int i = samples + 1; + while ( --i ) + { + memcpy( p, q, bytes_per_sample ); + p += bytes_per_sample; + q += channels * bytes_per_sample; + } + } + return buffer; +} + /** Add an audio output stream */ @@ -429,7 +570,11 @@ static AVStream *add_audio_stream( mlt_consumer consumer, AVFormatContext *oc, A mlt_properties properties = MLT_CONSUMER_PROPERTIES( consumer ); // Create a new stream +#if LIBAVFORMAT_VERSION_INT >= ((53<<16)+(10<<8)+0) + AVStream *st = avformat_new_stream( oc, codec ); +#else AVStream *st = av_new_stream( oc, oc->nb_streams ); +#endif // If created, then initialise from properties if ( st != NULL ) @@ -445,7 +590,7 @@ static AVStream *add_audio_stream( mlt_consumer consumer, AVFormatContext *oc, A c->codec_id = codec->id; c->codec_type = CODEC_TYPE_AUDIO; - c->sample_fmt = SAMPLE_FMT_S16; + c->sample_fmt = pick_sample_fmt( properties, codec ); #if 0 // disabled until some audio codecs are multi-threaded // Setup multi-threading @@ -481,10 +626,13 @@ static AVStream *add_audio_stream( mlt_consumer consumer, AVFormatContext *oc, A apply_properties( c, properties, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM ); int audio_qscale = mlt_properties_get_int( properties, "aq" ); - if ( audio_qscale > QSCALE_NONE ) + if ( audio_qscale > QSCALE_NONE ) { c->flags |= CODEC_FLAG_QSCALE; - c->global_quality = st->quality = FF_QP2LAMBDA * audio_qscale; + c->global_quality = FF_QP2LAMBDA * audio_qscale; +#if LIBAVFORMAT_VERSION_MAJOR < 53 + st->quality = c->global_quality; +#endif } // Set parameters controlled by MLT @@ -493,11 +641,10 @@ static AVStream *add_audio_stream( mlt_consumer consumer, AVFormatContext *oc, A c->channels = channels; if ( mlt_properties_get( properties, "alang" ) != NULL ) -#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(43<<8)+0) - av_metadata_set2( &oc->metadata, "language", mlt_properties_get( properties, "alang" ), 0 ); +#if LIBAVUTIL_VERSION_INT >= ((51<<16)+(8<<8)+0) + av_dict_set( &oc->metadata, "language", mlt_properties_get( properties, "alang" ), 0 ); #else - - strncpy( st->language, mlt_properties_get( properties, "alang" ), sizeof( st->language ) ); + av_metadata_set2( &oc->metadata, "language", mlt_properties_get( properties, "alang" ), 0 ); #endif } else @@ -523,7 +670,6 @@ static int open_audio( mlt_properties properties, AVFormatContext *oc, AVStream else codec = avcodec_find_encoder( c->codec_id ); -#if LIBAVCODEC_VERSION_MAJOR >= 53 // Process properties as AVOptions on the AVCodec if ( codec && codec->priv_class ) { @@ -542,12 +688,13 @@ static int open_audio( mlt_properties properties, AVFormatContext *oc, AVStream } apply_properties( c->priv_data, properties, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM ); } -#endif - avformat_lock(); - // Continue if codec found and we can open it - if ( codec != NULL && avcodec_open( c, codec ) >= 0 ) +#if LIBAVCODEC_VERSION_INT >= ((53<<16)+(8<<8)+0) + if ( codec && avcodec_open2( c, codec, NULL ) >= 0 ) +#else + if ( codec && avcodec_open( c, codec ) >= 0 ) +#endif { // ugly hack for PCM codecs (will be removed ASAP with new PCM // support to compute the input frame size in samples @@ -556,10 +703,10 @@ static int open_audio( mlt_properties properties, AVFormatContext *oc, AVStream audio_input_frame_size = audio_outbuf_size / c->channels; switch(st->codec->codec_id) { - case CODEC_ID_PCM_S16LE: - case CODEC_ID_PCM_S16BE: - case CODEC_ID_PCM_U16LE: - case CODEC_ID_PCM_U16BE: + case AV_CODEC_ID_PCM_S16LE: + case AV_CODEC_ID_PCM_S16BE: + case AV_CODEC_ID_PCM_U16LE: + case AV_CODEC_ID_PCM_U16BE: audio_input_frame_size >>= 1; break; default: @@ -580,9 +727,8 @@ static int open_audio( mlt_properties properties, AVFormatContext *oc, AVStream else { mlt_log_warning( NULL, "%s: Unable to encode audio - disabling audio output.\n", __FILE__ ); + audio_input_frame_size = 0; } - - avformat_unlock(); return audio_input_frame_size; } @@ -590,11 +736,7 @@ static int open_audio( mlt_properties properties, AVFormatContext *oc, AVStream static void close_audio( AVFormatContext *oc, AVStream *st ) { if ( st && st->codec ) - { - avformat_lock(); avcodec_close( st->codec ); - avformat_unlock(); - } } /** Add a video output stream @@ -606,7 +748,11 @@ static AVStream *add_video_stream( mlt_consumer consumer, AVFormatContext *oc, A mlt_properties properties = MLT_CONSUMER_PROPERTIES( consumer ); // Create a new stream +#if LIBAVFORMAT_VERSION_INT >= ((53<<16)+(10<<8)+0) + AVStream *st = avformat_new_stream( oc, codec ); +#else AVStream *st = av_new_stream( oc, oc->nb_streams ); +#endif if ( st != NULL ) { @@ -628,8 +774,12 @@ static AVStream *add_video_stream( mlt_consumer consumer, AVFormatContext *oc, A if ( thread_count == 0 && getenv( "MLT_AVFORMAT_THREADS" ) ) thread_count = atoi( getenv( "MLT_AVFORMAT_THREADS" ) ); if ( thread_count > 1 ) +#if LIBAVCODEC_VERSION_MAJOR >= 53 c->thread_count = thread_count; - +#else + avcodec_thread_init( c, thread_count ); +#endif + // Process properties as AVOptions char *vpre = mlt_properties_get( properties, "vpre" ); if ( vpre ) @@ -675,13 +825,8 @@ static AVStream *add_video_stream( mlt_consumer consumer, AVFormatContext *oc, A c->time_base.den = mlt_properties_get_int( properties, "frame_rate_num" ); if ( st->time_base.den == 0 ) st->time_base = c->time_base; -#if LIBAVUTIL_VERSION_INT >= ((50<<16)+(8<<8)+0) c->pix_fmt = pix_fmt ? av_get_pix_fmt( pix_fmt ) : PIX_FMT_YUV420P; -#else - c->pix_fmt = pix_fmt ? avcodec_get_pix_fmt( pix_fmt ) : PIX_FMT_YUV420P; -#endif -#if LIBAVCODEC_VERSION_INT > ((52<<16)+(28<<8)+0) switch ( colorspace ) { case 170: @@ -700,53 +845,27 @@ static AVStream *add_video_stream( mlt_consumer consumer, AVFormatContext *oc, A c->colorspace = AVCOL_SPC_BT709; break; } -#endif if ( mlt_properties_get( properties, "aspect" ) ) { // "-aspect" on ffmpeg command line is display aspect ratio double ar = mlt_properties_get_double( properties, "aspect" ); - AVRational rational = av_d2q( ar, 255 ); - - // 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, "display_aspect_num", rational.num ); - mlt_properties_set_int( properties, "display_aspect_den", rational.den ); - mlt_profile profile = mlt_service_profile( MLT_CONSUMER_SERVICE( consumer ) ); - if ( profile ) - { - profile->display_aspect_num = rational.num; - profile->display_aspect_den = rational.den; - mlt_properties_set_double( properties, "display_ratio", mlt_profile_dar( profile ) ); - } - - // Now compute the sample aspect ratio - rational = av_d2q( ar * c->height / c->width, 255 ); - c->sample_aspect_ratio = rational; - // 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 ); - mlt_properties_set_int( properties, "sample_aspect_den", rational.den ); - if ( profile ) - { - profile->sample_aspect_num = rational.num; - profile->sample_aspect_den = rational.den; - mlt_properties_set_double( properties, "aspect_ratio", mlt_profile_sar( profile ) ); - } + c->sample_aspect_ratio = av_d2q( ar * c->height / c->width, 255 ); } 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; -#endif if ( mlt_properties_get_double( properties, "qscale" ) > 0 ) { c->flags |= CODEC_FLAG_QSCALE; - st->quality = FF_QP2LAMBDA * mlt_properties_get_double( properties, "qscale" ); + c->global_quality = FF_QP2LAMBDA * mlt_properties_get_double( properties, "qscale" ); +#if LIBAVFORMAT_VERSION_MAJOR < 53 + st->quality = c->global_quality; +#endif } // Allow the user to override the video fourcc @@ -811,7 +930,7 @@ static AVStream *add_video_stream( mlt_consumer consumer, AVFormatContext *oc, A c->flags |= CODEC_FLAG_PASS1; else if ( i == 2 ) c->flags |= CODEC_FLAG_PASS2; - if ( codec->id != CODEC_ID_H264 && ( c->flags & ( CODEC_FLAG_PASS1 | CODEC_FLAG_PASS2 ) ) ) + if ( codec->id != AV_CODEC_ID_H264 && ( c->flags & ( CODEC_FLAG_PASS1 | CODEC_FLAG_PASS2 ) ) ) { char logfilename[1024]; FILE *f; @@ -847,12 +966,14 @@ static AVStream *add_video_stream( mlt_consumer consumer, AVFormatContext *oc, A mlt_log_fatal( MLT_CONSUMER_SERVICE( consumer ), "Could not allocate log buffer\n" ); else { - size = fread( logbuffer, 1, size, f ); - fclose( f ); - logbuffer[size] = '\0'; - c->stats_in = logbuffer; - mlt_properties_set_data( properties, "_logbuffer", logbuffer, 0, ( mlt_destructor )av_free, NULL ); + if ( size >= 0 ) + { + size = fread( logbuffer, 1, size, f ); + logbuffer[size] = '\0'; + c->stats_in = logbuffer; + } } + fclose( f ); } } } @@ -892,7 +1013,7 @@ static AVFrame *alloc_picture( int pix_fmt, int width, int height ) return picture; } - + static int open_video( mlt_properties properties, AVFormatContext *oc, AVStream *st, const char *codec_name ) { // Get the codec @@ -905,7 +1026,6 @@ static int open_video( mlt_properties properties, AVFormatContext *oc, AVStream else codec = avcodec_find_encoder( video_enc->codec_id ); -#if LIBAVCODEC_VERSION_MAJOR >= 53 // Process properties as AVOptions on the AVCodec if ( codec && codec->priv_class ) { @@ -924,7 +1044,6 @@ static int open_video( mlt_properties properties, AVFormatContext *oc, AVStream } apply_properties( video_enc->priv_data, properties, AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM ); } -#endif if( codec && codec->pix_fmts ) { @@ -938,10 +1057,11 @@ static int open_video( mlt_properties properties, AVFormatContext *oc, AVStream video_enc->pix_fmt = codec->pix_fmts[ 0 ]; } - // Open the codec safely - avformat_lock(); - int result = codec != NULL && avcodec_open( video_enc, codec ) >= 0; - avformat_unlock(); +#if LIBAVCODEC_VERSION_INT >= ((53<<16)+(8<<8)+0) + int result = codec && avcodec_open2( video_enc, codec, NULL ) >= 0; +#else + int result = codec && avcodec_open( video_enc, codec ) >= 0; +#endif return result; } @@ -950,9 +1070,8 @@ void close_video(AVFormatContext *oc, AVStream *st) { if ( st && st->codec ) { - avformat_lock(); + av_freep( &st->codec->stats_in ); avcodec_close(st->codec); - avformat_unlock(); } } @@ -966,16 +1085,16 @@ static inline long time_difference( struct timeval *time1 ) static int mlt_write(void *h, uint8_t *buf, int size) { mlt_properties properties = (mlt_properties) h; - mlt_events_fire( properties, "avformat-write", buf, size, NULL ); + mlt_events_fire( properties, "avformat-write", buf, &size, NULL ); return 0; } static void write_transmitter( mlt_listener listener, mlt_properties owner, mlt_service service, void **args ) { - listener( owner, service, (uint8_t*) args[0], (int) args[1] ); + int *p_size = (int*) args[1]; + listener( owner, service, (uint8_t*) args[0], *p_size ); } - /** The main thread - the argument is simply the consumer. */ @@ -1007,17 +1126,16 @@ static void *consumer_thread( void *arg ) int img_height = height; // Get default audio properties - mlt_audio_format aud_fmt = mlt_audio_s16; int channels = mlt_properties_get_int( properties, "channels" ); int total_channels = channels; int frequency = mlt_properties_get_int( properties, "frequency" ); - int16_t *pcm = NULL; + void *pcm = NULL; int samples = 0; // AVFormat audio buffer and frame size int audio_outbuf_size = AUDIO_BUFFER_SIZE; uint8_t *audio_outbuf = av_malloc( audio_outbuf_size ); - int audio_input_frame_size = 0; + int audio_input_nb_samples = 0; // AVFormat video buffer and frame count int frame_count = 0; @@ -1032,25 +1150,41 @@ static void *consumer_thread( void *arg ) mlt_deque queue = mlt_properties_get_data( properties, "frame_queue", NULL ); sample_fifo fifo = mlt_properties_get_data( properties, "sample_fifo", NULL ); - // Need two av pictures for converting - AVFrame *output = NULL; - AVFrame *input = alloc_picture( PIX_FMT_YUYV422, width, height ); - // For receiving images from an mlt_frame uint8_t *image; mlt_image_format img_fmt = mlt_image_yuv422; + // Get the image format to use for rendering threads + const char* img_fmt_name = mlt_properties_get( properties, "mlt_image_format" ); + if ( img_fmt_name ) + { + if ( !strcmp( img_fmt_name, "rgb24" ) ) + img_fmt = mlt_image_rgb24; + else if ( !strcmp( img_fmt_name, "rgb24a" ) ) + img_fmt = mlt_image_rgb24a; + else if ( !strcmp( img_fmt_name, "yuv420p" ) ) + img_fmt = mlt_image_yuv420p; + } + else if ( mlt_properties_get( properties, "pix_fmt" ) ) + { + img_fmt_name = mlt_properties_get( properties, "pix_fmt" ); + if ( !strcmp( img_fmt_name, "rgba" ) || + !strcmp( img_fmt_name, "argb" ) || + !strcmp( img_fmt_name, "bgra" ) ) + img_fmt = mlt_image_rgb24a; + } + + // Need two av pictures for converting + AVFrame *converted_avframe = NULL; + AVFrame *audio_avframe = NULL; + AVFrame *video_avframe = alloc_picture( pick_pix_fmt( img_fmt ), width, height ); // For receiving audio samples back from the fifo - int16_t *audio_buf_1 = av_malloc( AUDIO_ENCODE_BUFFER_SIZE ); - int16_t *audio_buf_2 = NULL; + uint8_t *audio_buf_1 = av_malloc( AUDIO_ENCODE_BUFFER_SIZE ); + uint8_t *audio_buf_2 = NULL; int count = 0; // Allocate the context -#if (LIBAVFORMAT_VERSION_INT >= ((52<<16)+(26<<8)+0)) - AVFormatContext *oc = avformat_alloc_context( ); -#else - AVFormatContext *oc = av_alloc_format_context( ); -#endif + AVFormatContext *oc = NULL; // Streams AVStream *video_st = NULL; @@ -1080,6 +1214,8 @@ static void *consumer_thread( void *arg ) // Misc char key[27]; mlt_properties frame_meta_properties = mlt_properties_new(); + int error_count = 0; + int64_t synth_audio_pts = 0; // Initialize audio_st int i = MAX_AUDIO_STREAMS; @@ -1088,55 +1224,63 @@ static void *consumer_thread( void *arg ) // Check for user selected format first if ( format != NULL ) -#if LIBAVFORMAT_VERSION_INT < ((52<<16)+(45<<8)+0) - fmt = guess_format( format, NULL, NULL ); -#else fmt = av_guess_format( format, NULL, NULL ); -#endif // Otherwise check on the filename if ( fmt == NULL && filename != NULL ) -#if LIBAVFORMAT_VERSION_INT < ((52<<16)+(45<<8)+0) - fmt = guess_format( NULL, filename, NULL ); -#else fmt = av_guess_format( NULL, filename, NULL ); -#endif // Otherwise default to mpeg if ( fmt == NULL ) -#if LIBAVFORMAT_VERSION_INT < ((52<<16)+(45<<8)+0) - fmt = guess_format( "mpeg", NULL, NULL ); -#else fmt = av_guess_format( "mpeg", NULL, NULL ); -#endif // We need a filename - default to stdout? if ( filename == NULL || !strcmp( filename, "" ) ) filename = "pipe:"; +#if defined(FFUDIV) && LIBAVUTIL_VERSION_INT >= ((53<<16)+(2<<8)+0) + avformat_alloc_output_context2( &oc, fmt, format, filename ); +#else + oc = avformat_alloc_context( ); + oc->oformat = fmt; + snprintf( oc->filename, sizeof(oc->filename), "%s", filename ); + + if ( oc->oformat && oc->oformat->priv_class && !oc->priv_data && oc->oformat->priv_data_size ) { + oc->priv_data = av_mallocz( oc->oformat->priv_data_size ); + if ( oc->priv_data ) { + *(const AVClass**)oc->priv_data = oc->oformat->priv_class; + av_opt_set_defaults( oc->priv_data ); + } + } +#endif + // Get the codec ids selected audio_codec_id = fmt->audio_codec; video_codec_id = fmt->video_codec; // Check for audio codec overides if ( ( acodec && strcmp( acodec, "none" ) == 0 ) || mlt_properties_get_int( properties, "an" ) ) - audio_codec_id = CODEC_ID_NONE; + audio_codec_id = AV_CODEC_ID_NONE; else if ( acodec ) { audio_codec = avcodec_find_encoder_by_name( acodec ); if ( audio_codec ) { audio_codec_id = audio_codec->id; - if ( audio_codec_id == CODEC_ID_AC3 && avcodec_find_encoder_by_name( "ac3_fixed" ) ) + if ( audio_codec_id == AV_CODEC_ID_AC3 && avcodec_find_encoder_by_name( "ac3_fixed" ) ) { mlt_properties_set( properties, "_acodec", "ac3_fixed" ); acodec = mlt_properties_get( properties, "_acodec" ); audio_codec = avcodec_find_encoder_by_name( acodec ); } + else if ( !strcmp( acodec, "aac" ) || !strcmp( acodec, "vorbis" ) ) + { + mlt_properties_set( properties, "astrict", "experimental" ); + } } else { - audio_codec_id = CODEC_ID_NONE; + audio_codec_id = AV_CODEC_ID_NONE; mlt_log_warning( MLT_CONSUMER_SERVICE( consumer ), "audio codec %s unrecognised - ignoring\n", acodec ); } } @@ -1147,7 +1291,7 @@ static void *consumer_thread( void *arg ) // Check for video codec overides if ( ( vcodec && strcmp( vcodec, "none" ) == 0 ) || mlt_properties_get_int( properties, "vn" ) ) - video_codec_id = CODEC_ID_NONE; + video_codec_id = AV_CODEC_ID_NONE; else if ( vcodec ) { video_codec = avcodec_find_encoder_by_name( vcodec ); @@ -1157,7 +1301,7 @@ static void *consumer_thread( void *arg ) } else { - video_codec_id = CODEC_ID_NONE; + video_codec_id = AV_CODEC_ID_NONE; mlt_log_warning( MLT_CONSUMER_SERVICE( consumer ), "video codec %s unrecognised - ignoring\n", vcodec ); } } @@ -1167,7 +1311,6 @@ static void *consumer_thread( void *arg ) } // Write metadata -#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(31<<8)+0) for ( i = 0; i < mlt_properties_count( properties ); i++ ) { char *name = mlt_properties_get_name( properties, i ); @@ -1179,48 +1322,35 @@ static void *consumer_thread( void *arg ) { markup[0] = '\0'; if ( !strstr( key, ".stream." ) ) -#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(43<<8)+0) - av_metadata_set2( &oc->metadata, key, mlt_properties_get_value( properties, i ), 0 ); +#if LIBAVUTIL_VERSION_INT >= ((51<<16)+(8<<8)+0) + av_dict_set( &oc->metadata, key, mlt_properties_get_value( properties, i ), 0 ); #else - av_metadata_set( &oc->metadata, key, mlt_properties_get_value( properties, i ) ); + av_metadata_set2( &oc->metadata, key, mlt_properties_get_value( properties, i ), 0 ); #endif } free( key ); } } -#else - char *tmp = NULL; - int metavalue; - - tmp = mlt_properties_get( properties, "meta.attr.title.markup"); - if (tmp != NULL) snprintf( oc->title, sizeof(oc->title), "%s", tmp ); - - tmp = mlt_properties_get( properties, "meta.attr.comment.markup"); - if (tmp != NULL) snprintf( oc->comment, sizeof(oc->comment), "%s", tmp ); - - tmp = mlt_properties_get( properties, "meta.attr.author.markup"); - if (tmp != NULL) snprintf( oc->author, sizeof(oc->author), "%s", tmp ); - tmp = mlt_properties_get( properties, "meta.attr.copyright.markup"); - if (tmp != NULL) snprintf( oc->copyright, sizeof(oc->copyright), "%s", tmp ); - - tmp = mlt_properties_get( properties, "meta.attr.album.markup"); - if (tmp != NULL) snprintf( oc->album, sizeof(oc->album), "%s", tmp ); - - metavalue = mlt_properties_get_int( properties, "meta.attr.year.markup"); - if (metavalue != 0) oc->year = metavalue; - - metavalue = mlt_properties_get_int( properties, "meta.attr.track.markup"); - if (metavalue != 0) oc->track = metavalue; -#endif - - oc->oformat = fmt; - snprintf( oc->filename, sizeof(oc->filename), "%s", filename ); + // Get a frame now, so we can set some AVOptions from properties. + frame = mlt_consumer_rt_frame( consumer ); + + // Set the timecode from the MLT metadata if available. + if ( frame ) + { + const char *timecode = mlt_properties_get( MLT_FRAME_PROPERTIES(frame), "meta.attr.vitc.markup" ); + if ( timecode && strcmp( timecode, "" ) ) + { + mlt_properties_set( properties, "timecode", timecode ); + if ( strchr( timecode, ';' ) ) + mlt_properties_set_int( properties, "drop_frame_timecode", 1 ); + } + } // Add audio and video streams - if ( video_codec_id != CODEC_ID_NONE ) + if ( video_codec_id != AV_CODEC_ID_NONE ) video_st = add_video_stream( consumer, oc, video_codec ); - if ( audio_codec_id != CODEC_ID_NONE ) + if ( audio_codec_id != AV_CODEC_ID_NONE ) { int is_multi = 0; @@ -1246,10 +1376,24 @@ static void *consumer_thread( void *arg ) } mlt_properties_set_int( properties, "channels", total_channels ); + // Audio format is determined when adding the audio stream + mlt_audio_format aud_fmt = mlt_audio_none; + if ( audio_st[0] ) + aud_fmt = get_mlt_audio_format( audio_st[0]->codec->sample_fmt ); + int sample_bytes = mlt_audio_format_size( aud_fmt, 1, 1 ); + sample_bytes = sample_bytes ? sample_bytes : 1; // prevent divide by zero + // Set the parameters (even though we have none...) - if ( av_set_parameters(oc, NULL) >= 0 ) +#if LIBAVFORMAT_VERSION_INT < ((53<<16)+(2<<8)+0) + if ( av_set_parameters(oc, NULL) >= 0 ) +#endif { +#if LIBAVFORMAT_VERSION_MAJOR >= 53 + if ( mlt_properties_get( properties, "muxpreload" ) && ! mlt_properties_get( properties, "preload" ) ) + mlt_properties_set_double( properties, "preload", mlt_properties_get_double( properties, "muxpreload" ) ); +#else oc->preload = ( int )( mlt_properties_get_double( properties, "muxpreload" ) * AV_TIME_BASE ); +#endif oc->max_delay= ( int )( mlt_properties_get_double( properties, "muxdelay" ) * AV_TIME_BASE ); // Process properties as AVOptions @@ -1258,26 +1402,32 @@ static void *consumer_thread( void *arg ) { mlt_properties p = mlt_properties_load( fpre ); apply_properties( oc, p, AV_OPT_FLAG_ENCODING_PARAM ); -#if LIBAVFORMAT_VERSION_MAJOR >= 53 if ( oc->oformat && oc->oformat->priv_class && oc->priv_data ) apply_properties( oc->priv_data, p, AV_OPT_FLAG_ENCODING_PARAM ); -#endif mlt_properties_close( p ); } apply_properties( oc, properties, AV_OPT_FLAG_ENCODING_PARAM ); -#if LIBAVFORMAT_VERSION_MAJOR >= 53 if ( oc->oformat && oc->oformat->priv_class && oc->priv_data ) apply_properties( oc->priv_data, properties, AV_OPT_FLAG_ENCODING_PARAM ); -#endif if ( video_st && !open_video( properties, oc, video_st, vcodec? vcodec : NULL ) ) video_st = NULL; for ( i = 0; i < MAX_AUDIO_STREAMS && audio_st[i]; i++ ) { - audio_input_frame_size = open_audio( properties, oc, audio_st[i], audio_outbuf_size, + audio_input_nb_samples = open_audio( properties, oc, audio_st[i], audio_outbuf_size, acodec? acodec : NULL ); - if ( !audio_input_frame_size ) + if ( !audio_input_nb_samples ) + { + // Remove the audio stream from the output context + int j; + for ( j = 0; j < oc->nb_streams; j++ ) + { + if ( oc->streams[j] == audio_st[i] ) + av_freep( &oc->streams[j] ); + } + --oc->nb_streams; audio_st[i] = NULL; + } } // Setup custom I/O if redirecting @@ -1316,27 +1466,61 @@ static void *consumer_thread( void *arg ) #endif { mlt_log_error( MLT_CONSUMER_SERVICE( consumer ), "Could not open '%s'\n", filename ); - mlt_properties_set_int( properties, "running", 0 ); + mlt_events_fire( properties, "consumer-fatal-error", NULL ); + goto on_fatal_error; } } // Write the stream header. if ( mlt_properties_get_int( properties, "running" ) ) - av_write_header( oc ); +#if LIBAVFORMAT_VERSION_INT >= ((53<<16)+(2<<8)+0) + if ( avformat_write_header( oc, NULL ) < 0 ) +#else + if ( av_write_header( oc ) < 0 ) +#endif + { + mlt_log_error( MLT_CONSUMER_SERVICE( consumer ), "Could not write header '%s'\n", filename ); + mlt_events_fire( properties, "consumer-fatal-error", NULL ); + goto on_fatal_error; + } } +#if LIBAVFORMAT_VERSION_INT < ((53<<16)+(2<<8)+0) else { mlt_log_error( MLT_CONSUMER_SERVICE( consumer ), "Invalid output format parameters\n" ); - mlt_properties_set_int( properties, "running", 0 ); + mlt_events_fire( properties, "consumer-fatal-error", NULL ); + goto on_fatal_error; + } +#endif + + // Last check - need at least one stream + if ( !audio_st[0] && !video_st ) + { + mlt_events_fire( properties, "consumer-fatal-error", NULL ); + goto on_fatal_error; } // Allocate picture if ( video_st ) - output = alloc_picture( video_st->codec->pix_fmt, width, height ); + converted_avframe = alloc_picture( video_st->codec->pix_fmt, width, height ); - // Last check - need at least one stream - if ( !audio_st[0] && !video_st ) - mlt_properties_set_int( properties, "running", 0 ); +#if LIBAVCODEC_VERSION_MAJOR >= 54 + // Allocate audio AVFrame + if ( audio_st[0] ) + { + audio_avframe = avcodec_alloc_frame(); + if ( audio_avframe ) { + AVCodecContext *c = audio_st[0]->codec; + audio_avframe->format = c->sample_fmt; + audio_avframe->nb_samples = audio_input_nb_samples; + audio_avframe->channel_layout = c->channel_layout; + } else { + mlt_log_error( MLT_CONSUMER_SERVICE(consumer), "failed to allocate audio AVFrame\n" ); + mlt_events_fire( properties, "consumer-fatal-error", NULL ); + goto on_fatal_error; + } + } +#endif // Get the starting time (can ignore the times above) gettimeofday( &ante, NULL ); @@ -1345,7 +1529,8 @@ static void *consumer_thread( void *arg ) while( mlt_properties_get_int( properties, "running" ) && ( !terminated || ( video_st && mlt_deque_count( queue ) ) ) ) { - frame = mlt_consumer_rt_frame( consumer ); + if ( !frame ) + frame = mlt_consumer_rt_frame( consumer ); // Check that we have a frame to work with if ( frame != NULL ) @@ -1364,7 +1549,7 @@ static void *consumer_thread( void *arg ) { samples = mlt_sample_calculator( fps, frequency, count ++ ); channels = total_channels; - mlt_frame_get_audio( frame, (void**) &pcm, &aud_fmt, &frequency, &channels, &samples ); + mlt_frame_get_audio( frame, &pcm, &aud_fmt, &frequency, &channels, &samples ); // Save the audio channel remap properties for later mlt_properties_pass( frame_meta_properties, frame_properties, "meta.map.audio." ); @@ -1375,15 +1560,16 @@ static void *consumer_thread( void *arg ) fifo = sample_fifo_init( frequency, channels ); mlt_properties_set_data( properties, "sample_fifo", fifo, 0, ( mlt_destructor )sample_fifo_close, NULL ); } + if ( pcm ) + { + // Silence if not normal forward speed + if ( mlt_properties_get_double( frame_properties, "_speed" ) != 1.0 ) + memset( pcm, 0, samples * channels * sample_bytes ); - // Silence if not normal forward speed - 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; - + // Append the samples + sample_fifo_append( fifo, pcm, samples * channels * sample_bytes ); + total_time += ( samples * 1000000 ) / frequency; + } if ( !video_st ) mlt_events_fire( properties, "consumer-frame-show", frame, NULL ); } @@ -1393,6 +1579,7 @@ static void *consumer_thread( void *arg ) mlt_deque_push_back( queue, frame ); else mlt_frame_close( frame ); + frame = NULL; } // While we have stuff to process, process... @@ -1402,17 +1589,17 @@ static void *consumer_thread( void *arg ) if ( !video_st || ( video_st && audio_st[0] && audio_pts < video_pts ) ) { // Write audio - if ( ( video_st && terminated ) || ( channels * audio_input_frame_size ) < sample_fifo_used( fifo ) ) + if ( ( video_st && terminated ) || ( channels * audio_input_nb_samples ) < sample_fifo_used( fifo ) / sample_bytes ) { int j = 0; // channel offset into interleaved source buffer - int n = FFMIN( FFMIN( channels * audio_input_frame_size, sample_fifo_used( fifo ) ), AUDIO_ENCODE_BUFFER_SIZE ); + int n = FFMIN( FFMIN( channels * audio_input_nb_samples, sample_fifo_used( fifo ) / sample_bytes ), AUDIO_ENCODE_BUFFER_SIZE ); // Get the audio samples if ( n > 0 ) { - sample_fifo_fetch( fifo, audio_buf_1, n ); + sample_fifo_fetch( fifo, audio_buf_1, n * sample_bytes ); } - else if ( audio_codec_id == CODEC_ID_VORBIS && terminated ) + else if ( audio_codec_id == AV_CODEC_ID_VORBIS && terminated ) { // This prevents an infinite loop when some versions of vorbis do not // increment pts when encoding silence. @@ -1433,11 +1620,49 @@ static void *consumer_thread( void *arg ) AVPacket pkt; av_init_packet( &pkt ); + pkt.data = audio_outbuf; + pkt.size = audio_outbuf_size; // Optimized for single track and no channel remap if ( !audio_st[1] && !mlt_properties_count( frame_meta_properties ) ) { - pkt.size = avcodec_encode_audio( codec, audio_outbuf, audio_outbuf_size, audio_buf_1 ); + void* p = audio_buf_1; +#if LIBAVUTIL_VERSION_INT >= ((51<<16)+(17<<8)+0) + if ( codec->sample_fmt == AV_SAMPLE_FMT_FLTP ) + p = interleaved_to_planar( samples, channels, p, sizeof( float ) ); + else if ( codec->sample_fmt == AV_SAMPLE_FMT_S16P ) + p = interleaved_to_planar( samples, channels, p, sizeof( int16_t ) ); + else if ( codec->sample_fmt == AV_SAMPLE_FMT_S32P ) + p = interleaved_to_planar( samples, channels, p, sizeof( int32_t ) ); + else if ( codec->sample_fmt == AV_SAMPLE_FMT_U8P ) + p = interleaved_to_planar( samples, channels, p, sizeof( uint8_t ) ); +#endif +#if LIBAVCODEC_VERSION_MAJOR >= 54 + audio_avframe->nb_samples = FFMAX( samples, audio_input_nb_samples ); +#if LIBAVCODEC_VERSION_MAJOR >= 55 + if ( audio_codec_id == AV_CODEC_ID_VORBIS ) + audio_avframe->pts = synth_audio_pts; + synth_audio_pts += audio_avframe->nb_samples; +#endif + avcodec_fill_audio_frame( audio_avframe, codec->channels, codec->sample_fmt, + (const uint8_t*) p, AUDIO_ENCODE_BUFFER_SIZE, 0 ); + int got_packet = 0; + int ret = avcodec_encode_audio2( codec, &pkt, audio_avframe, &got_packet ); + if ( ret < 0 ) + pkt.size = ret; + else if ( !got_packet ) + pkt.size = 0; +#else + codec->frame_size = FFMAX( samples, audio_input_nb_samples ); + pkt.size = avcodec_encode_audio( codec, audio_outbuf, audio_outbuf_size, p ); + pkt.pts = codec->coded_frame? codec->coded_frame->pts : AV_NOPTS_VALUE; + pkt.flags |= PKT_FLAG_KEY; +#endif + +#if LIBAVUTIL_VERSION_INT >= ((51<<16)+(17<<8)+0) + if ( p != audio_buf_1 ) + mlt_pool_release( p ); +#endif } else { @@ -1486,14 +1711,14 @@ static void *consumer_thread( void *arg ) // Interleave the audio buffer with the # channels for this stream/mapping. for ( k = 0; k < map_channels; k++, j++, source_offset++, dest_offset++ ) { - int16_t *src = audio_buf_1 + source_offset; - int16_t *dest = audio_buf_2 + dest_offset; + void *src = audio_buf_1 + source_offset * sample_bytes; + void *dest = audio_buf_2 + dest_offset * sample_bytes; int s = samples + 1; while ( --s ) { - *dest = *src; - dest += current_channels; - src += channels; + memcpy( dest, src, sample_bytes ); + dest += current_channels * sample_bytes; + src += channels * sample_bytes; } } } @@ -1504,31 +1729,58 @@ static void *consumer_thread( void *arg ) dest_offset += current_channels; } } - pkt.size = avcodec_encode_audio( codec, audio_outbuf, audio_outbuf_size, audio_buf_2 ); - } - - // Write the compressed frame in the media file - if ( codec->coded_frame && codec->coded_frame->pts != AV_NOPTS_VALUE ) - { - pkt.pts = av_rescale_q( codec->coded_frame->pts, codec->time_base, stream->time_base ); - mlt_log_debug( MLT_CONSUMER_SERVICE( consumer ), "audio stream %d pkt pts %"PRId64" frame pts %"PRId64, - stream->index, pkt.pts, codec->coded_frame->pts ); +#if LIBAVCODEC_VERSION_MAJOR >= 54 + audio_avframe->nb_samples = FFMAX( samples, audio_input_nb_samples ); +#if LIBAVCODEC_VERSION_MAJOR >= 55 + if ( audio_codec_id == AV_CODEC_ID_VORBIS ) + audio_avframe->pts = synth_audio_pts; + synth_audio_pts += audio_avframe->nb_samples; +#endif + avcodec_fill_audio_frame( audio_avframe, codec->channels, codec->sample_fmt, + (const uint8_t*) audio_buf_2, AUDIO_ENCODE_BUFFER_SIZE, 0 ); + int got_packet = 0; + int ret = avcodec_encode_audio2( codec, &pkt, audio_avframe, &got_packet ); + if ( ret < 0 ) + pkt.size = ret; + else if ( !got_packet ) + pkt.size = 0; +#else + codec->frame_size = FFMAX( samples, audio_input_nb_samples ); + pkt.size = avcodec_encode_audio( codec, audio_outbuf, audio_outbuf_size, (short*) audio_buf_2 ); + pkt.pts = codec->coded_frame? codec->coded_frame->pts : AV_NOPTS_VALUE; + pkt.flags |= PKT_FLAG_KEY; +#endif } - pkt.flags |= PKT_FLAG_KEY; - pkt.stream_index = stream->index; - pkt.data = audio_outbuf; if ( pkt.size > 0 ) { + // Write the compressed frame in the media file + if ( pkt.pts != AV_NOPTS_VALUE ) + pkt.pts = av_rescale_q( pkt.pts, codec->time_base, stream->time_base ); +#if LIBAVCODEC_VERSION_MAJOR >= 55 + if ( pkt.dts != AV_NOPTS_VALUE ) + pkt.dts = av_rescale_q( pkt.dts, codec->time_base, stream->time_base ); + if ( pkt.duration > 0 ) + pkt.duration = av_rescale_q( pkt.duration, codec->time_base, stream->time_base ); +#endif + pkt.stream_index = stream->index; if ( av_interleaved_write_frame( oc, &pkt ) ) { mlt_log_fatal( MLT_CONSUMER_SERVICE( consumer ), "error writing audio frame\n" ); mlt_events_fire( properties, "consumer-fatal-error", NULL ); goto on_fatal_error; } + error_count = 0; + mlt_log_debug( MLT_CONSUMER_SERVICE( consumer ), "audio stream %d pkt pts %"PRId64" frame_size %d stream pts %"PRId64"\n", + stream->index, pkt.pts, codec->frame_size, stream->pts.val ); + } + else if ( pkt.size < 0 ) + { + mlt_log_warning( MLT_CONSUMER_SERVICE( consumer ), "error with audio encode %d\n", frame_count ); + if ( ++error_count > 2 ) + goto on_fatal_error; } - mlt_log_debug( MLT_CONSUMER_SERVICE( consumer ), " frame_size %d\n", codec->frame_size ); if ( i == 0 ) { audio_pts = (double)stream->pts.val * av_q2d( stream->time_base ); @@ -1545,54 +1797,60 @@ static void *consumer_thread( void *arg ) // Write video if ( mlt_deque_count( queue ) ) { - int out_size, ret = 0; - AVCodecContext *c; + int ret = 0; + AVCodecContext *c = video_st->codec; frame = mlt_deque_pop_front( queue ); frame_properties = MLT_FRAME_PROPERTIES( frame ); - c = video_st->codec; - if ( mlt_properties_get_int( frame_properties, "rendered" ) ) { int i = 0; uint8_t *p; uint8_t *q; + int stride = mlt_image_format_size( img_fmt, width, 0, NULL ); mlt_frame_get_image( frame, &image, &img_fmt, &img_width, &img_height, 0 ); - q = image; // Convert the mlt frame to an AVPicture - for ( i = 0; i < height; i ++ ) + if ( img_fmt == mlt_image_yuv420p ) { - p = input->data[ 0 ] + i * input->linesize[ 0 ]; - memcpy( p, q, width * 2 ); - q += width * 2; + memcpy( video_avframe->data[0], q, video_avframe->linesize[0] ); + q += stride; + memcpy( video_avframe->data[1], q, video_avframe->linesize[1] ); + q += stride / 4; + memcpy( video_avframe->data[2], q, video_avframe->linesize[2] ); + } + else for ( i = 0; i < height; i ++ ) + { + p = video_avframe->data[0] + i * video_avframe->linesize[0]; + memcpy( p, q, stride ); + q += stride; } // Do the colour space conversion -#ifdef SWSCALE - int flags = SWS_BILINEAR; + int flags = SWS_BICUBIC; #ifdef USE_MMX flags |= SWS_CPU_CAPS_MMX; #endif #ifdef USE_SSE flags |= SWS_CPU_CAPS_MMX2; #endif - struct SwsContext *context = sws_getContext( width, height, PIX_FMT_YUYV422, - width, height, video_st->codec->pix_fmt, flags, NULL, NULL, NULL); - sws_scale( context, (const uint8_t* const*) input->data, input->linesize, 0, height, - output->data, output->linesize); + struct SwsContext *context = sws_getContext( width, height, pick_pix_fmt( img_fmt ), + width, height, c->pix_fmt, flags, NULL, NULL, NULL); + sws_scale( context, (const uint8_t* const*) video_avframe->data, video_avframe->linesize, 0, height, + converted_avframe->data, converted_avframe->linesize); sws_freeContext( context ); -#else - img_convert( ( AVPicture * )output, video_st->codec->pix_fmt, ( AVPicture * )input, PIX_FMT_YUYV422, width, height ); -#endif mlt_events_fire( properties, "consumer-frame-show", frame, NULL ); // Apply the alpha if applicable - if ( video_st->codec->pix_fmt == PIX_FMT_RGB32 ) + if ( !mlt_properties_get( properties, "mlt_image_format" ) || + strcmp( mlt_properties_get( properties, "mlt_image_format" ), "rgb24a" ) ) + if ( c->pix_fmt == PIX_FMT_RGBA || + c->pix_fmt == PIX_FMT_ARGB || + c->pix_fmt == PIX_FMT_BGRA ) { uint8_t *alpha = mlt_frame_get_alpha_mask( frame ); register int n; @@ -1600,7 +1858,7 @@ static void *consumer_thread( void *arg ) for ( i = 0; i < height; i ++ ) { n = ( width + 7 ) / 8; - p = output->data[ 0 ] + i * output->linesize[ 0 ] + 3; + p = converted_avframe->data[ 0 ] + i * converted_avframe->linesize[ 0 ] + 3; switch( width % 8 ) { @@ -1625,41 +1883,76 @@ static void *consumer_thread( void *arg ) AVPacket pkt; av_init_packet(&pkt); + // Set frame interlace hints + c->coded_frame->interlaced_frame = !mlt_properties_get_int( frame_properties, "progressive" ); + c->coded_frame->top_field_first = mlt_properties_get_int( frame_properties, "top_field_first" ); +#if LIBAVCODEC_VERSION_INT >= ((53<<16)+(61<<8)+100) + if ( mlt_properties_get_int( frame_properties, "progressive" ) ) + c->field_order = AV_FIELD_PROGRESSIVE; + else + c->field_order = (mlt_properties_get_int( frame_properties, "top_field_first" )) ? AV_FIELD_TT : AV_FIELD_BB; +#endif pkt.flags |= PKT_FLAG_KEY; - pkt.stream_index= video_st->index; - pkt.data= (uint8_t *)output; - pkt.size= sizeof(AVPicture); + pkt.stream_index = video_st->index; + pkt.data = (uint8_t *)converted_avframe; + pkt.size = sizeof(AVPicture); ret = av_write_frame(oc, &pkt); video_pts += c->frame_size; } else { + AVPacket pkt; + av_init_packet( &pkt ); + if ( c->codec->id == AV_CODEC_ID_RAWVIDEO ) { + pkt.data = NULL; + pkt.size = 0; + } else { + pkt.data = video_outbuf; + pkt.size = video_outbuf_size; + } + // Set the quality - output->quality = video_st->quality; + converted_avframe->quality = c->global_quality; + converted_avframe->pts = frame_count; // Set frame interlace hints - output->interlaced_frame = !mlt_properties_get_int( frame_properties, "progressive" ); - output->top_field_first = mlt_properties_get_int( frame_properties, "top_field_first" ); - output->pts = frame_count; + converted_avframe->interlaced_frame = !mlt_properties_get_int( frame_properties, "progressive" ); + converted_avframe->top_field_first = mlt_properties_get_int( frame_properties, "top_field_first" ); +#if LIBAVCODEC_VERSION_INT >= ((53<<16)+(61<<8)+100) + if ( mlt_properties_get_int( frame_properties, "progressive" ) ) + c->field_order = AV_FIELD_PROGRESSIVE; + else if ( c->codec_id == AV_CODEC_ID_MJPEG ) + c->field_order = (mlt_properties_get_int( frame_properties, "top_field_first" )) ? AV_FIELD_TT : AV_FIELD_BB; + else + c->field_order = (mlt_properties_get_int( frame_properties, "top_field_first" )) ? AV_FIELD_TB : AV_FIELD_BT; +#endif // Encode the image - out_size = avcodec_encode_video(c, video_outbuf, video_outbuf_size, output ); +#if LIBAVCODEC_VERSION_MAJOR >= 55 + int got_packet; + ret = avcodec_encode_video2( c, &pkt, converted_avframe, &got_packet ); + if ( ret < 0 ) + pkt.size = ret; + else if ( !got_packet ) + pkt.size = 0; +#else + pkt.size = avcodec_encode_video(c, video_outbuf, video_outbuf_size, converted_avframe ); + pkt.pts = c->coded_frame? c->coded_frame->pts : AV_NOPTS_VALUE; + if ( c->coded_frame && c->coded_frame->key_frame ) + pkt.flags |= PKT_FLAG_KEY; +#endif // If zero size, it means the image was buffered - if ( out_size > 0 ) + if ( pkt.size > 0 ) { - AVPacket pkt; - av_init_packet( &pkt ); - - if ( c->coded_frame && c->coded_frame->pts != AV_NOPTS_VALUE ) - pkt.pts= av_rescale_q( c->coded_frame->pts, c->time_base, video_st->time_base ); - mlt_log_debug( MLT_CONSUMER_SERVICE( consumer ), "video pkt pts %"PRId64" frame pts %"PRId64, pkt.pts, c->coded_frame->pts ); - if( c->coded_frame && c->coded_frame->key_frame ) - pkt.flags |= PKT_FLAG_KEY; - pkt.stream_index= video_st->index; - pkt.data= video_outbuf; - pkt.size= out_size; + if ( pkt.pts != AV_NOPTS_VALUE ) + pkt.pts = av_rescale_q( pkt.pts, c->time_base, video_st->time_base ); +#if LIBAVCODEC_VERSION_MAJOR >= 55 + if ( pkt.dts != AV_NOPTS_VALUE ) + pkt.dts = av_rescale_q( pkt.dts, c->time_base, video_st->time_base ); +#endif + pkt.stream_index = video_st->index; // write the compressed frame in the media file ret = av_interleaved_write_frame(oc, &pkt); @@ -1669,10 +1962,15 @@ static void *consumer_thread( void *arg ) // Dual pass logging if ( mlt_properties_get_data( properties, "_logfile", NULL ) && c->stats_out ) fprintf( mlt_properties_get_data( properties, "_logfile", NULL ), "%s", c->stats_out ); + + error_count = 0; } - else if ( out_size < 0 ) + else if ( pkt.size < 0 ) { mlt_log_warning( MLT_CONSUMER_SERVICE( consumer ), "error with video encode %d\n", frame_count ); + if ( ++error_count > 2 ) + goto on_fatal_error; + ret = 0; } } frame_count++; @@ -1683,6 +1981,7 @@ static void *consumer_thread( void *arg ) goto on_fatal_error; } mlt_frame_close( frame ); + frame = NULL; } else { @@ -1701,7 +2000,7 @@ static void *consumer_thread( void *arg ) long passed = time_difference( &ante ); if ( fifo != NULL ) { - long pending = ( ( ( long )sample_fifo_used( fifo ) * 1000 ) / frequency ) * 1000; + long pending = ( ( ( long )sample_fifo_used( fifo ) / sample_bytes * 1000 ) / frequency ) * 1000; passed -= pending; } if ( passed < total_time ) @@ -1723,31 +2022,88 @@ static void *consumer_thread( void *arg ) AVCodecContext *c = audio_st[0]->codec; AVPacket pkt; av_init_packet( &pkt ); + pkt.data = audio_outbuf; pkt.size = 0; - if ( /*( c->capabilities & CODEC_CAP_SMALL_LAST_FRAME ) &&*/ - ( channels * audio_input_frame_size < sample_fifo_used( fifo ) ) ) + if ( fifo && sample_fifo_used( fifo ) > 0 ) { - sample_fifo_fetch( fifo, audio_buf_1, channels * audio_input_frame_size ); - pkt.size = avcodec_encode_audio( c, audio_outbuf, audio_outbuf_size, audio_buf_1 ); + // Drain the MLT FIFO + int samples = FFMIN( FFMIN( channels * audio_input_nb_samples, sample_fifo_used( fifo ) / sample_bytes ), AUDIO_ENCODE_BUFFER_SIZE ); + sample_fifo_fetch( fifo, audio_buf_1, samples * sample_bytes ); + void* p = audio_buf_1; +#if LIBAVUTIL_VERSION_INT >= ((51<<16)+(17<<8)+0) + if ( c->sample_fmt == AV_SAMPLE_FMT_FLTP ) + p = interleaved_to_planar( audio_input_nb_samples, channels, p, sizeof( float ) ); + else if ( c->sample_fmt == AV_SAMPLE_FMT_S16P ) + p = interleaved_to_planar( audio_input_nb_samples, channels, p, sizeof( int16_t ) ); + else if ( c->sample_fmt == AV_SAMPLE_FMT_S32P ) + p = interleaved_to_planar( audio_input_nb_samples, channels, p, sizeof( int32_t ) ); + else if ( c->sample_fmt == AV_SAMPLE_FMT_U8P ) + p = interleaved_to_planar( audio_input_nb_samples, channels, p, sizeof( uint8_t ) ); +#endif +#if LIBAVCODEC_VERSION_MAJOR >= 54 + pkt.size = audio_outbuf_size; + audio_avframe->nb_samples = FFMAX( samples / channels, audio_input_nb_samples ); +#if LIBAVCODEC_VERSION_MAJOR >= 55 + if ( audio_codec_id == AV_CODEC_ID_VORBIS ) + audio_avframe->pts = synth_audio_pts; + synth_audio_pts += audio_avframe->nb_samples; +#endif + avcodec_fill_audio_frame( audio_avframe, c->channels, c->sample_fmt, + (const uint8_t*) p, AUDIO_ENCODE_BUFFER_SIZE, 0 ); + int got_packet = 0; + int ret = avcodec_encode_audio2( c, &pkt, audio_avframe, &got_packet ); + if ( ret < 0 ) + pkt.size = ret; + else if ( !got_packet ) + pkt.size = 0; +#else + c->frame_size = FFMAX( samples / channels, audio_input_nb_samples ); + pkt.size = avcodec_encode_audio( c, audio_outbuf, audio_outbuf_size, p ); +#endif +#if LIBAVUTIL_VERSION_INT >= ((51<<16)+(17<<8)+0) + if ( p != audio_buf_1 ) + mlt_pool_release( p ); +#endif + mlt_log_debug( MLT_CONSUMER_SERVICE( consumer ), "flushing audio size %d\n", pkt.size ); + } + else + { + // Drain the codec + if ( pkt.size <= 0 ) { +#if LIBAVCODEC_VERSION_MAJOR >= 54 + pkt.size = audio_outbuf_size; + int got_packet = 0; + int ret = avcodec_encode_audio2( c, &pkt, NULL, &got_packet ); + if ( ret < 0 ) + pkt.size = ret; + else if ( !got_packet ) + pkt.size = 0; +#else + pkt.size = avcodec_encode_audio( c, audio_outbuf, audio_outbuf_size, NULL ); + pkt.pts = c->coded_frame? c->coded_frame->pts : AV_NOPTS_VALUE; + pkt.flags |= PKT_FLAG_KEY; +#endif + } + mlt_log_debug( MLT_CONSUMER_SERVICE( consumer ), "flushing audio size %d\n", pkt.size ); + if ( pkt.size <= 0 ) + break; } - if ( pkt.size <= 0 ) - pkt.size = avcodec_encode_audio( c, audio_outbuf, audio_outbuf_size, NULL ); - mlt_log_debug( MLT_CONSUMER_SERVICE( consumer ), "flushing audio size %d\n", pkt.size ); - if ( pkt.size <= 0 ) - break; // Write the compressed frame in the media file - if ( c->coded_frame && c->coded_frame->pts != AV_NOPTS_VALUE ) - pkt.pts = av_rescale_q( c->coded_frame->pts, c->time_base, audio_st[0]->time_base ); - pkt.flags |= PKT_FLAG_KEY; + if ( pkt.pts != AV_NOPTS_VALUE ) + pkt.pts = av_rescale_q( pkt.pts, c->time_base, audio_st[0]->time_base ); +#if LIBAVCODEC_VERSION_MAJOR >= 55 + if ( pkt.dts != AV_NOPTS_VALUE ) + pkt.dts = av_rescale_q( pkt.dts, c->time_base, audio_st[0]->time_base ); + if ( pkt.duration > 0 ) + pkt.duration = av_rescale_q( pkt.duration, c->time_base, audio_st[0]->time_base ); +#endif pkt.stream_index = audio_st[0]->index; - pkt.data = audio_outbuf; if ( av_interleaved_write_frame( oc, &pkt ) != 0 ) { - mlt_log_fatal( MLT_CONSUMER_SERVICE( consumer ), "error writing flushed audio frame\n" ); - mlt_events_fire( properties, "consumer-fatal-error", NULL ); - goto on_fatal_error; + mlt_log_warning( MLT_CONSUMER_SERVICE( consumer ), "error writing flushed audio frame\n" ); + break; } } @@ -1757,19 +2113,39 @@ static void *consumer_thread( void *arg ) AVCodecContext *c = video_st->codec; AVPacket pkt; av_init_packet( &pkt ); + if ( c->codec->id == AV_CODEC_ID_RAWVIDEO ) { + pkt.data = NULL; + pkt.size = 0; + } else { + pkt.data = video_outbuf; + pkt.size = video_outbuf_size; + } // Encode the image +#if LIBAVCODEC_VERSION_MAJOR >= 55 + int got_packet = 0; + int ret = avcodec_encode_video2( c, &pkt, NULL, &got_packet ); + if ( ret < 0 ) + pkt.size = ret; + else if ( !got_packet ) + pkt.size = 0; +#else pkt.size = avcodec_encode_video( c, video_outbuf, video_outbuf_size, NULL ); + pkt.pts = c->coded_frame? c->coded_frame->pts : AV_NOPTS_VALUE; + if( c->coded_frame && c->coded_frame->key_frame ) + pkt.flags |= PKT_FLAG_KEY; +#endif mlt_log_debug( MLT_CONSUMER_SERVICE( consumer ), "flushing video size %d\n", pkt.size ); if ( pkt.size <= 0 ) break; - if ( c->coded_frame && c->coded_frame->pts != AV_NOPTS_VALUE ) - pkt.pts= av_rescale_q( c->coded_frame->pts, c->time_base, video_st->time_base ); - if( c->coded_frame && c->coded_frame->key_frame ) - pkt.flags |= PKT_FLAG_KEY; + if ( pkt.pts != AV_NOPTS_VALUE ) + pkt.pts = av_rescale_q( pkt.pts, c->time_base, video_st->time_base ); +#if LIBAVCODEC_VERSION_MAJOR >= 55 + if ( pkt.dts != AV_NOPTS_VALUE ) + pkt.dts = av_rescale_q( pkt.dts, c->time_base, video_st->time_base ); +#endif pkt.stream_index = video_st->index; - pkt.data = video_outbuf; // write the compressed frame in the media file if ( av_interleaved_write_frame( oc, &pkt ) != 0 ) @@ -1785,9 +2161,13 @@ static void *consumer_thread( void *arg ) } on_fatal_error: - + + if ( frame ) + mlt_frame_close( frame ); + // Write the trailer, if any - av_write_trailer( oc ); + if ( frames ) + av_write_trailer( oc ); // close each codec if ( video_st ) @@ -1800,25 +2180,24 @@ on_fatal_error: av_freep( &oc->streams[i] ); // Close the output file - if ( !( fmt->flags & AVFMT_NOFILE ) ) + if ( !( fmt->flags & AVFMT_NOFILE ) && + !mlt_properties_get_int( properties, "redirect" ) ) { #if LIBAVFORMAT_VERSION_MAJOR >= 53 - if ( !mlt_properties_get_int( properties, "redirect" ) ) - avio_close( oc->pb ); -#elif LIBAVFORMAT_VERSION_MAJOR >= 52 - url_fclose( oc->pb ); + if ( oc->pb ) avio_close( oc->pb ); #else - url_fclose( &oc->pb ); + if ( oc->pb ) url_fclose( oc->pb ); #endif } // Clean up input and output frames - if ( output ) - av_free( output->data[0] ); - av_free( output ); - av_free( input->data[0] ); - av_free( input ); + if ( converted_avframe ) + av_free( converted_avframe->data[0] ); + av_free( converted_avframe ); + av_free( video_avframe->data[0] ); + av_free( video_avframe ); av_free( video_outbuf ); + av_free( audio_avframe ); av_free( audio_buf_1 ); av_free( audio_buf_2 ); @@ -1826,8 +2205,6 @@ on_fatal_error: av_free( oc ); // Just in case we terminated on pause - mlt_properties_set_int( properties, "running", 0 ); - mlt_consumer_stopped( consumer ); mlt_properties_close( frame_meta_properties ); @@ -1856,6 +2233,18 @@ on_fatal_error: free( full ); free( cwd ); remove( "x264_2pass.log.temp" ); + + // Recent versions of libavcodec/x264 support passlogfile and need cleanup if specified. + if ( !mlt_properties_get( properties, "_logfilename" ) && + mlt_properties_get( properties, "passlogfile" ) ) + { + file = mlt_properties_get( properties, "passlogfile" ); + remove( file ); + full = malloc( strlen( file ) + strlen( ".mbtree" ) + 1 ); + sprintf( full, "%s.mbtree", file ); + remove( full ); + free( full ); + } } while ( ( frame = mlt_deque_pop_back( queue ) ) )