#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>
#include <unistd.h>
// avformat header files
-#include <avformat.h>
+#include <libavformat/avformat.h>
#ifdef SWSCALE
-#include <swscale.h>
+#include <libswscale/swscale.h>
+#endif
+#include <libavcodec/opt.h>
+#if LIBAVUTIL_VERSION_INT >= ((50<<16)+(8<<8)+0)
+#include <libavutil/pixdesc.h>
#endif
-#include <opt.h>
#if LIBAVUTIL_VERSION_INT < (50<<16)
#define PIX_FMT_RGB32 PIX_FMT_RGBA32
#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
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 )
+void sample_fifo_clear( sample_fifo fifo, double time )
{
- 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 )
+ 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( this->buffer, &this->buffer[ words ], ( this->used - words ) * sizeof( int16_t ) );
- this->used -= words;
- this->time = time;
+ 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 )this->time * 100 ) )
+ else if ( ( int )( ( float )time * 100 ) != ( int )( ( float )fifo->time * 100 ) )
{
- this->used = 0;
- this->time = time;
+ fifo->used = 0;
+ fifo->time = time;
}
}
-void sample_fifo_check( sample_fifo this, double time )
+void sample_fifo_check( sample_fifo fifo, double time )
{
- if ( this->used == 0 )
+ if ( fifo->used == 0 )
{
- if ( ( int )( ( float )time * 100 ) < ( int )( ( float )this->time * 100 ) )
- this->time = time;
+ if ( ( int )( ( float )time * 100 ) < ( int )( ( float )fifo->time * 100 ) )
+ fifo->time = time;
}
}
-void sample_fifo_append( sample_fifo this, int16_t *samples, int count )
+void sample_fifo_append( sample_fifo fifo, int16_t *samples, int count )
{
- if ( ( this->size - this->used ) < count )
+ if ( ( fifo->size - fifo->used ) < count )
{
- this->size += count * 5;
- this->buffer = realloc( this->buffer, this->size * sizeof( int16_t ) );
+ fifo->size += count * 5;
+ fifo->buffer = realloc( fifo->buffer, fifo->size * sizeof( int16_t ) );
}
- memcpy( &this->buffer[ this->used ], samples, count * sizeof( int16_t ) );
- this->used += count;
+ memcpy( &fifo->buffer[ fifo->used ], samples, count * sizeof( int16_t ) );
+ fifo->used += count;
}
-int sample_fifo_used( sample_fifo this )
+int sample_fifo_used( sample_fifo fifo )
{
- return this->used;
+ return fifo->used;
}
-int sample_fifo_fetch( sample_fifo this, int16_t *samples, int count )
+int sample_fifo_fetch( sample_fifo fifo, int16_t *samples, int count )
{
- if ( count > this->used )
- count = this->used;
+ if ( count > fifo->used )
+ 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 ) );
+ memcpy( samples, fifo->buffer, count * sizeof( int16_t ) );
+ fifo->used -= count;
+ memmove( fifo->buffer, &fifo->buffer[ count ], fifo->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( stderr, "%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( stderr, "%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 ( codec->encode && codec->type == CODEC_TYPE_VIDEO )
- 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( stderr, "%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;
mlt_properties_set_int( properties, "running", 1 );
// Create the thread
- pthread_create( thread, NULL, consumer_thread, this );
+ pthread_create( thread, NULL, consumer_thread, consumer );
}
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 );
// Check that we're running
if ( mlt_properties_get_int( properties, "running" ) )
/** 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" );
}
/** 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, int codec_id, int channels )
{
// Get the properties
- mlt_properties properties = MLT_CONSUMER_PROPERTIES( this );
+ mlt_properties properties = MLT_CONSUMER_PROPERTIES( consumer );
// Create a new stream
AVStream *st = av_new_stream( oc, oc->nb_streams );
}
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( 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 );
+ avformat_lock();
+
// Continue if codec found and we can open it
if ( codec != NULL && avcodec_open( c, codec ) >= 0 )
{
{
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, int codec_id )
{
// Get the properties
- mlt_properties properties = MLT_CONSUMER_PROPERTIES( this );
+ mlt_properties properties = MLT_CONSUMER_PROPERTIES( consumer );
// Create a new stream
AVStream *st = av_new_stream( oc, oc->nb_streams );
if ( vpre )
{
mlt_properties p = mlt_properties_load( vpre );
+#ifdef AVDATADIR
+ if ( mlt_properties_count( p ) < 1 )
+ {
+ AVCodec *codec = avcodec_find_encoder( c->codec_id );
+ if ( codec )
+ {
+ char *path = malloc( strlen(AVDATADIR) + strlen(codec->name) + strlen(vpre) + strlen(".ffpreset") + 2 );
+ strcpy( path, AVDATADIR );
+ strcat( path, codec->name );
+ strcat( path, "-" );
+ strcat( path, vpre );
+ strcat( path, ".ffpreset" );
+
+ mlt_properties_close( p );
+ p = mlt_properties_load( path );
+ mlt_properties_debug( p, path, stderr );
+ free( path );
+ }
+ }
+ else
+ {
+ mlt_properties_debug( p, vpre, stderr );
+ }
+#endif
apply_properties( c, p, AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM, 1 );
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 );
+ mlt_properties_set_int( properties, "colorspace", colorspace );
// Set options controlled by MLT
c->width = mlt_properties_get_int( properties, "width" );
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:
+ c->colorspace = AVCOL_SPC_SMPTE170M;
+ break;
+ case 240:
+ c->colorspace = AVCOL_SPC_SMPTE240M;
+ break;
+ case 470:
+ c->colorspace = AVCOL_SPC_BT470BG;
+ break;
+ case 601:
+ c->colorspace = ( 576 % c->height ) ? AVCOL_SPC_SMPTE170M : AVCOL_SPC_BT470BG;
+ break;
+ case 709:
+ c->colorspace = AVCOL_SPC_BT709;
+ break;
+ }
+#endif
if ( mlt_properties_get( properties, "aspect" ) )
{
// 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;
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;
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 );
}
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(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( codec && codec->pix_fmts )
{
}
// Open the codec safely
- return codec != NULL && avcodec_open( video_enc, codec ) >= 0;
+ avformat_lock();
+ int result = codec != NULL && avcodec_open( video_enc, codec ) >= 0;
+ avformat_unlock();
+
+ return result;
}
void close_video(AVFormatContext *oc, AVStream *st)
{
if ( st && st->codec )
+ {
+ avformat_lock();
avcodec_close(st->codec);
+ avformat_unlock();
+ }
}
static inline long time_difference( struct timeval *time1 )
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 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
// Streams
AVStream *video_st = NULL;
AVStream *audio_st[ MAX_AUDIO_STREAMS ];
- int is_audio_initialized = 0;
// Time stamps
double audio_pts = 0;
{
AVCodec *p = avcodec_find_encoder_by_name( acodec );
if ( p != NULL )
+ {
audio_codec_id = p->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" );
+ }
+ }
else
- mlt_log_warning( MLT_CONSUMER_SERVICE( this ), "audio codec %s unrecognised - ignoring\n", acodec );
+ mlt_log_warning( MLT_CONSUMER_SERVICE( consumer ), "audio codec %s unrecognised - ignoring\n", acodec );
}
// Check for video codec overides
if ( p != NULL )
video_codec_id = p->id;
else
- mlt_log_warning( MLT_CONSUMER_SERVICE( this ), "video codec %s unrecognised - ignoring\n", vcodec );
+ mlt_log_warning( MLT_CONSUMER_SERVICE( consumer ), "video codec %s unrecognised - ignoring\n", vcodec );
}
// 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)
+ av_metadata_set2( &oc->metadata, key, mlt_properties_get_value( properties, i ), 0 );
+#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 );
// 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_id );
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_id, 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_id, channels );
total_channels = channels;
}
}
}
apply_properties( oc, properties, AV_OPT_FLAG_ENCODING_PARAM, 0 );
- if ( video_st && !open_video( oc, video_st ) )
+ if ( video_st && !open_video( 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( oc, audio_st[i], audio_outbuf_size,
+ acodec? acodec : NULL );
if ( !audio_input_frame_size )
audio_st[i] = NULL;
}
{
if ( url_fopen( &oc->pb, filename, URL_WRONLY ) < 0 )
{
- mlt_log_error( MLT_CONSUMER_SERVICE( this ), "Could not open '%s'\n", filename );
+ mlt_log_error( MLT_CONSUMER_SERVICE( consumer ), "Could not open '%s'\n", filename );
mlt_properties_set_int( properties, "running", 0 );
}
}
}
else
{
- mlt_log_error( MLT_CONSUMER_SERVICE( this ), "Invalid output format parameters\n" );
+ mlt_log_error( MLT_CONSUMER_SERVICE( consumer ), "Invalid output format parameters\n" );
mlt_properties_set_int( properties, "running", 0 );
}
while( mlt_properties_get_int( properties, "running" ) &&
( !terminated || ( video_st && mlt_deque_count( queue ) ) ) )
{
- frame = mlt_consumer_rt_frame( this );
+ frame = mlt_consumer_rt_frame( consumer );
// Check that we have a frame to work with
if ( frame != NULL )
// Append the samples
sample_fifo_append( fifo, pcm, samples * channels );
total_time += ( samples * 1000000 ) / frequency;
+
+ if ( !video_st )
+ mlt_events_fire( properties, "consumer-frame-show", frame, NULL );
}
// Encode the image
// Get the audio samples
if ( n > 0 )
+ {
sample_fifo_fetch( fifo, audio_buf_1, n );
+ }
+ 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
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 %lld frame pts %lld",
stream->index, pkt.pts, codec->coded_frame->pts );
}
pkt.flags |= PKT_FLAG_KEY;
pkt.stream_index = stream->index;
pkt.data = audio_outbuf;
- if ( pkt.size > 0 && stream->pts.den )
+ 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 )
{
- if ( audio_codec_id == CODEC_ID_VORBIS )
- audio_pts = (double)codec->coded_frame->pts * av_q2d( stream->time_base );
- else
- audio_pts = (double)stream->pts.val * av_q2d( stream->time_base );
+ 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;
- mlt_events_fire( properties, "consumer-frame-show", frame, NULL );
-
mlt_frame_get_image( frame, &image, &img_fmt, &img_width, &img_height, 0 );
q = image;
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;
+#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, SWS_FAST_BILINEAR, NULL, NULL, NULL);
+ width, height, video_st->codec->pix_fmt, flags, NULL, NULL, NULL);
sws_scale( context, input->data, input->linesize, 0, height,
output->data, output->linesize);
sws_freeContext( context );
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 ( 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 %lld frame pts %lld", 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 );
}
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 %lld (%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 %lld (%f) ", video_st->pts.val, video_pts );
+ mlt_log_debug( MLT_CONSUMER_SERVICE( consumer ), "\n" );
}
if ( real_time_output == 1 && frames % 2 == 0 )
}
}
-#ifdef FLUSH
- if ( ! real_time_output )
+ // Flush the encoder buffers
+ if ( real_time_output <= 0 )
{
// Flush audio fifo
- if ( audio_st && audio_st->codec->frame_size > 1 ) for (;;)
+ // TODO: flush all audio streams
+ if ( audio_st[0] && audio_st[0]->codec->frame_size > 1 ) for (;;)
{
- AVCodecContext *c = audio_st->codec;
+ AVCodecContext *c = audio_st[0]->codec;
AVPacket pkt;
av_init_packet( &pkt );
pkt.size = 0;
if ( /*( c->capabilities & CODEC_CAP_SMALL_LAST_FRAME ) &&*/
( channels * audio_input_frame_size < sample_fifo_used( fifo ) ) )
{
- sample_fifo_fetch( fifo, buffer, channels * audio_input_frame_size );
- pkt.size = avcodec_encode_audio( c, audio_outbuf, audio_outbuf_size, buffer );
+ 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 );
}
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->time_base );
+ pkt.pts = av_rescale_q( c->coded_frame->pts, c->time_base, audio_st[0]->time_base );
pkt.flags |= PKT_FLAG_KEY;
- pkt.stream_index = audio_st->index;
+ pkt.stream_index = audio_st[0]->index;
pkt.data = audio_outbuf;
if ( av_interleaved_write_frame( oc, &pkt ) != 0 )
{
- fprintf( stderr, "%s: Error while 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( 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 while writing flushing 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 )
+ fprintf( mlt_properties_get_data( properties, "_logfile", NULL ), "%s", c->stats_out );
}
}
-#endif
+on_fatal_error:
+
// Write the trailer, if any
av_write_trailer( oc );
- // XXX ugly hack to prevent x264 from crashing on multi-threaded encoding
- int pass = mlt_properties_get_int( properties, "pass" );
- int thread_count = mlt_properties_get_int( properties, "threads" );
- if ( thread_count == 0 && getenv( "MLT_AVFORMAT_THREADS" ) )
- thread_count = atoi( getenv( "MLT_AVFORMAT_THREADS" ) );
- int multithreaded_x264 = ( video_codec_id == CODEC_ID_H264 && thread_count > 1 );
-
// close each codec
- if ( video_st && !multithreaded_x264 )
+ if ( video_st )
close_video(oc, video_st);
for ( i = 0; i < MAX_AUDIO_STREAMS && audio_st[i]; i++ )
close_audio( oc, audio_st[i] );
// 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 ( pass == 2 )
+ if ( mlt_properties_get_int( properties, "pass" ) > 1 )
{
// Remove the dual pass log file
if ( mlt_properties_get( properties, "_logfilename" ) )
/** 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