// mlt Header files
#include <framework/mlt_consumer.h>
#include <framework/mlt_frame.h>
+#include <framework/mlt_profile.h>
// System header files
#include <stdio.h>
#endif
#include <opt.h>
+#if LIBAVUTIL_VERSION_INT < (50<<16)
+#define PIX_FMT_RGB32 PIX_FMT_RGBA32
+#define PIX_FMT_YUYV422 PIX_FMT_YUV422
+#endif
+
//
// This structure should be extended and made globally available in mlt
//
// Default to separate processing threads for producer and consumer with no frame dropping!
mlt_properties_set_int( properties, "real_time", -1 );
+ mlt_properties_set_int( properties, "prefill", 1 );
// Set up start/stop/terminated callbacks
this->start = consumer_start;
{
// Get the properties
mlt_properties properties = MLT_CONSUMER_PROPERTIES( this );
+ 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" );
+ AVOutputFormat *format = NULL;
+ while ( ( format = av_oformat_next( format ) ) )
+ fprintf( stderr, " - %s\n", format->name );
+ fprintf( stderr, "...\n" );
+ error = 1;
+ }
+ s = mlt_properties_get( properties, "acodec" );
+ if ( s && strcmp( s, "list" ) == 0 )
+ {
+ fprintf( stderr, "---\naudio_codecs:\n" );
+ AVCodec *codec = NULL;
+ while ( ( codec = av_codec_next( codec ) ) )
+ if ( codec->encode && codec->type == CODEC_TYPE_AUDIO )
+ fprintf( stderr, " - %s\n", codec->name );
+ fprintf( stderr, "...\n" );
+ error = 1;
+ }
+ s = mlt_properties_get( properties, "vcodec" );
+ if ( s && strcmp( s, "list" ) == 0 )
+ {
+ fprintf( stderr, "---\nvideo_codecs:\n" );
+ AVCodec *codec = NULL;
+ while ( ( codec = av_codec_next( codec ) ) )
+ if ( codec->encode && codec->type == CODEC_TYPE_VIDEO )
+ fprintf( stderr, " - %s\n", codec->name );
+ fprintf( stderr, "...\n" );
+ error = 1;
+ }
// Check that we're not already running
- if ( !mlt_properties_get_int( properties, "running" ) )
+ if ( !error && !mlt_properties_get_int( properties, "running" ) )
{
// Allocate a thread
pthread_t *thread = calloc( 1, sizeof( pthread_t ) );
// Create the thread
pthread_create( thread, NULL, consumer_thread, this );
}
- return 0;
+ return error;
}
/** Stop the consumer.
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 LIBAVCODEC_VERSION_INT >= ((51<<16)+(59<<8)+0)
+#if LIBAVCODEC_VERSION_INT >= ((52<<16)+(7<<8)+0)
+ av_set_string3( obj, opt_name, mlt_properties_get( properties, opt_name), 0, NULL );
+#elif LIBAVCODEC_VERSION_INT >= ((51<<16)+(59<<8)+0)
av_set_string2( obj, opt_name, mlt_properties_get( properties, opt_name), 0 );
#else
av_set_string( obj, opt_name, mlt_properties_get( properties, opt_name) );
c->height = mlt_properties_get_int( properties, "height" );
c->time_base.num = mlt_properties_get_int( properties, "frame_rate_den" );
c->time_base.den = mlt_properties_get_int( properties, "frame_rate_num" );
- st->time_base = c->time_base;
+ if ( st->time_base.den == 0 )
+ st->time_base = c->time_base;
c->pix_fmt = pix_fmt ? avcodec_get_pix_fmt( pix_fmt ) : PIX_FMT_YUV420P;
- if ( codec_id == CODEC_ID_DVVIDEO )
- {
- // Compensate for FFmpeg's notion of DV aspect ratios, which are
- // based upon a width of 704. Since we do not have a normaliser
- // that crops (nor is cropping 720 wide ITU-R 601 video always desirable)
- // we just coerce the values to facilitate a passive behaviour through
- // the rescale normaliser when using equivalent producers and consumers.
- // = display_aspect / (width * height)
- double ar = mlt_properties_get_double( properties, "aspect_ratio" );
- if ( ar == 8.0/9.0 ) // 4:3 NTSC
- {
- c->sample_aspect_ratio.num = 10;
- c->sample_aspect_ratio.den = 11;
- }
- else if ( ar == 16.0/15.0 ) // 4:3 PAL
- {
- c->sample_aspect_ratio.num = 159;
- c->sample_aspect_ratio.den = 54;
- }
- else if ( ar == 32.0/27.0 ) // 16:9 NTSC
- {
- c->sample_aspect_ratio.num = 40;
- c->sample_aspect_ratio.den = 33;
- }
- else // 16:9 PAL
- {
- c->sample_aspect_ratio.num = 118;
- c->sample_aspect_ratio.den = 81;
- }
- }
- else if ( mlt_properties_get( properties, "aspect" ) )
+ if ( mlt_properties_get( properties, "aspect" ) )
{
// "-aspect" on ffmpeg command line is display aspect ratio
double ar = mlt_properties_get_double( properties, "aspect" );
profile->sample_aspect_den = rational.den;
mlt_properties_set_double( properties, "aspect_ratio", mlt_profile_sar( profile ) );
}
-
}
else
{
if ( mlt_properties_get_int( properties, "progressive" ) == 0 &&
mlt_properties_get_int( properties, "deinterlace" ) == 0 )
{
- if ( mlt_properties_get_int( properties, "ildct" ) )
+ if ( ! mlt_properties_get( properties, "ildct" ) || mlt_properties_get_int( properties, "ildct" ) )
c->flags |= CODEC_FLAG_INTERLACED_DCT;
- if ( mlt_properties_get_int( properties, "ilme" ) )
+ if ( ! mlt_properties_get( properties, "ilme" ) || mlt_properties_get_int( properties, "ilme" ) )
c->flags |= CODEC_FLAG_INTERLACED_ME;
}
// Need two av pictures for converting
AVFrame *output = NULL;
- AVFrame *input = alloc_picture( PIX_FMT_YUV422, width, height );
+ AVFrame *input = alloc_picture( PIX_FMT_YUYV422, width, height );
// For receiving images from an mlt_frame
uint8_t *image;
// Determine the format
AVOutputFormat *fmt = NULL;
- char *filename = mlt_properties_get( properties, "target" );
+ const char *filename = mlt_properties_get( properties, "target" );
char *format = mlt_properties_get( properties, "f" );
char *vcodec = mlt_properties_get( properties, "vcodec" );
char *acodec = mlt_properties_get( properties, "acodec" );
video_codec_id = fmt->video_codec;
// Check for audio codec overides
- if ( acodec != NULL )
+ if ( ( acodec && strcmp( "acodec", "none" ) == 0 ) || mlt_properties_get_int( properties, "an" ) )
+ audio_codec_id = CODEC_ID_NONE;
+ else if ( acodec )
{
AVCodec *p = avcodec_find_encoder_by_name( acodec );
if ( p != NULL )
}
// Check for video codec overides
- if ( vcodec != NULL )
+ 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 )
snprintf( oc->filename, sizeof(oc->filename), "%s", filename );
// Add audio and video streams
- if ( fmt->video_codec != CODEC_ID_NONE )
+ if ( video_codec_id != CODEC_ID_NONE )
video_st = add_video_stream( this, oc, video_codec_id );
- if ( fmt->audio_codec != CODEC_ID_NONE )
+ if ( audio_codec_id != CODEC_ID_NONE )
audio_st = add_audio_stream( this, oc, audio_codec_id );
// Set the parameters (even though we have none...)
// Do the colour space conversion
#ifdef SWSCALE
- struct SwsContext *context = sws_getContext( width, height, PIX_FMT_YUV422,
+ struct SwsContext *context = sws_getContext( width, height, PIX_FMT_YUYV422,
width, height, video_st->codec->pix_fmt, SWS_FAST_BILINEAR, NULL, NULL, NULL);
sws_scale( context, input->data, input->linesize, 0, height,
output->data, output->linesize);
sws_freeContext( context );
#else
- img_convert( ( AVPicture * )output, video_st->codec->pix_fmt, ( AVPicture * )input, PIX_FMT_YUV422, width, height );
+ img_convert( ( AVPicture * )output, video_st->codec->pix_fmt, ( AVPicture * )input, PIX_FMT_YUYV422, width, height );
#endif
// Apply the alpha if applicable
- if ( video_st->codec->pix_fmt == PIX_FMT_RGBA32 )
+ if ( video_st->codec->pix_fmt == PIX_FMT_RGB32 )
{
uint8_t *alpha = mlt_frame_get_alpha_mask( frame );
register int n;
// Remove the x264 dual pass logs
char *cwd = getcwd( NULL, 0 );
- char *file = "x264_2pass.log";
+ const char *file = "x264_2pass.log";
char *full = malloc( strlen( cwd ) + strlen( file ) + 2 );
sprintf( full, "%s/%s", cwd, file );
remove( full );
projects / melted / blobdiff