/*
* 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 <charles.yates@pandora.be>
+ * Author: Dan Dennedy <dan@dennedy.org>
* Much code borrowed from ffmpeg.c: Copyright (c) 2000-2003 Fabrice Bellard
*
* This library is free software; you can redistribute it and/or
#include <framework/mlt_frame.h>
#include <framework/mlt_profile.h>
#include <framework/mlt_log.h>
+#include <framework/mlt_events.h>
// System header files
#include <stdio.h>
// avformat header files
#include <libavformat/avformat.h>
+#include <libavformat/avio.h>
#ifdef SWSCALE
#include <libswscale/swscale.h>
#endif
-#include <libavcodec/opt.h>
#if LIBAVUTIL_VERSION_INT >= ((50<<16)+(8<<8)+0)
#include <libavutil/pixdesc.h>
#endif
+#include <libavutil/mathematics.h>
+
+#if LIBAVUTIL_VERSION_INT >= ((50<<16)+(38<<8)+0)
+# include <libavutil/samplefmt.h>
+#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 >= 53
+#include <libavutil/opt.h>
+#define CODEC_TYPE_VIDEO AVMEDIA_TYPE_VIDEO
+#define CODEC_TYPE_AUDIO AVMEDIA_TYPE_AUDIO
+#define PKT_FLAG_KEY AV_PKT_FLAG_KEY
+#else
+#include <libavcodec/opt.h>
+#endif
+
#define MAX_AUDIO_STREAMS (8)
#define AUDIO_ENCODE_BUFFER_SIZE (48000 * 2 * MAX_AUDIO_STREAMS)
-
-void avformat_lock( );
-void avformat_unlock( );
+#define AUDIO_BUFFER_SIZE (1024 * 42)
+#define VIDEO_BUFFER_SIZE (2048 * 1024)
//
// 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;
sample_fifo sample_fifo_init( int frequency, int channels )
{
- sample_fifo this = calloc( 1, sizeof( sample_fifo_s ) );
- this->frequency = frequency;
- this->channels = channels;
- return this;
+ sample_fifo fifo = calloc( 1, sizeof( sample_fifo_s ) );
+ fifo->frequency = frequency;
+ fifo->channels = channels;
+ return fifo;
}
-// sample_fifo_clear and check are temporarily aborted (not working as intended)
-
-void sample_fifo_clear( sample_fifo this, double time )
+// 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 )
{
- int words = ( float )( time - this->time ) * this->frequency * this->channels;
- if ( ( int )( ( float )time * 100 ) < ( int )( ( float )this->time * 100 ) && this->used > words && words > 0 )
+ if ( ( fifo->size - fifo->used ) < count )
{
- memmove( this->buffer, &this->buffer[ words ], ( this->used - words ) * sizeof( int16_t ) );
- this->used -= words;
- this->time = time;
+ fifo->size += count * 5;
+ fifo->buffer = realloc( fifo->buffer, fifo->size );
}
- else if ( ( int )( ( float )time * 100 ) != ( int )( ( float )this->time * 100 ) )
- {
- this->used = 0;
- this->time = time;
- }
-}
-void sample_fifo_check( sample_fifo this, double time )
-{
- if ( this->used == 0 )
- {
- if ( ( int )( ( float )time * 100 ) < ( int )( ( float )this->time * 100 ) )
- this->time = time;
- }
+ memcpy( &fifo->buffer[ fifo->used ], samples, count );
+ fifo->used += count;
}
-void sample_fifo_append( sample_fifo this, int16_t *samples, int count )
+int sample_fifo_used( sample_fifo fifo )
{
- if ( ( this->size - this->used ) < count )
- {
- this->size += count * 5;
- this->buffer = realloc( this->buffer, this->size * sizeof( int16_t ) );
- }
-
- memcpy( &this->buffer[ this->used ], samples, count * sizeof( int16_t ) );
- this->used += count;
+ return fifo->used;
}
-int sample_fifo_used( sample_fifo this )
+int sample_fifo_fetch( sample_fifo fifo, uint8_t *samples, int count )
{
- return this->used;
-}
+ if ( count > fifo->used )
+ count = fifo->used;
-int sample_fifo_fetch( sample_fifo this, int16_t *samples, int count )
-{
- if ( count > this->used )
- count = this->used;
+ memcpy( samples, fifo->buffer, count );
+ fifo->used -= count;
+ memmove( fifo->buffer, &fifo->buffer[ count ], fifo->used );
- memcpy( samples, this->buffer, count * sizeof( int16_t ) );
- this->used -= count;
- memmove( this->buffer, &this->buffer[ count ], this->used * sizeof( int16_t ) );
-
- this->time += ( double )count / this->channels / this->frequency;
+ fifo->time += ( double )count / fifo->channels / fifo->frequency;
return count;
}
-void sample_fifo_close( sample_fifo this )
+void sample_fifo_close( sample_fifo fifo )
{
- free( this->buffer );
- free( this );
+ free( fifo->buffer );
+ free( fifo );
}
// Forward references.
-static int consumer_start( mlt_consumer this );
-static int consumer_stop( mlt_consumer this );
-static int consumer_is_stopped( mlt_consumer this );
+static int consumer_start( mlt_consumer consumer );
+static int consumer_stop( mlt_consumer consumer );
+static int consumer_is_stopped( mlt_consumer consumer );
static void *consumer_thread( void *arg );
-static void consumer_close( mlt_consumer this );
+static void consumer_close( mlt_consumer consumer );
/** Initialise the consumer.
*/
mlt_consumer consumer_avformat_init( mlt_profile profile, char *arg )
{
// Allocate the consumer
- mlt_consumer this = mlt_consumer_new( profile );
+ mlt_consumer consumer = mlt_consumer_new( profile );
// If memory allocated and initialises without error
- if ( this != NULL )
+ if ( consumer != NULL )
{
// Get properties from the consumer
- mlt_properties properties = MLT_CONSUMER_PROPERTIES( this );
+ mlt_properties properties = MLT_CONSUMER_PROPERTIES( consumer );
// Assign close callback
- this->close = consumer_close;
+ consumer->close = consumer_close;
// Interpret the argument
if ( arg != NULL )
mlt_properties_set_int( properties, "prefill", 1 );
// Set up start/stop/terminated callbacks
- this->start = consumer_start;
- this->stop = consumer_stop;
- this->is_stopped = consumer_is_stopped;
+ consumer->start = consumer_start;
+ consumer->stop = consumer_stop;
+ consumer->is_stopped = consumer_is_stopped;
+
+ mlt_events_register( properties, "consumer-fatal-error", NULL );
}
- // Return this
- return this;
+ // Return consumer
+ return consumer;
}
/** Start the consumer.
*/
-static int consumer_start( mlt_consumer this )
+static int consumer_start( mlt_consumer consumer )
{
// Get the properties
- mlt_properties properties = MLT_CONSUMER_PROPERTIES( this );
+ mlt_properties properties = MLT_CONSUMER_PROPERTIES( consumer );
int error = 0;
// Report information about available muxers and codecs as YAML Tiny
char *s = mlt_properties_get( properties, "f" );
if ( s && strcmp( s, "list" ) == 0 )
{
- fprintf( stderr, "---\nformats:\n" );
+ mlt_properties doc = mlt_properties_new();
+ mlt_properties formats = mlt_properties_new();
+ char key[20];
AVOutputFormat *format = NULL;
+
+ mlt_properties_set_data( properties, "f", formats, 0, (mlt_destructor) mlt_properties_close, NULL );
+ mlt_properties_set_data( doc, "formats", formats, 0, NULL, NULL );
while ( ( format = av_oformat_next( format ) ) )
- fprintf( stderr, " - %s\n", format->name );
- fprintf( stderr, "...\n" );
+ {
+ snprintf( key, sizeof(key), "%d", mlt_properties_count( formats ) );
+ mlt_properties_set( formats, key, format->name );
+ }
+ fprintf( stdout, "%s", mlt_properties_serialise_yaml( doc ) );
+ mlt_properties_close( doc );
error = 1;
}
s = mlt_properties_get( properties, "acodec" );
if ( s && strcmp( s, "list" ) == 0 )
{
- fprintf( stderr, "---\naudio_codecs:\n" );
+ mlt_properties doc = mlt_properties_new();
+ mlt_properties codecs = mlt_properties_new();
+ char key[20];
AVCodec *codec = NULL;
+
+ 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 ( codec->encode && codec->type == CODEC_TYPE_AUDIO )
- fprintf( stderr, " - %s\n", codec->name );
- fprintf( stderr, "...\n" );
+ {
+ snprintf( key, sizeof(key), "%d", mlt_properties_count( codecs ) );
+ mlt_properties_set( codecs, key, codec->name );
+ }
+ fprintf( stdout, "%s", mlt_properties_serialise_yaml( doc ) );
+ mlt_properties_close( doc );
error = 1;
}
s = mlt_properties_get( properties, "vcodec" );
if ( s && strcmp( s, "list" ) == 0 )
{
- fprintf( stderr, "---\nvideo_codecs:\n" );
+ mlt_properties doc = mlt_properties_new();
+ mlt_properties codecs = mlt_properties_new();
+ char key[20];
AVCodec *codec = NULL;
+
+ 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 >= ((53<<16)+(34<<8)+0)
+ if ( (codec->encode || codec->encode2) && codec->type == CODEC_TYPE_VIDEO )
+#else
if ( codec->encode && codec->type == CODEC_TYPE_VIDEO )
- fprintf( stderr, " - %s\n", codec->name );
- fprintf( stderr, "...\n" );
+#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 ) );
+ mlt_properties_close( doc );
error = 1;
}
}
else
{
- mlt_log_warning( MLT_CONSUMER_SERVICE( this ), "Invalid size property %s - ignoring.\n", size );
+ mlt_log_warning( MLT_CONSUMER_SERVICE( consumer ), "Invalid size property %s - ignoring.\n", size );
}
}
// 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( this ) );
+ mlt_profile profile = mlt_service_profile( MLT_CONSUMER_SERVICE( consumer ) );
if ( profile )
{
profile->width = width;
// Assign the thread to properties
mlt_properties_set_data( properties, "thread", thread, sizeof( pthread_t ), free, NULL );
+ // Create the thread
+ pthread_create( thread, NULL, consumer_thread, consumer );
+
// Set the running state
mlt_properties_set_int( properties, "running", 1 );
-
- // Create the thread
- pthread_create( thread, NULL, consumer_thread, this );
}
return error;
}
/** Stop the consumer.
*/
-static int consumer_stop( mlt_consumer this )
+static int consumer_stop( mlt_consumer consumer )
{
// Get the properties
- mlt_properties properties = MLT_CONSUMER_PROPERTIES( this );
+ 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( properties, "thread", NULL );
}
return 0;
/** Determine if the consumer is stopped.
*/
-static int consumer_is_stopped( mlt_consumer this )
+static int consumer_is_stopped( mlt_consumer consumer )
{
// Get the properties
- mlt_properties properties = MLT_CONSUMER_PROPERTIES( this );
+ mlt_properties properties = MLT_CONSUMER_PROPERTIES( consumer );
return !mlt_properties_get_int( properties, "running" );
}
/** 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 );
+ 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 );
- if ( opt != NULL )
-#if LIBAVCODEC_VERSION_INT >= ((52<<16)+(7<<8)+0)
- av_set_string3( obj, opt_name, mlt_properties_get( properties, opt_name), alloc, NULL );
+#endif
+
+ // 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( properties, opt_name), alloc );
+ av_set_string2( obj, opt_name, mlt_properties_get_value( properties, i), alloc );
#else
- av_set_string( obj, opt_name, mlt_properties_get( properties, opt_name) );
+ av_set_string( obj, opt_name, mlt_properties_get_value( properties, i) );
+#endif
+ }
+}
+
+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 this, 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( this );
+ 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 )
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
if ( thread_count == 0 && getenv( "MLT_AVFORMAT_THREADS" ) )
thread_count = atoi( getenv( "MLT_AVFORMAT_THREADS" ) );
if ( thread_count > 1 )
- avcodec_thread_init( c, thread_count );
+ c->thread_count = thread_count;
#endif
if (oc->oformat->flags & AVFMT_GLOBALHEADER)
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
c->channels = channels;
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 ) );
+#endif
}
else
{
- mlt_log_error( MLT_CONSUMER_SERVICE( this ), "Could not allocate a stream for audio\n" );
+ mlt_log_error( MLT_CONSUMER_SERVICE( consumer ), "Could not allocate a stream for audio\n" );
}
return st;
}
-static int open_audio( AVFormatContext *oc, AVStream *st, int audio_outbuf_size )
+static int open_audio( mlt_properties properties, AVFormatContext *oc, AVStream *st, int audio_outbuf_size, const char *codec_name )
{
// We will return the audio input size from here
int audio_input_frame_size = 0;
AVCodecContext *c = st->codec;
// Find the encoder
- AVCodec *codec = avcodec_find_encoder( c->codec_id );
+ AVCodec *codec;
+ if ( codec_name )
+ codec = avcodec_find_encoder_by_name( codec_name );
+ else
+ codec = avcodec_find_encoder( c->codec_id );
+
+#if LIBAVCODEC_VERSION_INT >= ((52<<16)+(122<<8)+0)
+ // Process properties as AVOptions on the AVCodec
+ if ( codec && codec->priv_class )
+ {
+ char *apre = mlt_properties_get( properties, "apre" );
+ if ( !c->priv_data && codec->priv_data_size )
+ {
+ c->priv_data = av_mallocz( codec->priv_data_size );
+ *(const AVClass **) c->priv_data = codec->priv_class;
+// av_opt_set_defaults( c );
+ }
+ 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 );
+ mlt_properties_close( p );
+ }
+ 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
{
mlt_log_warning( NULL, "%s: Unable to encode audio - disabling audio output.\n", __FILE__ );
}
-
- avformat_unlock();
return audio_input_frame_size;
}
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 this, 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( this );
+ 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 )
{
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
if ( thread_count == 0 && getenv( "MLT_AVFORMAT_THREADS" ) )
thread_count = atoi( getenv( "MLT_AVFORMAT_THREADS" ) );
if ( thread_count > 1 )
- avcodec_thread_init( c, thread_count );
-
+#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 )
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 );
}
}
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
// 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( this ) );
+ mlt_profile profile = mlt_service_profile( MLT_CONSUMER_SERVICE( consumer ) );
if ( profile )
{
profile->display_aspect_num = rational.num;
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
int start, end, q;
int e = sscanf( rc_override, "%d,%d,%d", &start, &end, &q );
if ( e != 3 )
- mlt_log_warning( MLT_CONSUMER_SERVICE( this ), "Error parsing rc_override\n" );
+ mlt_log_warning( MLT_CONSUMER_SERVICE( consumer ), "Error parsing rc_override\n" );
c->rc_override = av_realloc( c->rc_override, sizeof( RcOverride ) * ( i + 1 ) );
c->rc_override[i].start_frame = start;
c->rc_override[i].end_frame = end;
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;
fseek( f, 0, SEEK_SET );
logbuffer = av_malloc( size + 1 );
if ( !logbuffer )
- mlt_log_fatal( MLT_CONSUMER_SERVICE( this ), "Could not allocate log buffer\n" );
+ 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 );
}
}
}
}
else
{
- mlt_log_error( MLT_CONSUMER_SERVICE( this ), "Could not allocate a stream for video\n" );
+ mlt_log_error( MLT_CONSUMER_SERVICE( consumer ), "Could not allocate a stream for video\n" );
}
return st;
return picture;
}
-
-static int open_video(AVFormatContext *oc, AVStream *st)
+
+static int open_video( mlt_properties properties, AVFormatContext *oc, AVStream *st, const char *codec_name )
{
// Get the codec
AVCodecContext *video_enc = st->codec;
// find the video encoder
- AVCodec *codec = avcodec_find_encoder( video_enc->codec_id );
+ AVCodec *codec;
+ if ( codec_name )
+ codec = avcodec_find_encoder_by_name( codec_name );
+ else
+ codec = avcodec_find_encoder( video_enc->codec_id );
+
+#if LIBAVCODEC_VERSION_INT >= ((52<<16)+(122<<8)+0)
+ // Process properties as AVOptions on the AVCodec
+ if ( codec && codec->priv_class )
+ {
+ char *vpre = mlt_properties_get( properties, "vpre" );
+ if ( !video_enc->priv_data && codec->priv_data_size )
+ {
+ video_enc->priv_data = av_mallocz( codec->priv_data_size );
+ *(const AVClass **) video_enc->priv_data = codec->priv_class;
+// av_opt_set_defaults( video_enc );
+ }
+ 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 );
+ mlt_properties_close( p );
+ }
+ apply_properties( video_enc->priv_data, properties, AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM );
+ }
+#endif
if( codec && codec->pix_fmts )
{
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;
}
{
if ( st && st->codec )
{
- avformat_lock();
+ av_freep( &st->codec->stats_in );
avcodec_close(st->codec);
- avformat_unlock();
}
}
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.
*/
static void *consumer_thread( void *arg )
{
// Map the argument to the object
- mlt_consumer this = arg;
+ mlt_consumer consumer = arg;
// Get the properties
- mlt_properties properties = MLT_CONSUMER_PROPERTIES( this );
+ mlt_properties properties = MLT_CONSUMER_PROPERTIES( consumer );
// Get the terminate on pause property
int terminate_on_pause = mlt_properties_get_int( properties, "terminate_on_pause" );
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 = ( 1024 * 42 );
+ int audio_outbuf_size = AUDIO_BUFFER_SIZE;
uint8_t *audio_outbuf = av_malloc( audio_outbuf_size );
int audio_input_frame_size = 0;
// AVFormat video buffer and frame count
int frame_count = 0;
- int video_outbuf_size = ( 1024 * 1024 );
+ int video_outbuf_size = VIDEO_BUFFER_SIZE;
uint8_t *video_outbuf = av_malloc( video_outbuf_size );
// Used for the frame properties
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
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;
audio_codec_id = CODEC_ID_NONE;
else if ( acodec )
{
- AVCodec *p = avcodec_find_encoder_by_name( acodec );
- if ( p != NULL )
- audio_codec_id = p->id;
+ 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" ) )
+ {
+ 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
- mlt_log_warning( MLT_CONSUMER_SERVICE( this ), "audio codec %s unrecognised - ignoring\n", acodec );
+ {
+ audio_codec_id = CODEC_ID_NONE;
+ 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
video_codec_id = CODEC_ID_NONE;
else if ( vcodec )
{
- AVCodec *p = avcodec_find_encoder_by_name( vcodec );
- if ( p != NULL )
- video_codec_id = p->id;
+ video_codec = avcodec_find_encoder_by_name( vcodec );
+ if ( video_codec )
+ {
+ video_codec_id = video_codec->id;
+ }
else
- mlt_log_warning( MLT_CONSUMER_SERVICE( this ), "video codec %s unrecognised - ignoring\n", vcodec );
+ {
+ video_codec_id = CODEC_ID_NONE;
+ 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)
+ for ( i = 0; i < mlt_properties_count( properties ); i++ )
+ {
+ char *name = mlt_properties_get_name( properties, i );
+ if ( name && !strncmp( name, "meta.attr.", 10 ) )
+ {
+ char *key = strdup( name + 10 );
+ char *markup = strrchr( key, '.' );
+ if ( markup && !strcmp( markup, ".markup") )
+ {
+ 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
+ }
+ free( key );
+ }
+ }
+#else
char *tmp = NULL;
int 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 )
- video_st = add_video_stream( this, oc, video_codec_id );
+ video_st = add_video_stream( consumer, oc, video_codec );
if ( audio_codec_id != CODEC_ID_NONE )
{
int is_multi = 0;
{
is_multi = 1;
total_channels += j;
- audio_st[i] = add_audio_stream( this, 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( this, 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
if ( fpre )
{
mlt_properties p = mlt_properties_load( fpre );
- apply_properties( oc, p, AV_OPT_FLAG_ENCODING_PARAM, 1 );
+ 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 );
+#endif
mlt_properties_close( p );
}
- apply_properties( oc, properties, AV_OPT_FLAG_ENCODING_PARAM, 0 );
+ 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 );
+#endif
- if ( video_st && !open_video( oc, video_st ) )
+ 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( oc, audio_st[i], audio_outbuf_size );
+ audio_input_frame_size = open_audio( properties, oc, audio_st[i], audio_outbuf_size,
+ acodec? acodec : NULL );
if ( !audio_input_frame_size )
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 ( url_fopen( &oc->pb, filename, URL_WRONLY ) < 0 )
+#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( this ), "Could not open '%s'\n", filename );
- mlt_properties_set_int( properties, "running", 0 );
+ mlt_log_error( MLT_CONSUMER_SERVICE( consumer ), "Could not open '%s'\n", filename );
+ 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( this ), "Invalid output format parameters\n" );
- mlt_properties_set_int( properties, "running", 0 );
+ mlt_log_error( MLT_CONSUMER_SERVICE( consumer ), "Invalid output format parameters\n" );
+ mlt_events_fire( properties, "consumer-fatal-error", NULL );
+ goto on_fatal_error;
}
+#endif
// Allocate picture
if ( video_st )
// 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 );
while( mlt_properties_get_int( properties, "running" ) &&
( !terminated || ( video_st && mlt_deque_count( queue ) ) ) )
{
- frame = mlt_consumer_rt_frame( this );
+ if ( !frame )
+ frame = mlt_consumer_rt_frame( consumer );
// Check that we have a frame to work with
if ( frame != NULL )
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." );
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 );
}
// Encode the image
mlt_deque_push_back( queue, frame );
else
mlt_frame_close( frame );
+ frame = NULL;
}
// While we have stuff to process, process...
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 )
+ {
+ // This prevents an infinite loop when some versions of vorbis do not
+ // increment pts when encoding silence.
+ audio_pts = video_pts;
+ break;
+ }
else
+ {
memset( audio_buf_1, 0, AUDIO_ENCODE_BUFFER_SIZE );
+ }
samples = n / channels;
// For each output stream
// 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
{
// 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;
}
}
}
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
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( this ), "audio stream %d pkt pts %lld frame pts %lld",
+ mlt_log_debug( MLT_CONSUMER_SERVICE( consumer ), "audio stream %d pkt pts %"PRId64" frame pts %"PRId64,
stream->index, pkt.pts, codec->coded_frame->pts );
}
pkt.flags |= PKT_FLAG_KEY;
if ( pkt.size > 0 )
{
if ( av_interleaved_write_frame( oc, &pkt ) )
- mlt_log_error( MLT_CONSUMER_SERVICE( this ), "error writing audio frame %d\n", frames - 1 );
+ {
+ mlt_log_fatal( MLT_CONSUMER_SERVICE( consumer ), "error writing audio frame\n" );
+ mlt_events_fire( properties, "consumer-fatal-error", NULL );
+ goto on_fatal_error;
+ }
}
- mlt_log_debug( MLT_CONSUMER_SERVICE( this ), " frame_size %d\n", codec->frame_size );
+ 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 );
// Write video
if ( mlt_deque_count( queue ) )
{
- int out_size, ret;
+ int out_size, ret = 0;
AVCodecContext *c;
frame = mlt_deque_pop_front( queue );
if ( mlt_properties_get_int( frame_properties, "rendered" ) )
{
int i = 0;
- int j = 0;
uint8_t *p;
uint8_t *q;
for ( i = 0; i < height; i ++ )
{
p = input->data[ 0 ] + i * input->linesize[ 0 ];
- j = width;
- while( j -- )
- {
- *p ++ = *q ++;
- *p ++ = *q ++;
- }
+ memcpy( p, q, width * 2 );
+ q += width * 2;
}
// Do the colour space conversion
#ifdef SWSCALE
- int flags = SWS_BILINEAR;
+ int flags = SWS_BICUBIC;
#ifdef USE_MMX
flags |= SWS_CPU_CAPS_MMX;
#endif
#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, input->data, input->linesize, 0, height,
+ sws_scale( context, (const uint8_t* const*) input->data, input->linesize, 0, height,
output->data, output->linesize);
sws_freeContext( context );
#else
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" );
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( this ), "video pkt pts %lld frame pts %lld", pkt.pts, c->coded_frame->pts );
+ 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;
// write the compressed frame in the media file
ret = av_interleaved_write_frame(oc, &pkt);
- mlt_log_debug( MLT_CONSUMER_SERVICE( this ), " frame_size %d\n", c->frame_size );
+ mlt_log_debug( MLT_CONSUMER_SERVICE( consumer ), " frame_size %d\n", c->frame_size );
video_pts = (double)video_st->pts.val * av_q2d( video_st->time_base );
// Dual pass logging
}
else if ( out_size < 0 )
{
- mlt_log_warning( MLT_CONSUMER_SERVICE( this ), "error with video encode %d\n", frame_count );
+ mlt_log_warning( MLT_CONSUMER_SERVICE( consumer ), "error with video encode %d\n", frame_count );
}
}
frame_count++;
+ if ( ret )
+ {
+ mlt_log_fatal( MLT_CONSUMER_SERVICE( consumer ), "error writing video frame\n" );
+ mlt_events_fire( properties, "consumer-fatal-error", NULL );
+ goto on_fatal_error;
+ }
mlt_frame_close( frame );
+ frame = NULL;
}
else
{
}
}
if ( audio_st[0] )
- mlt_log_debug( MLT_CONSUMER_SERVICE( this ), "audio pts %lld (%f) ", audio_st[0]->pts.val, audio_pts );
+ mlt_log_debug( MLT_CONSUMER_SERVICE( consumer ), "audio pts %"PRId64" (%f) ", audio_st[0]->pts.val, audio_pts );
if ( video_st )
- mlt_log_debug( MLT_CONSUMER_SERVICE( this ), "video pts %lld (%f) ", video_st->pts.val, video_pts );
- mlt_log_debug( MLT_CONSUMER_SERVICE( this ), "\n" );
+ mlt_log_debug( MLT_CONSUMER_SERVICE( consumer ), "video pts %"PRId64" (%f) ", video_st->pts.val, video_pts );
+ mlt_log_debug( MLT_CONSUMER_SERVICE( consumer ), "\n" );
}
if ( real_time_output == 1 && frames % 2 == 0 )
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 )
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 );
- mlt_log_debug( MLT_CONSUMER_SERVICE( this ), "flushing audio size %d\n", pkt.size );
+ mlt_log_debug( MLT_CONSUMER_SERVICE( consumer ), "flushing audio size %d\n", pkt.size );
if ( pkt.size <= 0 )
break;
pkt.data = audio_outbuf;
if ( av_interleaved_write_frame( oc, &pkt ) != 0 )
{
- mlt_log_error( MLT_CONSUMER_SERVICE( this ), "%s: error writing flushed audio frame\n", __FILE__ );
- break;
+ 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;
}
}
// Encode the image
pkt.size = avcodec_encode_video( c, video_outbuf, video_outbuf_size, NULL );
- mlt_log_debug( MLT_CONSUMER_SERVICE( this ), "flushing video size %d\n", pkt.size );
+ mlt_log_debug( MLT_CONSUMER_SERVICE( consumer ), "flushing video size %d\n", pkt.size );
if ( pkt.size <= 0 )
break;
// write the compressed frame in the media file
if ( av_interleaved_write_frame( oc, &pkt ) != 0 )
{
- mlt_log_error( MLT_CONSUMER_SERVICE(this), "error writing flushed video frame\n" );
- break;
+ mlt_log_fatal( MLT_CONSUMER_SERVICE(consumer), "error writing flushed video frame\n" );
+ mlt_events_fire( properties, "consumer-fatal-error", NULL );
+ goto on_fatal_error;
}
// Dual pass logging
if ( mlt_properties_get_data( properties, "_logfile", NULL ) && c->stats_out )
}
}
+on_fatal_error:
+
// Write the trailer, if any
- av_write_trailer( oc );
+ if ( frames )
+ av_write_trailer( oc );
// close each codec
if ( video_st )
av_freep( &oc->streams[i] );
// Close the output file
- if ( !( fmt->flags & AVFMT_NOFILE ) )
-#if 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 )
av_free( oc );
// Just in case we terminated on pause
- mlt_properties_set_int( properties, "running", 0 );
-
- mlt_consumer_stopped( this );
+ mlt_consumer_stopped( consumer );
mlt_properties_close( frame_meta_properties );
if ( mlt_properties_get_int( properties, "pass" ) > 1 )
remove( "x264_2pass.log.temp" );
}
+ while ( ( frame = mlt_deque_pop_back( queue ) ) )
+ mlt_frame_close( frame );
+
return NULL;
}
/** Close the consumer.
*/
-static void consumer_close( mlt_consumer this )
+static void consumer_close( mlt_consumer consumer )
{
// Stop the consumer
- mlt_consumer_stop( this );
+ mlt_consumer_stop( consumer );
// Close the parent
- mlt_consumer_close( this );
+ mlt_consumer_close( consumer );
// Free the memory
- free( this );
+ free( consumer );
}
projects / mlt / blobdiff