// avformat header files
#include <libavformat/avformat.h>
+#include <libavformat/avio.h>
#ifdef SWSCALE
#include <libswscale/swscale.h>
#endif
#define PIX_FMT_YUYV422 PIX_FMT_YUV422
#endif
-#if LIBAVCODEC_VERSION_MAJOR > 52
+#if LIBAVCODEC_VERSION_MAJOR >= 53
#include <libavutil/opt.h>
#define CODEC_TYPE_VIDEO AVMEDIA_TYPE_VIDEO
#define CODEC_TYPE_AUDIO AVMEDIA_TYPE_AUDIO
const char *opt_name = mlt_properties_get_name( properties, i );
const AVOption *opt = av_find_opt( obj, opt_name, NULL, flags, flags );
- if ( opt != NULL )
+ // If 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 ) ) ) )
+ opt = av_find_opt( obj, ++opt_name, NULL, flags, flags );
+ // Apply option if found
+ if ( opt )
#if LIBAVCODEC_VERSION_INT >= ((52<<16)+(7<<8)+0)
av_set_string3( obj, opt_name, mlt_properties_get_value( properties, i), alloc, NULL );
#elif LIBAVCODEC_VERSION_INT >= ((51<<16)+(59<<8)+0)
else
codec = avcodec_find_encoder( c->codec_id );
-#if LIBAVCODEC_VERSION_MAJOR > 52
+#if LIBAVCODEC_VERSION_MAJOR >= 53
// Process properties as AVOptions on the AVCodec
if ( codec && codec->priv_class )
{
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 )
fclose( f );
logbuffer[size] = '\0';
c->stats_in = logbuffer;
- mlt_properties_set_data( properties, "_logbuffer", logbuffer, 0, ( mlt_destructor )av_free, NULL );
}
}
}
return picture;
}
-
+
static int open_video( mlt_properties properties, AVFormatContext *oc, AVStream *st, const char *codec_name )
{
// Get the codec
else
codec = avcodec_find_encoder( video_enc->codec_id );
-#if LIBAVCODEC_VERSION_MAJOR > 52
+#if LIBAVCODEC_VERSION_MAJOR >= 53
// Process properties as AVOptions on the AVCodec
if ( codec && codec->priv_class )
{
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.
*/
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.
+ 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 );
total_channels = channels;
}
}
+ mlt_properties_set_int( properties, "channels", total_channels );
// Set the parameters (even though we have none...)
if ( av_set_parameters(oc, NULL) >= 0 )
{
mlt_properties p = mlt_properties_load( fpre );
apply_properties( oc, p, AV_OPT_FLAG_ENCODING_PARAM );
-#if LIBAVFORMAT_VERSION_MAJOR > 52
+#if LIBAVFORMAT_VERSION_MAJOR >= 53
if ( oc->oformat && oc->oformat->priv_class && oc->priv_data )
apply_properties( oc->priv_data, p, AV_OPT_FLAG_ENCODING_PARAM );
#endif
mlt_properties_close( p );
}
apply_properties( oc, properties, AV_OPT_FLAG_ENCODING_PARAM );
-#if LIBAVFORMAT_VERSION_MAJOR > 52
+#if LIBAVFORMAT_VERSION_MAJOR >= 53
if ( oc->oformat && oc->oformat->priv_class && oc->priv_data )
apply_properties( oc->priv_data, properties, AV_OPT_FLAG_ENCODING_PARAM );
#endif
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 )
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 )
if ( !terminated && audio_st[0] )
{
samples = mlt_sample_calculator( fps, frequency, count ++ );
+ channels = total_channels;
mlt_frame_get_audio( frame, (void**) &pcm, &aud_fmt, &frequency, &channels, &samples );
// Save the audio channel remap properties for later
mlt_deque_push_back( queue, frame );
else
mlt_frame_close( frame );
+ frame = NULL;
}
// While we have stuff to process, process...
goto on_fatal_error;
}
mlt_frame_close( frame );
+ frame = NULL;
}
else
{
// 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)
+ {
+#if LIBAVFORMAT_VERSION_MAJOR >= 53
+ if ( !mlt_properties_get_int( properties, "redirect" ) )
+ avio_close( oc->pb );
+#elif LIBAVFORMAT_VERSION_MAJOR >= 52
url_fclose( oc->pb );
#else
url_fclose( &oc->pb );
#endif
+ }
// Clean up input and output frames
if ( output )
projects / mlt / blobdiff