X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Favformat%2Fconsumer_avformat.c;h=640e2b00bd63b21132a5fb01c9f3d534f3eb0ec3;hb=1a6470a0344e61c9561a637e370eb36bb0daf2d3;hp=bdb002c34ccf29967d9a5b57f064d6e9a8f88e9c;hpb=0bf5e11aac5560e0f7e76aabf3297c7f8cb93373;p=mlt diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c index bdb002c3..640e2b00 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 @@ -37,19 +38,30 @@ // avformat header files #include +#include #ifdef SWSCALE #include #endif #if LIBAVUTIL_VERSION_INT >= ((50<<16)+(8<<8)+0) #include #endif +#include + +#if LIBAVUTIL_VERSION_INT >= ((50<<16)+(38<<8)+0) +# include +#else +# define AV_SAMPLE_FMT_NONE SAMPLE_FMT_NONE +# define AV_SAMPLE_FMT_S16 SAMPLE_FMT_S16 +# define AV_SAMPLE_FMT_S32 SAMPLE_FMT_S32 +# define AV_SAMPLE_FMT_FLT SAMPLE_FMT_FLT +#endif #if LIBAVUTIL_VERSION_INT < (50<<16) #define PIX_FMT_RGB32 PIX_FMT_RGBA32 #define PIX_FMT_YUYV422 PIX_FMT_YUV422 #endif -#if LIBAVCODEC_VERSION_MAJOR > 52 +#if LIBAVCODEC_VERSION_MAJOR >= 53 #include #define CODEC_TYPE_VIDEO AVMEDIA_TYPE_VIDEO #define CODEC_TYPE_AUDIO AVMEDIA_TYPE_AUDIO @@ -63,16 +75,13 @@ #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; @@ -89,42 +98,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; } @@ -133,14 +116,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; @@ -254,7 +237,13 @@ 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 LIBAVCODEC_VERSION_INT >= ((54<<16)+(56<<8)+100) + 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 ); @@ -274,7 +263,13 @@ 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 LIBAVCODEC_VERSION_INT >= ((54<<16)+(56<<8)+100) + 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 ); @@ -351,11 +346,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; } @@ -367,18 +362,18 @@ 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 ); } return 0; @@ -397,17 +392,37 @@ static int consumer_is_stopped( mlt_consumer consumer ) /** Process properties as AVOptions and apply to AV context obj */ -static void apply_properties( void *obj, mlt_properties properties, int flags, int alloc ) +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) + // 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 ); +#elif 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 ); @@ -417,16 +432,87 @@ static void apply_properties( void *obj, mlt_properties properties, int flags, i } } +static int get_mlt_audio_format( int av_sample_fmt ) +{ + switch ( av_sample_fmt ) + { + 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_S32P: + return mlt_audio_s32; + case AV_SAMPLE_FMT_FLTP: + return mlt_audio_float; +#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; +#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_S16: + case AV_SAMPLE_FMT_S32: + case AV_SAMPLE_FMT_FLT: +#if LIBAVUTIL_VERSION_INT >= ((51<<16)+(17<<8)+0) + 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; +} + /** Add an audio output stream */ -static AVStream *add_audio_stream( mlt_consumer consumer, AVFormatContext *oc, int codec_id, int channels ) +static AVStream *add_audio_stream( mlt_consumer consumer, AVFormatContext *oc, AVCodec *codec, int channels ) { // Get the properties 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 ) @@ -434,11 +520,15 @@ static AVStream *add_audio_stream( mlt_consumer consumer, AVFormatContext *oc, i AVCodecContext *c = st->codec; // Establish defaults from AVOptions +#if LIBAVCODEC_VERSION_MAJOR >= 53 + avcodec_get_context_defaults3( c, codec ); +#else avcodec_get_context_defaults2( c, CODEC_TYPE_AUDIO ); +#endif - c->codec_id = codec_id; + 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 @@ -468,16 +558,19 @@ static AVStream *add_audio_stream( mlt_consumer consumer, AVFormatContext *oc, i if ( apre ) { mlt_properties p = mlt_properties_load( apre ); - apply_properties( c, p, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM, 1 ); + apply_properties( c, p, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM ); mlt_properties_close( p ); } - apply_properties( c, properties, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM, 0 ); + 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 ) { 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 @@ -487,7 +580,11 @@ static AVStream *add_audio_stream( mlt_consumer consumer, AVFormatContext *oc, i if ( mlt_properties_get( properties, "alang" ) != NULL ) #if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(43<<8)+0) +#if LIBAVUTIL_VERSION_INT >= ((51<<16)+(8<<8)+0) + av_dict_set( &oc->metadata, "language", mlt_properties_get( properties, "alang" ), 0 ); +#else av_metadata_set2( &oc->metadata, "language", mlt_properties_get( properties, "alang" ), 0 ); +#endif #else strncpy( st->language, mlt_properties_get( properties, "alang" ), sizeof( st->language ) ); @@ -516,7 +613,7 @@ static int open_audio( mlt_properties properties, AVFormatContext *oc, AVStream else codec = avcodec_find_encoder( c->codec_id ); -#if LIBAVCODEC_VERSION_MAJOR > 52 +#if LIBAVCODEC_VERSION_INT >= ((52<<16)+(122<<8)+0) // Process properties as AVOptions on the AVCodec if ( codec && codec->priv_class ) { @@ -530,17 +627,19 @@ static int open_audio( mlt_properties properties, AVFormatContext *oc, AVStream if ( apre ) { mlt_properties p = mlt_properties_load( apre ); - apply_properties( c->priv_data, p, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM, 1 ); + apply_properties( c->priv_data, p, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM ); mlt_properties_close( p ); } - apply_properties( c->priv_data, properties, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM, 0 ); + 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 @@ -573,9 +672,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; } @@ -583,23 +681,23 @@ 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 */ -static AVStream *add_video_stream( mlt_consumer consumer, AVFormatContext *oc, int codec_id ) +static AVStream *add_video_stream( mlt_consumer consumer, AVFormatContext *oc, AVCodec *codec ) { // Get the properties 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 ) { @@ -607,9 +705,13 @@ static AVStream *add_video_stream( mlt_consumer consumer, AVFormatContext *oc, i AVCodecContext *c = st->codec; // Establish defaults from AVOptions +#if LIBAVCODEC_VERSION_MAJOR >= 53 + avcodec_get_context_defaults3( c, codec ); +#else avcodec_get_context_defaults2( c, CODEC_TYPE_VIDEO ); +#endif - c->codec_id = codec_id; + c->codec_id = codec->id; c->codec_type = CODEC_TYPE_VIDEO; // Setup multi-threading @@ -617,8 +719,12 @@ static AVStream *add_video_stream( mlt_consumer consumer, AVFormatContext *oc, i 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 ) @@ -639,7 +745,8 @@ static AVStream *add_video_stream( mlt_consumer consumer, AVFormatContext *oc, i mlt_properties_close( p ); p = mlt_properties_load( path ); - mlt_properties_debug( p, path, stderr ); + if ( mlt_properties_count( p ) > 0 ) + mlt_properties_debug( p, path, stderr ); free( path ); } } @@ -648,12 +755,12 @@ static AVStream *add_video_stream( mlt_consumer consumer, AVFormatContext *oc, i mlt_properties_debug( p, vpre, stderr ); } #endif - apply_properties( c, p, AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM, 1 ); + apply_properties( c, p, AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM ); mlt_properties_close( p ); } int colorspace = mlt_properties_get_int( properties, "colorspace" ); mlt_properties_set( properties, "colorspace", NULL ); - apply_properties( c, properties, AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM, 0 ); + apply_properties( c, properties, AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM ); mlt_properties_set_int( properties, "colorspace", colorspace ); // Set options controlled by MLT @@ -734,7 +841,10 @@ static AVStream *add_video_stream( mlt_consumer consumer, AVFormatContext *oc, i 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 @@ -799,7 +909,7 @@ static AVStream *add_video_stream( mlt_consumer consumer, AVFormatContext *oc, i 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 != CODEC_ID_H264 && ( c->flags & ( CODEC_FLAG_PASS1 | CODEC_FLAG_PASS2 ) ) ) { char logfilename[1024]; FILE *f; @@ -835,12 +945,14 @@ static AVStream *add_video_stream( mlt_consumer consumer, AVFormatContext *oc, i 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 ); } } } @@ -880,7 +992,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 @@ -893,7 +1005,7 @@ static int open_video( mlt_properties properties, AVFormatContext *oc, AVStream else codec = avcodec_find_encoder( video_enc->codec_id ); -#if LIBAVCODEC_VERSION_MAJOR > 52 +#if LIBAVCODEC_VERSION_INT >= ((52<<16)+(122<<8)+0) // Process properties as AVOptions on the AVCodec if ( codec && codec->priv_class ) { @@ -907,10 +1019,10 @@ static int open_video( mlt_properties properties, AVFormatContext *oc, AVStream if ( vpre ) { mlt_properties p = mlt_properties_load( vpre ); - apply_properties( video_enc->priv_data, p, AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM, 1 ); + apply_properties( video_enc->priv_data, p, AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM ); mlt_properties_close( p ); } - apply_properties( video_enc->priv_data, properties, AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM, 0 ); + apply_properties( video_enc->priv_data, properties, AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM ); } #endif @@ -926,10 +1038,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; } @@ -938,9 +1051,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(); } } @@ -951,6 +1063,19 @@ static inline long time_difference( struct timeval *time1 ) return time2.tv_sec * 1000000 + time2.tv_usec - time1->tv_sec * 1000000 - time1->tv_usec; } +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 ); + 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] ); +} + + /** The main thread - the argument is simply the consumer. */ @@ -982,11 +1107,10 @@ 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 @@ -1016,8 +1140,8 @@ static void *consumer_thread( void *arg ) mlt_image_format img_fmt = mlt_image_yuv422; // 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 @@ -1045,6 +1169,8 @@ static void *consumer_thread( void *arg ) char *format = mlt_properties_get( properties, "f" ); char *vcodec = mlt_properties_get( properties, "vcodec" ); char *acodec = mlt_properties_get( properties, "acodec" ); + AVCodec *audio_codec = NULL; + AVCodec *video_codec = NULL; // Used to store and override codec ids int audio_codec_id; @@ -1096,14 +1222,19 @@ static void *consumer_thread( void *arg ) audio_codec_id = CODEC_ID_NONE; else if ( acodec ) { - AVCodec *p = avcodec_find_encoder_by_name( acodec ); - if ( p != NULL ) + audio_codec = avcodec_find_encoder_by_name( acodec ); + if ( audio_codec ) { - audio_codec_id = p->id; + audio_codec_id = audio_codec->id; if ( audio_codec_id == 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" ) ) + { + mlt_properties_set( properties, "astrict", "experimental" ); } } else @@ -1112,16 +1243,20 @@ static void *consumer_thread( void *arg ) mlt_log_warning( MLT_CONSUMER_SERVICE( consumer ), "audio codec %s unrecognised - ignoring\n", acodec ); } } + else + { + audio_codec = avcodec_find_encoder( audio_codec_id ); + } // Check for video codec overides 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 ) + video_codec = avcodec_find_encoder_by_name( vcodec ); + if ( video_codec ) { - video_codec_id = p->id; + video_codec_id = video_codec->id; } else { @@ -1129,6 +1264,10 @@ static void *consumer_thread( void *arg ) mlt_log_warning( MLT_CONSUMER_SERVICE( consumer ), "video codec %s unrecognised - ignoring\n", vcodec ); } } + else + { + video_codec = avcodec_find_encoder( video_codec_id ); + } // Write metadata #if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(31<<8)+0) @@ -1144,7 +1283,11 @@ static void *consumer_thread( void *arg ) markup[0] = '\0'; if ( !strstr( key, ".stream." ) ) #if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(43<<8)+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_set2( &oc->metadata, key, mlt_properties_get_value( properties, i ), 0 ); +#endif #else av_metadata_set( &oc->metadata, key, mlt_properties_get_value( properties, i ) ); #endif @@ -1181,9 +1324,24 @@ static void *consumer_thread( void *arg ) 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 ) - video_st = add_video_stream( consumer, oc, video_codec_id ); + video_st = add_video_stream( consumer, oc, video_codec ); if ( audio_codec_id != CODEC_ID_NONE ) { int is_multi = 0; @@ -1198,21 +1356,36 @@ static void *consumer_thread( void *arg ) { is_multi = 1; total_channels += j; - audio_st[i] = add_audio_stream( consumer, oc, audio_codec_id, j ); + audio_st[i] = add_audio_stream( consumer, oc, audio_codec, j ); } } // single track if ( !is_multi ) { - audio_st[0] = add_audio_stream( consumer, oc, audio_codec_id, channels ); + audio_st[0] = add_audio_stream( consumer, oc, audio_codec, channels ); total_channels = channels; } } + 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 @@ -1220,17 +1393,17 @@ static void *consumer_thread( void *arg ) if ( fpre ) { mlt_properties p = mlt_properties_load( fpre ); - apply_properties( oc, p, AV_OPT_FLAG_ENCODING_PARAM, 1 ); -#if LIBAVFORMAT_VERSION_MAJOR > 52 + apply_properties( oc, p, AV_OPT_FLAG_ENCODING_PARAM ); +#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(110<<8)+0) if ( oc->oformat && oc->oformat->priv_class && oc->priv_data ) - apply_properties( oc->priv_data, p, AV_OPT_FLAG_ENCODING_PARAM, 1 ); + 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, 0 ); -#if LIBAVFORMAT_VERSION_MAJOR > 52 + apply_properties( oc, properties, AV_OPT_FLAG_ENCODING_PARAM ); +#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(110<<8)+0) if ( oc->oformat && oc->oformat->priv_class && oc->priv_data ) - apply_properties( oc->priv_data, properties, AV_OPT_FLAG_ENCODING_PARAM, 1 ); + apply_properties( oc->priv_data, properties, AV_OPT_FLAG_ENCODING_PARAM ); #endif if ( video_st && !open_video( properties, oc, video_st, vcodec? vcodec : NULL ) ) @@ -1240,32 +1413,76 @@ static void *consumer_thread( void *arg ) audio_input_frame_size = open_audio( properties, oc, audio_st[i], audio_outbuf_size, acodec? acodec : NULL ); if ( !audio_input_frame_size ) + { + // 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 + if ( mlt_properties_get_int( properties, "redirect" ) ) + { + int buffer_size = 32768; + unsigned char *buffer = av_malloc( buffer_size ); +#if LIBAVFORMAT_VERSION_MAJOR >= 53 + AVIOContext* io = avio_alloc_context( buffer, buffer_size, 1, properties, NULL, mlt_write, NULL ); +#else + ByteIOContext* io = av_alloc_put_byte( buffer, buffer_size, 1, properties, NULL, mlt_write, NULL ); +#endif + if ( buffer && io ) + { + oc->pb = io; +#if LIBAVFORMAT_VERSION_MAJOR >= 53 + oc->flags |= AVFMT_FLAG_CUSTOM_IO; +#endif + mlt_properties_set_data( properties, "avio_buffer", buffer, buffer_size, av_free, NULL ); + mlt_properties_set_data( properties, "avio_context", io, 0, av_free, NULL ); + mlt_events_register( properties, "avformat-write", (mlt_transmitter) write_transmitter ); + } + else + { + av_free( buffer ); + mlt_log_error( MLT_CONSUMER_SERVICE(consumer), "failed to setup output redirection\n" ); + } + } // Open the output file, if needed - if ( !( fmt->flags & AVFMT_NOFILE ) ) + else if ( !( fmt->flags & AVFMT_NOFILE ) ) { -#if LIBAVFORMAT_VERSION_MAJOR > 52 +#if LIBAVFORMAT_VERSION_MAJOR >= 53 if ( avio_open( &oc->pb, filename, AVIO_FLAG_WRITE ) < 0 ) #else if ( url_fopen( &oc->pb, filename, URL_WRONLY ) < 0 ) #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" ) ) +#if LIBAVFORMAT_VERSION_INT >= ((53<<16)+(2<<8)+0) + avformat_write_header( oc, NULL ); +#else av_write_header( oc ); +#endif } +#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 // Allocate picture if ( video_st ) @@ -1273,7 +1490,10 @@ static void *consumer_thread( void *arg ) // Last check - need at least one stream if ( !audio_st[0] && !video_st ) - mlt_properties_set_int( properties, "running", 0 ); + { + mlt_events_fire( properties, "consumer-fatal-error", NULL ); + goto on_fatal_error; + } // Get the starting time (can ignore the times above) gettimeofday( &ante, NULL ); @@ -1282,7 +1502,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 ) @@ -1300,7 +1521,8 @@ static void *consumer_thread( void *arg ) if ( !terminated && audio_st[0] ) { samples = mlt_sample_calculator( fps, frequency, count ++ ); - mlt_frame_get_audio( frame, (void**) &pcm, &aud_fmt, &frequency, &channels, &samples ); + channels = total_channels; + 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." ); @@ -1311,15 +1533,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 ); } @@ -1329,6 +1552,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... @@ -1338,15 +1562,15 @@ 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_frame_size ) < 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_frame_size, 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 ) { @@ -1373,7 +1597,7 @@ static void *consumer_thread( void *arg ) // 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 ); + pkt.size = avcodec_encode_audio( codec, audio_outbuf, audio_outbuf_size, (short*) audio_buf_1 ); } else { @@ -1422,14 +1646,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; } } } @@ -1440,7 +1664,7 @@ static void *consumer_thread( void *arg ) dest_offset += current_channels; } } - pkt.size = avcodec_encode_audio( codec, audio_outbuf, audio_outbuf_size, audio_buf_2 ); + pkt.size = avcodec_encode_audio( codec, audio_outbuf, audio_outbuf_size, (short*) audio_buf_2 ); } // Write the compressed frame in the media file @@ -1509,7 +1733,7 @@ static void *consumer_thread( void *arg ) // Do the colour space conversion #ifdef SWSCALE - int flags = SWS_BILINEAR; + int flags = SWS_BICUBIC; #ifdef USE_MMX flags |= SWS_CPU_CAPS_MMX; #endif @@ -1572,7 +1796,7 @@ static void *consumer_thread( void *arg ) else { // Set the quality - output->quality = video_st->quality; + output->quality = c->global_quality; // Set frame interlace hints output->interlaced_frame = !mlt_properties_get_int( frame_properties, "progressive" ); @@ -1619,6 +1843,7 @@ static void *consumer_thread( void *arg ) goto on_fatal_error; } mlt_frame_close( frame ); + frame = NULL; } else { @@ -1637,7 +1862,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 ) @@ -1661,11 +1886,11 @@ static void *consumer_thread( void *arg ) av_init_packet( &pkt ); pkt.size = 0; - if ( /*( c->capabilities & CODEC_CAP_SMALL_LAST_FRAME ) &&*/ - ( channels * audio_input_frame_size < sample_fifo_used( fifo ) ) ) + if ( fifo && + ( channels * audio_input_frame_size < sample_fifo_used( fifo ) / sample_bytes ) ) { - 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 ); + sample_fifo_fetch( fifo, audio_buf_1, channels * audio_input_frame_size * sample_bytes ); + pkt.size = avcodec_encode_audio( c, audio_outbuf, audio_outbuf_size, (short*) audio_buf_1 ); } if ( pkt.size <= 0 ) pkt.size = avcodec_encode_audio( c, audio_outbuf, audio_outbuf_size, NULL ); @@ -1723,7 +1948,8 @@ static void *consumer_thread( void *arg ) on_fatal_error: // Write the trailer, if any - av_write_trailer( oc ); + if ( frames ) + av_write_trailer( oc ); // close each codec if ( video_st ) @@ -1736,14 +1962,17 @@ on_fatal_error: av_freep( &oc->streams[i] ); // Close the output file - if ( !( fmt->flags & AVFMT_NOFILE ) ) -#if LIBAVFORMAT_VERSION_MAJOR > 52 - avio_close( oc->pb ); -#elif LIBAVFORMAT_VERSION_INT >= ((52<<16)+(0<<8)+0) - url_fclose( oc->pb ); + if ( !( fmt->flags & AVFMT_NOFILE ) && + !mlt_properties_get_int( properties, "redirect" ) ) + { +#if LIBAVFORMAT_VERSION_MAJOR >= 53 + if ( oc->pb ) avio_close( oc->pb ); +#elif LIBAVFORMAT_VERSION_MAJOR >= 52 + if ( oc->pb ) url_fclose( oc->pb ); #else url_fclose( &oc->pb ); #endif + } // Clean up input and output frames if ( output ) @@ -1759,8 +1988,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 ); @@ -1791,6 +2018,9 @@ on_fatal_error: remove( "x264_2pass.log.temp" ); } + while ( ( frame = mlt_deque_pop_back( queue ) ) ) + mlt_frame_close( frame ); + return NULL; }