/*
* producer_avformat.c -- avformat producer
- * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
+ * Copyright (C) 2003-2009 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_deque.h>
+#include <framework/mlt_factory.h>
+#include <framework/mlt_cache.h>
// ffmpeg Header files
-#include <avformat.h>
-#include <opt.h>
+#include <libavformat/avformat.h>
+#include <libavcodec/opt.h>
#ifdef SWSCALE
-# include <swscale.h>
+# include <libswscale/swscale.h>
#endif
#if (LIBAVCODEC_VERSION_INT >= ((51<<16)+(71<<8)+0))
# include "audioconvert.h"
#endif
+#ifdef VDPAU
+#include <libavcodec/vdpau.h>
+#endif
// System header files
#include <stdlib.h>
#include <string.h>
#include <pthread.h>
+#include <limits.h>
#if LIBAVUTIL_VERSION_INT < (50<<16)
#define PIX_FMT_RGB32 PIX_FMT_RGBA32
#define POSITION_INITIAL (-2)
#define POSITION_INVALID (-1)
+#define MAX_AUDIO_STREAMS (10)
+#define MAX_VDPAU_SURFACES (10)
+
void avformat_lock( );
void avformat_unlock( );
struct producer_avformat_s
{
- struct mlt_producer_s parent;
+ mlt_producer parent;
AVFormatContext *dummy_context;
AVFormatContext *audio_format;
- AVFormatContext *video_context;
- AVCodecContext *audio_codec;
- AVCodec *video_codec;
+ AVFormatContext *video_format;
+ AVCodecContext *audio_codec[ MAX_AUDIO_STREAMS ];
+ AVCodecContext *video_codec;
AVFrame *av_frame;
- ReSampleContext *audio_resample;
+ ReSampleContext *audio_resample[ MAX_AUDIO_STREAMS ];
mlt_position audio_expected;
mlt_position video_expected;
int audio_index;
int current_position;
int got_picture;
int top_field_first;
- int16_t *audio_buffer;
- int16_t *decode_buffer;
- int audio_used;
+ int16_t *audio_buffer[ MAX_AUDIO_STREAMS ];
+ size_t audio_buffer_size[ MAX_AUDIO_STREAMS ];
+ int16_t *decode_buffer[ MAX_AUDIO_STREAMS ];
+ int audio_used[ MAX_AUDIO_STREAMS ];
+ int audio_streams;
+ int audio_max_stream;
+ int total_channels;
+ int max_channel;
+ int max_frequency;
+ unsigned int invalid_pts_counter;
+ double resample_factor;
+ mlt_cache image_cache;
+ int colorspace;
+#ifdef VDPAU
+ struct
+ {
+ // from FFmpeg
+ struct vdpau_render_state render_states[MAX_VDPAU_SURFACES];
+
+ // internal
+ mlt_deque deque;
+ int b_age;
+ int ip_age[2];
+ int is_decoded;
+ uint8_t *buffer;
+ } *vdpau;
+#endif
};
typedef struct producer_avformat_s *producer_avformat;
// Forward references.
static int producer_open( producer_avformat this, mlt_profile profile, char *file );
static int producer_get_frame( mlt_producer this, mlt_frame_ptr frame, int index );
-static void producer_format_close( void *context );
+static void producer_avformat_close( producer_avformat );
static void producer_close( mlt_producer parent );
+#ifdef VDPAU
+#include "vdpau.c"
+#endif
+
/** Constructor for libavformat.
*/
-mlt_producer producer_avformat_init( mlt_profile profile, char *file )
+mlt_producer producer_avformat_init( mlt_profile profile, const char *service, char *file )
{
int skip = 0;
if ( !skip && file )
{
// Construct the producer
+ mlt_producer producer = calloc( 1, sizeof( struct mlt_producer_s ) );
producer_avformat this = calloc( 1, sizeof( struct producer_avformat_s ) );
// Initialise it
- if ( mlt_producer_init( &this->parent, this ) == 0 )
+ if ( mlt_producer_init( producer, this ) == 0 )
{
- mlt_producer producer = &this->parent;
+ this->parent = producer;
// Get the properties
mlt_properties properties = MLT_PRODUCER_PROPERTIES( producer );
// Register our get_frame implementation
producer->get_frame = producer_get_frame;
-
- // Open the file
- if ( producer_open( this, profile, file ) != 0 )
+
+ if ( strcmp( service, "avformat-novalidate" ) )
{
- // Clean up
- mlt_producer_close( producer );
- this = NULL;
+ // Open the file
+ if ( producer_open( this, profile, file ) != 0 )
+ {
+ // Clean up
+ mlt_producer_close( producer );
+ producer = NULL;
+ }
+ else
+ {
+ // Close the file to release resources for large playlists - reopen later as needed
+ avformat_lock();
+ if ( this->dummy_context )
+ av_close_input_file( this->dummy_context );
+ this->dummy_context = NULL;
+ if ( this->audio_format )
+ av_close_input_file( this->audio_format );
+ this->audio_format = NULL;
+ if ( this->video_format )
+ av_close_input_file( this->video_format );
+ this->video_format = NULL;
+ avformat_unlock();
+
+ // Default the user-selectable indices from the auto-detected indices
+ mlt_properties_set_int( properties, "audio_index", this->audio_index );
+ mlt_properties_set_int( properties, "video_index", this->video_index );
+
+#ifdef VDPAU
+ mlt_service_cache_set_size( MLT_PRODUCER_SERVICE(producer), "producer_avformat", 5 );
+#endif
+ mlt_service_cache_put( MLT_PRODUCER_SERVICE(producer), "producer_avformat", this, 0, (mlt_destructor) producer_avformat_close );
+ }
}
else
{
- // Close the file to release resources for large playlists - reopen later as needed
- producer_format_close( this->dummy_context );
- this->dummy_context = NULL;
- producer_format_close( this->audio_format );
- this->audio_format = NULL;
- producer_format_close( this->video_context );
- this->video_context = NULL;
-
- // Default the user-selectable indices from the auto-detected indices
- mlt_properties_set_int( properties, "audio_index", this->audio_index );
- mlt_properties_set_int( properties, "video_index", this->video_index );
+#ifdef VDPAU
+ mlt_service_cache_set_size( MLT_PRODUCER_SERVICE(producer), "producer_avformat", 5 );
+#endif
+ mlt_service_cache_put( MLT_PRODUCER_SERVICE(producer), "producer_avformat", this, 0, (mlt_destructor) producer_avformat_close );
}
return producer;
}
*video_index = i;
mlt_properties_set( meta_media, key, "video" );
snprintf( key, sizeof(key), "meta.media.%d.stream.frame_rate", i );
+#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(42<<8)+0)
+ double ffmpeg_fps = av_q2d( context->streams[ i ]->avg_frame_rate );
+ if (ffmpeg_fps == 0) ffmpeg_fps = av_q2d( context->streams[ i ]->r_frame_rate );
+ mlt_properties_set_double( meta_media, key, ffmpeg_fps );
+#else
mlt_properties_set_double( meta_media, key, av_q2d( context->streams[ i ]->r_frame_rate ) );
+#endif
+
#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(21<<8)+0)
snprintf( key, sizeof(key), "meta.media.%d.stream.sample_aspect_ratio", i );
mlt_properties_set_double( meta_media, key, av_q2d( context->streams[ i ]->sample_aspect_ratio ) );
#endif
+ snprintf( key, sizeof(key), "meta.media.%d.codec.frame_rate", i );
+ mlt_properties_set_double( meta_media, key, (double) codec_context->time_base.den /
+ ( codec_context->time_base.num == 0 ? 1 : codec_context->time_base.num ) );
snprintf( key, sizeof(key), "meta.media.%d.codec.pix_fmt", i );
mlt_properties_set( meta_media, key, avcodec_get_pix_fmt_name( codec_context->pix_fmt ) );
snprintf( key, sizeof(key), "meta.media.%d.codec.sample_aspect_ratio", i );
mlt_properties_set_double( meta_media, key, av_q2d( codec_context->sample_aspect_ratio ) );
+#if LIBAVCODEC_VERSION_INT > ((52<<16)+(28<<8)+0)
+ snprintf( key, sizeof(key), "meta.media.%d.codec.colorspace", i );
+ switch ( codec_context->colorspace )
+ {
+ case AVCOL_SPC_SMPTE240M:
+ mlt_properties_set_int( meta_media, key, 240 );
+ break;
+ case AVCOL_SPC_BT470BG:
+ case AVCOL_SPC_SMPTE170M:
+ mlt_properties_set_int( meta_media, key, 601 );
+ break;
+ case AVCOL_SPC_BT709:
+ mlt_properties_set_int( meta_media, key, 709 );
+ break;
+ default:
+ // This is a heuristic Charles Poynton suggests in "Digital Video and HDTV"
+ mlt_properties_set_int( meta_media, key, codec_context->width * codec_context->height > 750000 ? 709 : 601 );
+ break;
+ }
+#endif
break;
case CODEC_TYPE_AUDIO:
if ( *audio_index < 0 )
mlt_properties_set_int( meta_media, key, codec_context->bit_rate );
// snprintf( key, sizeof(key), "meta.media.%d.codec.time_base", i );
// mlt_properties_set_double( meta_media, key, av_q2d( codec_context->time_base ) );
- snprintf( key, sizeof(key), "meta.media.%d.codec.profile", i );
- mlt_properties_set_int( meta_media, key, codec_context->profile );
- snprintf( key, sizeof(key), "meta.media.%d.codec.level", i );
- mlt_properties_set_int( meta_media, key, codec_context->level );
+// snprintf( key, sizeof(key), "meta.media.%d.codec.profile", i );
+// mlt_properties_set_int( meta_media, key, codec_context->profile );
+// snprintf( key, sizeof(key), "meta.media.%d.codec.level", i );
+// mlt_properties_set_int( meta_media, key, codec_context->level );
}
return meta_media;
}
-/** Producer file destructor.
-*/
-
-static void producer_format_close( void *context )
-{
- if ( context )
- {
- // Lock the mutex now
- avformat_lock( );
-
- // Close the file
- av_close_input_file( context );
-
- // Unlock the mutex now
- avformat_unlock( );
- }
-}
-
-/** Producer file destructor.
-*/
-
-static void producer_codec_close( void *codec )
-{
- if ( codec )
- {
- // Lock the mutex now
- avformat_lock( );
-
- // Close the file
- avcodec_close( codec );
-
- // Unlock the mutex now
- avformat_unlock( );
- }
-}
-
static inline int dv_is_pal( AVPacket *pkt )
{
return pkt->data[3] & 0x80;
return 0;
}
-static double get_aspect_ratio( AVStream *stream, AVCodecContext *codec_context, AVPacket *pkt )
+static double get_aspect_ratio( mlt_properties properties, AVStream *stream, AVCodecContext *codec_context, AVPacket *pkt )
{
double aspect_ratio = 1.0;
{
if ( dv_is_pal( pkt ) )
{
- aspect_ratio = dv_is_wide( pkt )
- ? 64.0/45.0 // 16:9 PAL
- : 16.0/15.0; // 4:3 PAL
+ if ( dv_is_wide( pkt ) )
+ {
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_num", 64 );
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_den", 45 );
+ }
+ else
+ {
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_num", 16 );
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_den", 15 );
+ }
}
else
{
- aspect_ratio = dv_is_wide( pkt )
- ? 32.0/27.0 // 16:9 NTSC
- : 8.0/9.0; // 4:3 NTSC
+ if ( dv_is_wide( pkt ) )
+ {
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_num", 32 );
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_den", 27 );
+ }
+ else
+ {
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_num", 8 );
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_den", 9 );
+ }
}
}
else
// the rescale normaliser when using equivalent producers and consumers.
// = display_aspect / (width * height)
if ( ar.num == 10 && ar.den == 11 )
- aspect_ratio = 8.0/9.0; // 4:3 NTSC
+ {
+ // 4:3 NTSC
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_num", 8 );
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_den", 9 );
+ }
else if ( ar.num == 59 && ar.den == 54 )
- aspect_ratio = 16.0/15.0; // 4:3 PAL
+ {
+ // 4:3 PAL
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_num", 16 );
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_den", 15 );
+ }
else if ( ar.num == 40 && ar.den == 33 )
- aspect_ratio = 32.0/27.0; // 16:9 NTSC
+ {
+ // 16:9 NTSC
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_num", 32 );
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_den", 27 );
+ }
else if ( ar.num == 118 && ar.den == 81 )
- aspect_ratio = 64.0/45.0; // 16:9 PAL
+ {
+ // 16:9 PAL
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_num", 64 );
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_den", 45 );
+ }
}
}
else
{ 0, 1 };
#endif
if ( codec_sar.num > 0 )
- aspect_ratio = av_q2d( codec_sar );
+ {
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_num", codec_sar.num );
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_den", codec_sar.den );
+ }
else if ( stream_sar.num > 0 )
- aspect_ratio = av_q2d( stream_sar );
+ {
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_num", stream_sar.num );
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_den", stream_sar.den );
+ }
+ else
+ {
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_num", 1 );
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_den", 1 );
+ }
}
+ AVRational ar = { mlt_properties_get_double( properties, "meta.media.sample_aspect_num" ), mlt_properties_get_double( properties, "meta.media.sample_aspect_den" ) };
+ aspect_ratio = av_q2d( ar );
+ mlt_properties_set_double( properties, "aspect_ratio", aspect_ratio );
+
return aspect_ratio;
}
AVFormatContext *context = NULL;
// Get the properties
- mlt_properties properties = MLT_PRODUCER_PROPERTIES( &this->parent );
+ mlt_properties properties = MLT_PRODUCER_PROPERTIES( this->parent );
// We will treat everything with the producer fps
double fps = mlt_profile_fps( profile );
params->sample_rate = 48000;
}
- // XXX: this does not work anymore since avdevice
- // TODO: make producer_avddevice?
// Parse out params
mrl = strchr( file, '?' );
while ( mrl )
// Check if we're seekable (something funny about mpeg here :-/)
if ( strncmp( file, "pipe:", 5 ) &&
+ strncmp( file, "/dev/", 5 ) &&
strncmp( file, "http:", 5 ) &&
strncmp( file, "udp:", 4 ) &&
strncmp( file, "tcp:", 4 ) &&
{
this->seekable = av_seek_frame( context, -1, this->start_time, AVSEEK_FLAG_BACKWARD ) >= 0;
mlt_properties_set_int( properties, "seekable", this->seekable );
- producer_format_close( this->dummy_context );
this->dummy_context = context;
av_open_input_file( &context, file, NULL, 0, NULL );
av_find_stream_info( context );
ret = av_read_frame( context, &pkt );
if ( ret >= 0 && pkt.stream_index == video_index && pkt.size > 0 )
{
- mlt_properties_set_double( properties, "aspect_ratio",
- get_aspect_ratio( context->streams[ video_index ], codec_context, &pkt ) );
+ get_aspect_ratio( properties, context->streams[ video_index ], codec_context, &pkt );
break;
}
}
}
else
{
- mlt_properties_set_double( properties, "aspect_ratio",
- get_aspect_ratio( context->streams[ video_index ], codec_context, NULL ) );
+ get_aspect_ratio( properties, context->streams[ video_index ], codec_context, NULL );
}
+#ifdef SWSCALE
+ struct SwsContext *context = sws_getContext( codec_context->width, codec_context->height, codec_context->pix_fmt,
+ codec_context->width, codec_context->height, PIX_FMT_YUYV422, SWS_BILINEAR, NULL, NULL, NULL);
+ if ( context )
+ sws_freeContext( context );
+ else
+ error = 1;
+#endif
}
// Read Metadata
// We're going to cheat here - for a/v files, we will have two contexts (reasoning will be clear later)
if ( av == 0 && audio_index != -1 && video_index != -1 )
{
- // We'll use the open one as our video_context
- producer_format_close( this->video_context );
- this->video_context = context;
+ // We'll use the open one as our video_format
+ this->video_format = context;
// And open again for our audio context
av_open_input_file( &context, file, NULL, 0, NULL );
av_find_stream_info( context );
// Audio context
- producer_format_close( this->audio_format );
this->audio_format = context;
}
else if ( av != 2 && video_index != -1 )
{
// We only have a video context
- producer_format_close( this->video_context );
- this->video_context = context;
+ this->video_format = context;
}
else if ( audio_index != -1 )
{
// We only have an audio context
- producer_format_close( this->audio_format );
this->audio_format = context;
}
else
return ( double )position / mlt_producer_get_fps( this );
}
-static inline void convert_image( AVFrame *frame, uint8_t *buffer, int pix_fmt, mlt_image_format *format, int width, int height )
+ // Collect information about all audio streams
+
+static void get_audio_streams_info( producer_avformat this )
+{
+ // Fetch the audio format context
+ AVFormatContext *context = this->audio_format;
+ int i;
+
+ for ( i = 0;
+ i < context->nb_streams;
+ i++ )
+ {
+ if ( context->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO )
+ {
+ AVCodecContext *codec_context = context->streams[i]->codec;
+ AVCodec *codec = avcodec_find_decoder( codec_context->codec_id );
+
+ // If we don't have a codec and we can't initialise it, we can't do much more...
+ avformat_lock( );
+ if ( codec && avcodec_open( codec_context, codec ) >= 0 )
+ {
+ this->audio_streams++;
+ this->audio_max_stream = i;
+ this->total_channels += codec_context->channels;
+ if ( codec_context->channels > this->max_channel )
+ this->max_channel = codec_context->channels;
+ if ( codec_context->sample_rate > this->max_frequency )
+ this->max_frequency = codec_context->sample_rate;
+ avcodec_close( codec_context );
+ }
+ avformat_unlock( );
+ }
+ }
+ mlt_log_verbose( NULL, "[producer avformat] audio: total_streams %d max_stream %d total_channels %d max_channels %d\n",
+ this->audio_streams, this->audio_max_stream, this->total_channels, this->max_channel );
+
+ // Other audio-specific initializations
+ this->resample_factor = 1.0;
+}
+
+static void set_luma_transfer( struct SwsContext *context, int colorspace, int use_full_range )
+{
+#if defined(SWSCALE) && (LIBSWSCALE_VERSION_INT >= ((0<<16)+(7<<8)+2))
+ int *coefficients;
+ int full_range;
+ int brightness, contrast, saturation;
+
+ if ( sws_getColorspaceDetails( context, &coefficients, &full_range, &coefficients, &full_range,
+ &brightness, &contrast, &saturation ) != -1 )
+ {
+ // Don't change these from defaults unless explicitly told to.
+ if ( use_full_range >= 0 )
+ full_range = use_full_range;
+ switch ( colorspace )
+ {
+ case 170:
+ case 470:
+ case 601:
+ case 624:
+ coefficients = sws_getCoefficients( SWS_CS_ITU601 );
+ break;
+ case 240:
+ coefficients = sws_getCoefficients( SWS_CS_SMPTE240M );
+ break;
+ case 709:
+ coefficients = sws_getCoefficients( SWS_CS_ITU709 );
+ break;
+ }
+ sws_setColorspaceDetails( context, coefficients, full_range, coefficients, full_range,
+ brightness, contrast, saturation );
+ }
+#endif
+}
+
+static inline void convert_image( AVFrame *frame, uint8_t *buffer, int pix_fmt,
+ mlt_image_format *format, int width, int height, int colorspace )
{
#ifdef SWSCALE
+ int full_range = -1;
+ int flags = SWS_BILINEAR | SWS_ACCURATE_RND;
+
+#ifdef USE_MMX
+ flags |= SWS_CPU_CAPS_MMX;
+#endif
+#ifdef USE_SSE
+ flags |= SWS_CPU_CAPS_MMX2;
+#endif
+
if ( pix_fmt == PIX_FMT_RGB32 )
{
*format = mlt_image_rgb24a;
struct SwsContext *context = sws_getContext( width, height, pix_fmt,
- width, height, PIX_FMT_RGBA, SWS_FAST_BILINEAR, NULL, NULL, NULL);
+ width, height, PIX_FMT_RGBA, flags, NULL, NULL, NULL);
AVPicture output;
avpicture_fill( &output, buffer, PIX_FMT_RGBA, width, height );
+ set_luma_transfer( context, colorspace, full_range );
sws_scale( context, frame->data, frame->linesize, 0, height,
output.data, output.linesize);
sws_freeContext( context );
else if ( *format == mlt_image_yuv420p )
{
struct SwsContext *context = sws_getContext( width, height, pix_fmt,
- width, height, PIX_FMT_YUV420P, SWS_FAST_BILINEAR, NULL, NULL, NULL);
+ width, height, PIX_FMT_YUV420P, flags, NULL, NULL, NULL);
AVPicture output;
output.data[0] = buffer;
output.data[1] = buffer + width * height;
- output.data[2] = buffer + ( 3 * width * height ) / 2;
+ output.data[2] = buffer + ( 5 * width * height ) / 4;
output.linesize[0] = width;
output.linesize[1] = width >> 1;
output.linesize[2] = width >> 1;
+ set_luma_transfer( context, colorspace, full_range );
sws_scale( context, frame->data, frame->linesize, 0, height,
output.data, output.linesize);
sws_freeContext( context );
else if ( *format == mlt_image_rgb24 )
{
struct SwsContext *context = sws_getContext( width, height, pix_fmt,
- width, height, PIX_FMT_RGB24, SWS_FAST_BILINEAR, NULL, NULL, NULL);
+ width, height, PIX_FMT_RGB24, flags | SWS_FULL_CHR_H_INT, NULL, NULL, NULL);
AVPicture output;
avpicture_fill( &output, buffer, PIX_FMT_RGB24, width, height );
+ set_luma_transfer( context, colorspace, full_range );
sws_scale( context, frame->data, frame->linesize, 0, height,
output.data, output.linesize);
sws_freeContext( context );
else if ( *format == mlt_image_rgb24a || *format == mlt_image_opengl )
{
struct SwsContext *context = sws_getContext( width, height, pix_fmt,
- width, height, PIX_FMT_RGBA, SWS_FAST_BILINEAR, NULL, NULL, NULL);
+ width, height, PIX_FMT_RGBA, flags | SWS_FULL_CHR_H_INT, NULL, NULL, NULL);
AVPicture output;
avpicture_fill( &output, buffer, PIX_FMT_RGBA, width, height );
+ set_luma_transfer( context, colorspace, full_range );
sws_scale( context, frame->data, frame->linesize, 0, height,
output.data, output.linesize);
sws_freeContext( context );
else
{
struct SwsContext *context = sws_getContext( width, height, pix_fmt,
- width, height, PIX_FMT_YUYV422, SWS_FAST_BILINEAR, NULL, NULL, NULL);
+ width, height, PIX_FMT_YUYV422, flags | SWS_FULL_CHR_H_INP, NULL, NULL, NULL);
AVPicture output;
avpicture_fill( &output, buffer, PIX_FMT_YUYV422, width, height );
+ set_luma_transfer( context, colorspace, full_range );
sws_scale( context, frame->data, frame->linesize, 0, height,
output.data, output.linesize);
sws_freeContext( context );
AVPicture pict;
pict.data[0] = buffer;
pict.data[1] = buffer + width * height;
- pict.data[2] = buffer + ( 3 * width * height ) / 2;
+ pict.data[2] = buffer + ( 5 * width * height ) / 4;
pict.linesize[0] = width;
pict.linesize[1] = width >> 1;
pict.linesize[2] = width >> 1;
*width = codec_context->width;
*height = codec_context->height;
- mlt_properties_set_int( frame_properties, "width", *width );
- mlt_properties_set_int( frame_properties, "height", *height );
if ( codec_context->pix_fmt == PIX_FMT_RGB32 )
size = *width * ( *height + 1 ) * 4;
{
// Get the producer
producer_avformat this = mlt_frame_pop_service( frame );
- mlt_producer producer = &this->parent;
+ mlt_service_lock( MLT_PRODUCER_SERVICE(this->parent) );
+ mlt_producer producer = this->parent;
// Get the properties from the frame
mlt_properties frame_properties = MLT_FRAME_PROPERTIES( frame );
// Get the producer properties
mlt_properties properties = MLT_PRODUCER_PROPERTIES( producer );
- avformat_lock();
-
- // Fetch the video_context
- AVFormatContext *context = this->video_context;
+ // Fetch the video format context
+ AVFormatContext *context = this->video_format;
// Get the video stream
AVStream *stream = context->streams[ this->video_index ];
// Get codec context
AVCodecContext *codec_context = stream->codec;
+ // Get the image cache
+ if ( ! this->image_cache && ! mlt_properties_get_int( properties, "noimagecache" ) )
+ this->image_cache = mlt_cache_init();
+ if ( this->image_cache )
+ {
+ mlt_cache_item item = mlt_cache_get( this->image_cache, (void*) position );
+ *buffer = mlt_cache_item_data( item, (int*) format );
+ if ( *buffer )
+ {
+ // Set the resolution
+ *width = codec_context->width;
+ *height = codec_context->height;
+
+ // Workaround 1088 encodings missing cropping info.
+ if ( *height == 1088 && mlt_profile_dar( mlt_service_profile( MLT_PRODUCER_SERVICE( producer ) ) ) == 16.0/9.0 )
+ *height = 1080;
+
+ // Cache hit
+ int size;
+ switch ( *format )
+ {
+ case mlt_image_yuv420p:
+ size = *width * 3 * ( *height + 1 ) / 2;
+ break;
+ case mlt_image_rgb24:
+ size = *width * ( *height + 1 ) * 3;
+ break;
+ case mlt_image_rgb24a:
+ case mlt_image_opengl:
+ size = *width * ( *height + 1 ) * 4;
+ break;
+ default:
+ *format = mlt_image_yuv422;
+ size = *width * ( *height + 1 ) * 2;
+ break;
+ }
+ mlt_properties_set_data( frame_properties, "avformat.image_cache", item, 0, ( mlt_destructor )mlt_cache_item_close, NULL );
+ mlt_properties_set_data( frame_properties, "image", *buffer, size, NULL, NULL );
+ // this->top_field_first = mlt_properties_get_int( frame_properties, "top_field_first" );
+ this->got_picture = 1;
+
+ goto exit_get_image;
+ }
+ }
+ // Cache miss
+ int image_size = 0;
+
+ avformat_lock();
+
// Packet
AVPacket pkt;
int ignore = 0;
// We may want to use the source fps if available
- double source_fps = mlt_properties_get_double( properties, "source_fps" );
+ double source_fps = mlt_properties_get_double( properties, "meta.media.frame_rate_num" ) /
+ mlt_properties_get_double( properties, "meta.media.frame_rate_den" );
double fps = mlt_producer_get_fps( producer );
// This is the physical frame position in the source
}
}
- // Duplicate the last image if necessary (see comment on rawvideo below)
- if ( this->av_frame && this->got_picture && this->seekable
+ // Duplicate the last image if necessary
+ if ( this->av_frame && this->av_frame->linesize[0] && this->got_picture && this->seekable
&& ( paused
|| this->current_position == req_position
|| ( !use_new_seek && this->current_position > req_position ) ) )
{
// Duplicate it
- if ( allocate_buffer( frame_properties, codec_context, buffer, format, width, height ) )
- convert_image( this->av_frame, *buffer, codec_context->pix_fmt, format, *width, *height );
+ if ( ( image_size = allocate_buffer( frame_properties, codec_context, buffer, format, width, height ) ) )
+ {
+ // Workaround 1088 encodings missing cropping info.
+ if ( *height == 1088 && mlt_profile_dar( mlt_service_profile( MLT_PRODUCER_SERVICE( producer ) ) ) == 16.0/9.0 )
+ *height = 1080;
+#ifdef VDPAU
+ if ( this->vdpau && this->vdpau->buffer )
+ {
+ AVPicture picture;
+ picture.data[0] = this->vdpau->buffer;
+ picture.data[2] = this->vdpau->buffer + codec_context->width * codec_context->height;
+ picture.data[1] = this->vdpau->buffer + codec_context->width * codec_context->height * 5 / 4;
+ picture.linesize[0] = codec_context->width;
+ picture.linesize[1] = codec_context->width / 2;
+ picture.linesize[2] = codec_context->width / 2;
+ convert_image( (AVFrame*) &picture, *buffer,
+ PIX_FMT_YUV420P, format, *width, *height, this->colorspace );
+ }
+ else
+#endif
+ convert_image( this->av_frame, *buffer, codec_context->pix_fmt,
+ format, *width, *height, this->colorspace );
+ }
else
mlt_frame_get_image( frame, buffer, format, width, height, writable );
}
else if ( context->start_time != AV_NOPTS_VALUE )
pts -= context->start_time;
int_position = ( int )( av_q2d( stream->time_base ) * pts * source_fps + 0.1 );
+ if ( pkt.pts == AV_NOPTS_VALUE )
+ {
+ this->invalid_pts_counter++;
+ if ( this->invalid_pts_counter > 20 )
+ {
+ mlt_log_panic( MLT_PRODUCER_SERVICE(producer), "\ainvalid PTS; DISABLING NEW_SEEK!\n" );
+ mlt_properties_set_int( properties, "new_seek", 0 );
+ int_position = req_position;
+ use_new_seek = 0;
+ }
+ }
+ else
+ {
+ this->invalid_pts_counter = 0;
+ }
+ mlt_log_debug( MLT_PRODUCER_SERVICE(producer), "pkt.pts %llu req_pos %d cur_pos %d pkt_pos %d\n",
+ pkt.pts, req_position, this->current_position, int_position );
}
else
{
{
int_position = req_position;
}
- mlt_log_debug( MLT_PRODUCER_SERVICE(producer), "pkt.dts %llu req_pos %d cur_pos %d pkt_pos %d",
+ mlt_log_debug( MLT_PRODUCER_SERVICE(producer), "pkt.dts %llu req_pos %d cur_pos %d pkt_pos %d\n",
pkt.dts, req_position, this->current_position, int_position );
// Make a dumb assumption on streams that contain wild timestamps
if ( abs( req_position - int_position ) > 999 )
// Decode the image
if ( must_decode || int_position >= req_position )
{
+#ifdef VDPAU
+ if ( g_vdpau && this->vdpau )
+ {
+ if ( g_vdpau->producer != this )
+ {
+ vdpau_decoder_close();
+ vdpau_decoder_init( this );
+ }
+ if ( this->vdpau )
+ this->vdpau->is_decoded = 0;
+ }
+#endif
codec_context->reordered_opaque = pkt.pts;
if ( int_position >= req_position )
codec_context->skip_loop_filter = AVDISCARD_NONE;
+#if (LIBAVCODEC_VERSION_INT >= ((52<<16)+(26<<8)+0))
+ ret = avcodec_decode_video2( codec_context, this->av_frame, &got_picture, &pkt );
+#else
ret = avcodec_decode_video( codec_context, this->av_frame, &got_picture, pkt.data, pkt.size );
+#endif
// Note: decode may fail at the beginning of MPEGfile (B-frames referencing before first I-frame), so allow a few errors.
if ( ret < 0 )
{
else if ( context->start_time != AV_NOPTS_VALUE )
pts -= context->start_time;
int_position = ( int )( av_q2d( stream->time_base) * pts * source_fps + 0.1 );
- mlt_log_verbose( MLT_PRODUCER_SERVICE(producer), "got frame %d, key %d\n", int_position, this->av_frame->key_frame );
+ mlt_log_debug( MLT_PRODUCER_SERVICE(producer), "got frame %d, key %d\n", int_position, this->av_frame->key_frame );
}
// Handle ignore
if ( int_position < req_position )
}
}
mlt_log_debug( MLT_PRODUCER_SERVICE(producer), " got_pic %d key %d\n", got_picture, pkt.flags & PKT_FLAG_KEY );
- av_free_packet( &pkt );
- }
- else if ( ret >= 0 )
- {
- av_free_packet( &pkt );
}
// Now handle the picture if we have one
if ( got_picture )
{
- if ( allocate_buffer( frame_properties, codec_context, buffer, format, width, height ) )
+ if ( ( image_size = allocate_buffer( frame_properties, codec_context, buffer, format, width, height ) ) )
{
- convert_image( this->av_frame, *buffer, codec_context->pix_fmt, format, *width, *height );
- if ( !mlt_properties_get( properties, "force_progressive" ) )
- mlt_properties_set_int( frame_properties, "progressive", !this->av_frame->interlaced_frame );
- this->top_field_first = this->av_frame->top_field_first;
+ // Workaround 1088 encodings missing cropping info.
+ if ( *height == 1088 && mlt_profile_dar( mlt_service_profile( MLT_PRODUCER_SERVICE( producer ) ) ) == 16.0/9.0 )
+ *height = 1080;
+#ifdef VDPAU
+ if ( this->vdpau )
+ {
+ if ( this->vdpau->is_decoded )
+ {
+ struct vdpau_render_state *render = (struct vdpau_render_state*) this->av_frame->data[0];
+ void *planes[3];
+ uint32_t pitches[3];
+ VdpYCbCrFormat dest_format = VDP_YCBCR_FORMAT_YV12;
+ AVPicture picture;
+
+ if ( !this->vdpau->buffer )
+ this->vdpau->buffer = mlt_pool_alloc( codec_context->width * codec_context->height * 3 / 2 );
+ picture.data[0] = planes[0] = this->vdpau->buffer;
+ picture.data[2] = planes[1] = this->vdpau->buffer + codec_context->width * codec_context->height;
+ picture.data[1] = planes[2] = this->vdpau->buffer + codec_context->width * codec_context->height * 5 / 4;
+ picture.linesize[0] = pitches[0] = codec_context->width;
+ picture.linesize[1] = pitches[1] = codec_context->width / 2;
+ picture.linesize[2] = pitches[2] = codec_context->width / 2;
+
+ VdpStatus status = vdp_surface_get_bits( render->surface, dest_format, planes, pitches );
+ if ( status == VDP_STATUS_OK )
+ {
+ convert_image( (AVFrame*) &picture, *buffer, PIX_FMT_YUV420P,
+ format, *width, *height, this->colorspace );
+ }
+ else
+ {
+ mlt_log_error( MLT_PRODUCER_SERVICE(producer), "VDPAU Error: %s\n", vdp_get_error_string( status ) );
+ this->vdpau->is_decoded = 0;
+ }
+ }
+ else
+ {
+ mlt_log_error( MLT_PRODUCER_SERVICE(producer), "VDPAU error in VdpDecoderRender\n" );
+ got_picture = 0;
+ }
+ }
+ else
+#endif
+ convert_image( this->av_frame, *buffer, codec_context->pix_fmt,
+ format, *width, *height, this->colorspace );
+ this->top_field_first |= this->av_frame->top_field_first;
this->current_position = int_position;
this->got_picture = 1;
}
got_picture = 0;
}
}
+ if ( ret >= 0 )
+ av_free_packet( &pkt );
}
- if ( !got_picture )
- mlt_frame_get_image( frame, buffer, format, width, height, writable );
}
- // Very untidy - for rawvideo, the packet contains the frame, hence the free packet
- // above will break the pause behaviour - so we wipe the frame now
- if ( !strcmp( codec_context->codec->name, "rawvideo" ) )
- av_freep( &this->av_frame );
-
avformat_unlock();
- // Set the field order property for this frame
- mlt_properties_set_int( frame_properties, "top_field_first", this->top_field_first );
+ if ( this->got_picture && image_size > 0 && this->image_cache )
+ {
+ // Copy buffer to image cache
+ uint8_t *image = mlt_pool_alloc( image_size );
+ memcpy( image, *buffer, image_size );
+ mlt_cache_put( this->image_cache, (void*) position, image, *format, mlt_pool_release );
+ }
// Regardless of speed, we expect to get the next frame (cos we ain't too bright)
this->video_expected = position + 1;
- return 0;
+exit_get_image:
+ // Set the progressive flag
+ if ( mlt_properties_get( properties, "force_progressive" ) )
+ mlt_properties_set_int( frame_properties, "progressive", !!mlt_properties_get_int( properties, "force_progressive" ) );
+ else if ( this->av_frame )
+ mlt_properties_set_int( frame_properties, "progressive", !this->av_frame->interlaced_frame );
+
+ // Set the field order property for this frame
+ if ( mlt_properties_get( properties, "force_tff" ) )
+ mlt_properties_set_int( frame_properties, "top_field_first", !!mlt_properties_get_int( properties, "force_tff" ) );
+ else
+ mlt_properties_set_int( frame_properties, "top_field_first", this->top_field_first );
+
+ // Set immutable properties of the selected track's (or overridden) source attributes.
+ mlt_properties_set_int( properties, "meta.media.top_field_first", this->top_field_first );
+ mlt_properties_set_int( properties, "meta.media.progressive", mlt_properties_get_int( frame_properties, "progressive" ) );
+
+ mlt_service_unlock( MLT_PRODUCER_SERVICE(this->parent) );
+
+ return !this->got_picture;
}
/** Process properties as AVOptions and apply to AV context obj
{
const char *opt_name = mlt_properties_get_name( properties, i );
const AVOption *opt = av_find_opt( obj, opt_name, NULL, flags, flags );
- if ( opt )
+ if ( opt_name && mlt_properties_get( properties, opt_name ) )
+ {
+ if ( opt )
#if LIBAVCODEC_VERSION_INT >= ((52<<16)+(7<<8)+0)
- av_set_string3( obj, opt_name, mlt_properties_get( properties, opt_name), 0, NULL );
+ 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 );
+ 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) );
+#endif
+ }
+ }
+}
+
+/** Initialize the video codec context.
+ */
+
+static int video_codec_init( producer_avformat this, int index, mlt_properties properties )
+{
+ // Initialise the codec if necessary
+ if ( !this->video_codec )
+ {
+ // Get the video stream
+ AVStream *stream = this->video_format->streams[ index ];
+
+ // Get codec context
+ AVCodecContext *codec_context = stream->codec;
+
+ // Find the codec
+ AVCodec *codec = avcodec_find_decoder( codec_context->codec_id );
+#ifdef VDPAU
+ if ( codec_context->codec_id == CODEC_ID_H264 )
+ {
+ if ( ( codec = avcodec_find_decoder_by_name( "h264_vdpau" ) ) )
+ {
+ if ( vdpau_init( this ) )
+ {
+ this->video_codec = codec_context;
+ if ( !vdpau_decoder_init( this ) )
+ vdpau_decoder_close();
+ }
+ }
+ if ( !this->vdpau )
+ codec = avcodec_find_decoder( codec_context->codec_id );
+ }
+#endif
+
+ // Initialise multi-threading
+ int thread_count = mlt_properties_get_int( properties, "threads" );
+ if ( thread_count == 0 && getenv( "MLT_AVFORMAT_THREADS" ) )
+ thread_count = atoi( getenv( "MLT_AVFORMAT_THREADS" ) );
+ if ( thread_count > 1 )
+ {
+ avcodec_thread_init( codec_context, thread_count );
+ codec_context->thread_count = thread_count;
+ }
+
+ // If we don't have a codec and we can't initialise it, we can't do much more...
+ avformat_lock( );
+ if ( codec && avcodec_open( codec_context, codec ) >= 0 )
+ {
+ // Now store the codec with its destructor
+ this->video_codec = codec_context;
+ }
+ else
+ {
+ // Remember that we can't use this later
+ this->video_index = -1;
+ }
+ avformat_unlock( );
+
+ // Process properties as AVOptions
+ apply_properties( codec_context, properties, AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM );
+
+ // Reset some image properties
+ mlt_properties_set_int( properties, "width", this->video_codec->width );
+ mlt_properties_set_int( properties, "height", this->video_codec->height );
+ // For DV, we'll just use the saved aspect ratio
+ if ( codec_context->codec_id != CODEC_ID_DVVIDEO )
+ get_aspect_ratio( properties, stream, this->video_codec, NULL );
+
+ // Determine the fps first from the codec
+ double source_fps = (double) this->video_codec->time_base.den /
+ ( this->video_codec->time_base.num == 0 ? 1 : this->video_codec->time_base.num );
+
+ if ( mlt_properties_get( properties, "force_fps" ) )
+ {
+ source_fps = mlt_properties_get_double( properties, "force_fps" );
+ stream->time_base = av_d2q( source_fps, 1024 );
+ mlt_properties_set_int( properties, "meta.media.frame_rate_num", stream->time_base.num );
+ mlt_properties_set_int( properties, "meta.media.frame_rate_den", stream->time_base.den );
+ }
+ else
+ {
+ // If the muxer reports a frame rate different than the codec
+#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(42<<8)+0)
+ double muxer_fps = av_q2d( stream->avg_frame_rate );
+ if ( muxer_fps == 0 ) muxer_fps = av_q2d( stream->r_frame_rate );
#else
- av_set_string( obj, opt_name, mlt_properties_get( properties, opt_name) );
+ double muxer_fps = av_q2d( stream->r_frame_rate );
+#endif
+ // Choose the lesser - the wrong tends to be off by some multiple of 10
+ source_fps = FFMIN( source_fps, muxer_fps );
+ if ( source_fps >= 1.0 && ( source_fps < muxer_fps || isnan( muxer_fps ) ) )
+ {
+ mlt_properties_set_int( properties, "meta.media.frame_rate_num", this->video_codec->time_base.den );
+ mlt_properties_set_int( properties, "meta.media.frame_rate_den", this->video_codec->time_base.num == 0 ? 1 : this->video_codec->time_base.num );
+ }
+ else if ( muxer_fps > 0 )
+ {
+ AVRational frame_rate = stream->r_frame_rate;
+ // With my samples when r_frame_rate != 1000 but avg_frame_rate is valid,
+ // avg_frame_rate gives some approximate value that does not well match the media.
+ // Also, on my sample where r_frame_rate = 1000, using avg_frame_rate directly
+ // results in some very choppy output, but some value slightly different works
+ // great.
+#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(42<<8)+0)
+ if ( av_q2d( stream->r_frame_rate ) >= 1000 && av_q2d( stream->avg_frame_rate ) > 0 )
+ frame_rate = av_d2q( av_q2d( stream->avg_frame_rate ), 1024 );
#endif
+ mlt_properties_set_int( properties, "meta.media.frame_rate_num", frame_rate.num );
+ mlt_properties_set_int( properties, "meta.media.frame_rate_den", frame_rate.den );
+ }
+ else
+ {
+ source_fps = mlt_producer_get_fps( this->parent );
+ AVRational frame_rate = av_d2q( source_fps, 255 );
+ mlt_properties_set_int( properties, "meta.media.frame_rate_num", frame_rate.num );
+ mlt_properties_set_int( properties, "meta.media.frame_rate_den", frame_rate.den );
+ }
+ }
+
+ // source_fps is deprecated in favor of meta.media.frame_rate_num and .frame_rate_den
+ if ( source_fps > 0 )
+ mlt_properties_set_double( properties, "source_fps", source_fps );
+ else
+ mlt_properties_set_double( properties, "source_fps", mlt_producer_get_fps( this->parent ) );
+
+ // Set the YUV colorspace from override or detect
+ this->colorspace = mlt_properties_get_int( properties, "force_colorspace" );
+#if LIBAVCODEC_VERSION_INT > ((52<<16)+(28<<8)+0)
+ if ( ! this->colorspace )
+ {
+ switch ( this->video_codec->colorspace )
+ {
+ case AVCOL_SPC_SMPTE240M:
+ this->colorspace = 240;
+ break;
+ case AVCOL_SPC_BT470BG:
+ case AVCOL_SPC_SMPTE170M:
+ this->colorspace = 601;
+ break;
+ case AVCOL_SPC_BT709:
+ this->colorspace = 709;
+ break;
+ default:
+ // This is a heuristic Charles Poynton suggests in "Digital Video and HDTV"
+ this->colorspace = this->video_codec->width * this->video_codec->height > 750000 ? 709 : 601;
+ break;
+ }
+ }
+#endif
+ // Let apps get chosen colorspace
+ mlt_properties_set_int( properties, "meta.media.colorspace", this->colorspace );
}
+ return this->video_codec && this->video_index > -1;
}
/** Set up video handling.
static void producer_set_up_video( producer_avformat this, mlt_frame frame )
{
// Get the producer
- mlt_producer producer = &this->parent;
+ mlt_producer producer = this->parent;
// Get the properties
mlt_properties properties = MLT_PRODUCER_PROPERTIES( producer );
- // Fetch the video_context
- AVFormatContext *context = this->video_context;
+ // Fetch the video format context
+ AVFormatContext *context = this->video_format;
// Get the video_index
int index = mlt_properties_get_int( properties, "video_index" );
mlt_events_block( properties, producer );
producer_open( this, mlt_service_profile( MLT_PRODUCER_SERVICE(producer) ),
mlt_properties_get( properties, "resource" ) );
- context = this->video_context;
- producer_format_close( this->dummy_context );
+ context = this->video_format;
+ if ( this->dummy_context )
+ {
+ avformat_lock();
+ av_close_input_file( this->dummy_context );
+ avformat_unlock();
+ }
this->dummy_context = NULL;
mlt_events_unblock( properties, producer );
+ if ( this->audio_format )
+ get_audio_streams_info( this );
// Process properties as AVOptions
apply_properties( context, properties, AV_OPT_FLAG_DECODING_PARAM );
mlt_properties_set_int( properties, "video_index", index );
}
+ // Update the video properties if the index changed
+ if ( index != this->video_index )
+ {
+ // Reset the video properties if the index changed
+ this->video_index = index;
+ if ( this->video_codec )
+ {
+ avformat_lock();
+ avcodec_close( this->video_codec );
+ avformat_unlock();
+ }
+ this->video_codec = NULL;
+ }
+
// Get the frame properties
mlt_properties frame_properties = MLT_FRAME_PROPERTIES( frame );
- if ( context && index > -1 )
+ // Get the codec
+ if ( context && index > -1 && video_codec_init( this, index, properties ) )
{
- // Get the video stream
- AVStream *stream = context->streams[ index ];
+ // Set the frame properties
+ double force_aspect_ratio = mlt_properties_get_double( properties, "force_aspect_ratio" );
+ double aspect_ratio = ( force_aspect_ratio > 0.0 ) ?
+ force_aspect_ratio : mlt_properties_get_double( properties, "aspect_ratio" );
+
+ // Set the width and height
+ mlt_properties_set_int( frame_properties, "width", this->video_codec->width );
+ mlt_properties_set_int( frame_properties, "height", this->video_codec->height );
+ // real_width and real_height are deprecated in favor of meta.media.width and .height
+ mlt_properties_set_int( properties, "meta.media.width", this->video_codec->width );
+ mlt_properties_set_int( properties, "meta.media.height", this->video_codec->height );
+ mlt_properties_set_int( frame_properties, "real_width", this->video_codec->width );
+ mlt_properties_set_int( frame_properties, "real_height", this->video_codec->height );
+ mlt_properties_set_double( frame_properties, "aspect_ratio", aspect_ratio );
+ mlt_properties_set_int( frame_properties, "colorspace", this->colorspace );
+
+ // Workaround 1088 encodings missing cropping info.
+ if ( this->video_codec->height == 1088 && mlt_profile_dar( mlt_service_profile( MLT_PRODUCER_SERVICE( producer ) ) ) == 16.0/9.0 )
+ {
+ mlt_properties_set_int( properties, "meta.media.height", 1080 );
+ mlt_properties_set_int( frame_properties, "real_height", 1080 );
+ }
- // Get codec context
- AVCodecContext *codec_context = stream->codec;
+ // Add our image operation
+ mlt_frame_push_service( frame, this );
+ mlt_frame_push_get_image( frame, producer_get_image );
+ }
+ else
+ {
+ // If something failed, use test card image
+ mlt_properties_set_int( frame_properties, "test_image", 1 );
+ }
+}
- // Get the codec
- AVCodec *codec = this->video_codec;
+static int seek_audio( producer_avformat this, mlt_position position, double timecode, int *ignore )
+{
+ int paused = 0;
- // Update the video properties if the index changed
- if ( index != this->video_index )
+ // Seek if necessary
+ if ( position != this->audio_expected )
+ {
+ if ( position + 1 == this->audio_expected )
{
- // Reset the video properties if the index changed
- this->video_index = index;
- producer_codec_close( this->video_codec );
- this->video_codec = NULL;
- mlt_properties_set_int( properties, "width", codec_context->width );
- mlt_properties_set_int( properties, "height", codec_context->height );
- // TODO: get the first usable AVPacket and reset the stream position
- mlt_properties_set_double( properties, "aspect_ratio",
- get_aspect_ratio( context->streams[ index ], codec_context, NULL ) );
- codec = NULL;
+ // We're paused - silence required
+ paused = 1;
+ }
+ else if ( !this->seekable && position > this->audio_expected && ( position - this->audio_expected ) < 250 )
+ {
+ // Fast forward - seeking is inefficient for small distances - just ignore following frames
+ *ignore = position - this->audio_expected;
+ }
+ else if ( position < this->audio_expected || position - this->audio_expected >= 12 )
+ {
+ AVFormatContext *context = this->audio_format;
+ int64_t timestamp = ( int64_t )( timecode * AV_TIME_BASE + 0.5 );
+ if ( context->start_time != AV_NOPTS_VALUE )
+ timestamp += context->start_time;
+ if ( timestamp < 0 )
+ timestamp = 0;
+
+ // Set to the real timecode
+ avformat_lock();
+ if ( av_seek_frame( context, -1, timestamp, AVSEEK_FLAG_BACKWARD ) != 0 )
+ paused = 1;
+ avformat_unlock();
+
+ // Clear the usage in the audio buffer
+ int i = MAX_AUDIO_STREAMS + 1;
+ while ( --i )
+ this->audio_used[i - 1] = 0;
}
+ }
+ return paused;
+}
+
+static int decode_audio( producer_avformat this, int *ignore, AVPacket pkt, int channels, int samples, double timecode, double fps )
+{
+ // Fetch the audio_format
+ AVFormatContext *context = this->audio_format;
+
+ // Get the current stream index
+ int index = pkt.stream_index;
- // Initialise the codec if necessary
- if ( !codec )
+ // Get codec context
+ AVCodecContext *codec_context = this->audio_codec[ index ];
+
+ // Obtain the resample context if it exists (not always needed)
+ ReSampleContext *resample = this->audio_resample[ index ];
+
+ // Obtain the audio buffers
+ int16_t *audio_buffer = this->audio_buffer[ index ];
+ int16_t *decode_buffer = this->decode_buffer[ index ];
+
+ int audio_used = this->audio_used[ index ];
+ uint8_t *ptr = pkt.data;
+ int len = pkt.size;
+ int ret = 0;
+
+ while ( ptr && ret >= 0 && len > 0 )
+ {
+ int data_size = sizeof( int16_t ) * AVCODEC_MAX_AUDIO_FRAME_SIZE;
+
+ // Decode the audio
+#if (LIBAVCODEC_VERSION_INT >= ((52<<16)+(26<<8)+0))
+ ret = avcodec_decode_audio3( codec_context, decode_buffer, &data_size, &pkt );
+#elif (LIBAVCODEC_VERSION_INT >= ((51<<16)+(29<<8)+0))
+ ret = avcodec_decode_audio2( codec_context, decode_buffer, &data_size, ptr, len );
+#else
+ ret = avcodec_decode_audio( codec_context, decode_buffer, &data_size, ptr, len );
+#endif
+ if ( ret < 0 )
{
- // Initialise multi-threading
- int thread_count = mlt_properties_get_int( properties, "threads" );
- if ( thread_count == 0 && getenv( "MLT_AVFORMAT_THREADS" ) )
- thread_count = atoi( getenv( "MLT_AVFORMAT_THREADS" ) );
- if ( thread_count > 1 )
- {
- avcodec_thread_init( codec_context, thread_count );
- codec_context->thread_count = thread_count;
- }
+ mlt_log_warning( MLT_PRODUCER_SERVICE(this->parent), "audio decoding error %d\n", ret );
+ break;
+ }
- // Find the codec
- codec = avcodec_find_decoder( codec_context->codec_id );
+ pkt.size = len -= ret;
+ pkt.data = ptr += ret;
- // If we don't have a codec and we can't initialise it, we can't do much more...
- avformat_lock( );
- if ( codec && avcodec_open( codec_context, codec ) >= 0 )
+ // If decoded successfully
+ if ( data_size > 0 )
+ {
+ // Figure out how many samples will be needed after resampling
+ int convert_samples = data_size / codec_context->channels / ( av_get_bits_per_sample_format( codec_context->sample_fmt ) / 8 );
+ int samples_needed = this->resample_factor * convert_samples + 1;
+
+ // Resize audio buffer to prevent overflow
+ if ( audio_used * channels + samples_needed > this->audio_buffer_size[ index ] )
{
- // Now store the codec with its destructor
- producer_codec_close( this->video_codec );
- this->video_codec = codec_context;
+ this->audio_buffer_size[ index ] *= 2;
+ audio_buffer = this->audio_buffer[ index ] = mlt_pool_realloc( audio_buffer, this->audio_buffer_size[ index ] * sizeof(int16_t) );
+ }
+ if ( resample )
+ {
+ // Copy to audio buffer while resampling
+ int16_t *source = decode_buffer;
+ int16_t *dest = &audio_buffer[ audio_used * channels ];
+ avformat_lock();
+ audio_used += audio_resample( resample, dest, source, convert_samples );
+ avformat_unlock();
}
else
{
- // Remember that we can't use this later
- this->video_index = index = -1;
+ // Straight copy to audio buffer
+ memcpy( &audio_buffer[ audio_used * codec_context->channels ], decode_buffer, data_size );
+ audio_used += convert_samples;
}
- avformat_unlock( );
- // Process properties as AVOptions
- apply_properties( codec_context, properties, AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM );
+ // Handle ignore
+ while ( *ignore && audio_used > samples )
+ {
+ *ignore -= 1;
+ audio_used -= samples;
+ memmove( audio_buffer, &audio_buffer[ samples * (resample? channels : codec_context->channels) ],
+ audio_used * sizeof( int16_t ) );
+ }
}
+ }
- // No codec, no show...
- if ( codec && index > -1 )
- {
- double source_fps = 0;
- double force_aspect_ratio = mlt_properties_get_double( properties, "force_aspect_ratio" );
- double aspect_ratio = ( force_aspect_ratio > 0.0 ) ?
- force_aspect_ratio : mlt_properties_get_double( properties, "aspect_ratio" );
-
- // Determine the fps
- source_fps = ( double )codec_context->time_base.den /
- ( codec_context->time_base.num == 0 ? 1 : codec_context->time_base.num );
+ // If we're behind, ignore this packet
+ if ( pkt.pts >= 0 )
+ {
+ double current_pts = av_q2d( context->streams[ index ]->time_base ) * pkt.pts;
+ int req_position = ( int )( timecode * fps + 0.5 );
+ int int_position = ( int )( current_pts * fps + 0.5 );
+ if ( context->start_time != AV_NOPTS_VALUE )
+ int_position -= ( int )( fps * context->start_time / AV_TIME_BASE + 0.5 );
- // If the muxer reports a frame rate different than the codec
- double muxer_fps = av_q2d( context->streams[ index ]->r_frame_rate );
- if ( source_fps != muxer_fps )
- // Choose the lesser - the wrong tends to be off by some multiple of 10
- source_fps = muxer_fps < source_fps ? muxer_fps : source_fps;
-
- // We'll use fps if it's available
- if ( source_fps > 0 )
- mlt_properties_set_double( properties, "source_fps", source_fps );
- else
- mlt_properties_set_double( properties, "source_fps", mlt_producer_get_fps( producer ) );
- mlt_properties_set_double( properties, "aspect_ratio", aspect_ratio );
-
- // Set the width and height
- mlt_properties_set_int( frame_properties, "width", codec_context->width );
- mlt_properties_set_int( frame_properties, "height", codec_context->height );
- mlt_properties_set_int( frame_properties, "real_width", codec_context->width );
- mlt_properties_set_int( frame_properties, "real_height", codec_context->height );
- mlt_properties_set_double( frame_properties, "aspect_ratio", aspect_ratio );
- if ( mlt_properties_get( properties, "force_progressive" ) )
- mlt_properties_set_int( frame_properties, "progressive", mlt_properties_get_int( properties, "force_progressive" ) );
-
- mlt_frame_push_service( frame, this );
- mlt_frame_push_get_image( frame, producer_get_image );
- }
- else
+ if ( this->seekable && *ignore == 0 )
{
- mlt_properties_set_int( frame_properties, "test_image", 1 );
+ if ( int_position < req_position )
+ // We are behind, so skip some
+ *ignore = 1;
+ else if ( int_position > req_position + 2 )
+ // We are ahead, so seek backwards some more
+ seek_audio( this, req_position, timecode - 1.0, ignore );
}
}
- else
- {
- mlt_properties_set_int( frame_properties, "test_image", 1 );
- }
+
+ this->audio_used[ index ] = audio_used;
+
+ return ret;
}
/** Get the audio from a frame.
{
// Get the producer
producer_avformat this = mlt_frame_pop_audio( frame );
- mlt_producer producer = &this->parent;
-
- // Get the properties from the frame
- mlt_properties frame_properties = MLT_FRAME_PROPERTIES( frame );
+ mlt_service_lock( MLT_PRODUCER_SERVICE(this->parent) );
+
// Obtain the frame number of this frame
- mlt_position position = mlt_properties_get_position( frame_properties, "avformat_position" );
-
- // Get the producer properties
- mlt_properties properties = MLT_PRODUCER_PROPERTIES( producer );
-
- // Fetch the audio_format
- AVFormatContext *context = this->audio_format;
-
- // Get the audio stream
- AVStream *stream = context->streams[ this->audio_index ];
-
- // Get codec context
- AVCodecContext *codec_context = stream->codec;
-
- // Packet
- AVPacket pkt;
-
- // Obtain the resample context if it exists (not always needed)
- ReSampleContext *resample = this->audio_resample;
-
- // Obtain the audio buffers
- int16_t *audio_buffer = this->audio_buffer;
- int16_t *decode_buffer = this->decode_buffer;
-
- // Get amount of audio used
- int audio_used = this->audio_used;
+ mlt_position position = mlt_properties_get_position( MLT_FRAME_PROPERTIES( frame ), "avformat_position" );
// Calculate the real time code
- double real_timecode = producer_time_of_frame( producer, position );
+ double real_timecode = producer_time_of_frame( this->parent, position );
+
+ // Get the producer fps
+ double fps = mlt_producer_get_fps( this->parent );
// Number of frames to ignore (for ffwd)
int ignore = 0;
// Flag for paused (silence)
- int paused = 0;
+ int paused = seek_audio( this, position, real_timecode, &ignore );
- // Check for resample and create if necessary
- if ( !resample && codec_context->channels <= 2 )
+ // Fetch the audio_format
+ AVFormatContext *context = this->audio_format;
+
+ // Determine the tracks to use
+ int index = this->audio_index;
+ int index_max = this->audio_index + 1;
+ if ( this->audio_index == INT_MAX )
{
- // Create the resampler
-#if (LIBAVCODEC_VERSION_INT >= ((52<<16)+(15<<8)+0))
- resample = av_audio_resample_init( *channels, codec_context->channels, *frequency, codec_context->sample_rate,
- SAMPLE_FMT_S16, codec_context->sample_fmt, 16, 10, 0, 0.8 );
-#else
- resample = audio_resample_init( *channels, codec_context->channels, *frequency, codec_context->sample_rate );
-#endif
-
- // And store it on properties
- if ( this->audio_resample ) audio_resample_close( this->audio_resample );
- this->audio_resample = resample;
+ index = 0;
+ index_max = context->nb_streams;
+ *channels = this->total_channels;
+ *frequency = this->max_frequency;
}
- else if ( !resample )
- {
- // TODO: uncomment and remove following line when full multi-channel support is ready
- // *channels = codec_context->channels;
- codec_context->request_channels = *channels;
- *frequency = codec_context->sample_rate;
- }
-
- // Check for audio buffer and create if necessary
- if ( !audio_buffer )
- this->audio_buffer = audio_buffer = mlt_pool_alloc( AVCODEC_MAX_AUDIO_FRAME_SIZE * sizeof( int16_t ) );
-
- // Check for decoder buffer and create if necessary
- if ( !decode_buffer )
- this->decode_buffer = decode_buffer = av_malloc( AVCODEC_MAX_AUDIO_FRAME_SIZE * sizeof( int16_t ) );
-
- // Seek if necessary
- if ( position != this->audio_expected )
+ // Initialize the resamplers and buffers
+ for ( ; index < index_max; index++ )
{
- if ( position + 1 == this->audio_expected )
- {
- // We're paused - silence required
- paused = 1;
- }
- else if ( !this->seekable && position > this->audio_expected && ( position - this->audio_expected ) < 250 )
- {
- // Fast forward - seeking is inefficient for small distances - just ignore following frames
- ignore = position - this->audio_expected;
- }
- else if ( position < this->audio_expected || position - this->audio_expected >= 12 )
+ // Get codec context
+ AVCodecContext *codec_context = this->audio_codec[ index ];
+
+ if ( codec_context && !this->audio_buffer[ index ] )
{
- int64_t timestamp = ( int64_t )( real_timecode * AV_TIME_BASE + 0.5 );
- if ( context->start_time != AV_NOPTS_VALUE )
- timestamp += context->start_time;
- if ( timestamp < 0 )
- timestamp = 0;
+ // Check for resample and create if necessary
+ if ( codec_context->channels <= 2 )
+ {
+ // Determine by how much resampling will increase number of samples
+ double resample_factor = this->audio_index == INT_MAX ? 1 : (double) *channels / codec_context->channels;
+ resample_factor *= (double) *frequency / codec_context->sample_rate;
+ if ( resample_factor > this->resample_factor )
+ this->resample_factor = resample_factor;
+
+ // Create the resampler
+#if (LIBAVCODEC_VERSION_INT >= ((52<<16)+(15<<8)+0))
+ this->audio_resample[ index ] = av_audio_resample_init(
+ this->audio_index == INT_MAX ? codec_context->channels : *channels,
+ codec_context->channels, *frequency, codec_context->sample_rate,
+ SAMPLE_FMT_S16, codec_context->sample_fmt, 16, 10, 0, 0.8 );
+#else
+ this->audio_resample[ index ] = audio_resample_init(
+ this->audio_index == INT_MAX ? codec_context->channels : *channels,
+ codec_context->channels, *frequency, codec_context->sample_rate );
+#endif
+ }
+ else
+ {
+ codec_context->request_channels = this->audio_index == INT_MAX ? codec_context->channels : *channels;
+ }
- // Set to the real timecode
- if ( av_seek_frame( context, -1, timestamp, AVSEEK_FLAG_BACKWARD ) != 0 )
- paused = 1;
+ // Check for audio buffer and create if necessary
+ this->audio_buffer_size[ index ] = AVCODEC_MAX_AUDIO_FRAME_SIZE;
+ this->audio_buffer[ index ] = mlt_pool_alloc( this->audio_buffer_size[ index ] * sizeof( int16_t ) );
- // Clear the usage in the audio buffer
- audio_used = 0;
+ // Check for decoder buffer and create if necessary
+ this->decode_buffer[ index ] = av_malloc( AVCODEC_MAX_AUDIO_FRAME_SIZE * sizeof( int16_t ) );
}
}
{
int ret = 0;
int got_audio = 0;
+ AVPacket pkt;
av_init_packet( &pkt );
-
- while( ret >= 0 && !got_audio )
+
+ // If not resampling, give consumer more than requested.
+ // It requested number samples based on requested frame rate.
+ // Do not clean this up with a samples *= ...!
+ if ( this->audio_index != INT_MAX && ! this->audio_resample[ this->audio_index ] )
+ *samples = *samples * this->audio_codec[ this->audio_index ]->sample_rate / *frequency;
+
+ while ( ret >= 0 && !got_audio )
{
// Check if the buffer already contains the samples required
- if ( audio_used >= *samples && ignore == 0 )
+ if ( this->audio_index != INT_MAX && this->audio_used[ this->audio_index ] >= *samples && ignore == 0 )
{
got_audio = 1;
break;
}
// Read a packet
+ avformat_lock();
ret = av_read_frame( context, &pkt );
+ avformat_unlock();
- int len = pkt.size;
- uint8_t *ptr = pkt.data;
-
- // We only deal with audio from the selected audio_index
- while ( ptr && ret >= 0 && pkt.stream_index == this->audio_index && len > 0 )
+ // We only deal with audio from the selected audio index
+ if ( ret >= 0 && pkt.data && pkt.size > 0 && ( pkt.stream_index == this->audio_index ||
+ ( this->audio_index == INT_MAX && context->streams[ pkt.stream_index ]->codec->codec_type == CODEC_TYPE_AUDIO ) ) )
{
- int data_size = sizeof( int16_t ) * AVCODEC_MAX_AUDIO_FRAME_SIZE;
-
- // Decode the audio
-#if (LIBAVCODEC_VERSION_INT >= ((51<<16)+(29<<8)+0))
- ret = avcodec_decode_audio2( codec_context, decode_buffer, &data_size, ptr, len );
-#else
- ret = avcodec_decode_audio( codec_context, decode_buffer, &data_size, ptr, len );
-#endif
- if ( ret < 0 )
- {
- ret = 0;
- break;
- }
-
- len -= ret;
- ptr += ret;
-
- if ( data_size > 0 && ( audio_used * *channels + data_size < AVCODEC_MAX_AUDIO_FRAME_SIZE ) )
- {
- if ( resample )
- {
- int16_t *source = decode_buffer;
- int16_t *dest = &audio_buffer[ audio_used * *channels ];
- int convert_samples = data_size / av_get_bits_per_sample_format( codec_context->sample_fmt )
- * 8 / codec_context->channels;
-
- audio_used += audio_resample( resample, dest, source, convert_samples );
- }
- else
- {
- memcpy( &audio_buffer[ audio_used * *channels ], decode_buffer, data_size );
- audio_used += data_size / *channels / av_get_bits_per_sample_format( codec_context->sample_fmt ) * 8;
- }
-
- // Handle ignore
- while ( ignore && audio_used > *samples )
- {
- ignore --;
- audio_used -= *samples;
- memmove( audio_buffer, &audio_buffer[ *samples * *channels ], audio_used * sizeof( int16_t ) );
- }
- }
+ int channels2 = this->audio_index == INT_MAX ? this->audio_codec[pkt.stream_index]->channels : *channels;
+ ret = decode_audio( this, &ignore, pkt, channels2, *samples, real_timecode, fps );
+ }
+ av_free_packet( &pkt );
- // If we're behind, ignore this packet
- if ( pkt.pts >= 0 )
+ if ( this->audio_index == INT_MAX && ret >= 0 )
+ {
+ // Determine if there is enough audio for all streams
+ got_audio = 1;
+ for ( index = 0; index < context->nb_streams; index++ )
{
- double current_pts = av_q2d( stream->time_base ) * pkt.pts;
- double source_fps = mlt_properties_get_double( properties, "source_fps" );
- int req_position = ( int )( real_timecode * source_fps + 0.5 );
- int int_position = ( int )( current_pts * source_fps + 0.5 );
-
- if ( context->start_time != AV_NOPTS_VALUE )
- int_position -= ( int )( context->start_time * source_fps / AV_TIME_BASE + 0.5 );
- if ( this->seekable && !ignore && int_position < req_position )
- ignore = 1;
+ if ( this->audio_codec[ index ] && this->audio_used[ index ] < *samples )
+ got_audio = 0;
}
}
-
- // We're finished with this packet regardless
- av_free_packet( &pkt );
}
-
- int size = *samples * *channels * sizeof( int16_t );
- *format = mlt_audio_s16;
+
+ // Allocate and set the frame's audio buffer
+ int size = *samples * *channels * sizeof(int16_t);
*buffer = mlt_pool_alloc( size );
+ *format = mlt_audio_s16;
mlt_frame_set_audio( frame, *buffer, *format, size, mlt_pool_release );
- // Now handle the audio if we have enough
- if ( audio_used >= *samples )
+ // Interleave tracks if audio_index=all
+ if ( this->audio_index == INT_MAX )
{
- memcpy( *buffer, audio_buffer, *samples * *channels * sizeof( int16_t ) );
- audio_used -= *samples;
- memmove( audio_buffer, &audio_buffer[ *samples * *channels ], audio_used * *channels * sizeof( int16_t ) );
+ int16_t *dest = *buffer;
+ int i;
+ for ( i = 0; i < *samples; i++ )
+ {
+ for ( index = 0; index < index_max; index++ )
+ if ( this->audio_codec[ index ] )
+ {
+ int current_channels = this->audio_codec[ index ]->channels;
+ int16_t *src = this->audio_buffer[ index ] + i * current_channels;
+ memcpy( dest, src, current_channels * sizeof(int16_t) );
+ dest += current_channels;
+ }
+ }
+ for ( index = 0; index < index_max; index++ )
+ if ( this->audio_codec[ index ] && this->audio_used[ index ] >= *samples )
+ {
+ int current_channels = this->audio_codec[ index ]->channels;
+ int16_t *src = this->audio_buffer[ index ] + *samples * current_channels;
+ this->audio_used[index] -= *samples;
+ memmove( this->audio_buffer[ index ], src, this->audio_used[ index ] * current_channels * sizeof(int16_t) );
+ }
}
+ // Copy a single track to the output buffer
else
{
- memset( *buffer, 0, *samples * *channels * sizeof( int16_t ) );
- }
+ index = this->audio_index;
- // Store the number of audio samples still available
- this->audio_used = audio_used;
+ // Now handle the audio if we have enough
+ if ( this->audio_used[ index ] > 0 )
+ {
+ int16_t *src = this->audio_buffer[ index ];
+ *samples = this->audio_used[ index ] < *samples ? this->audio_used[ index ] : *samples;
+ memcpy( *buffer, src, *samples * *channels * sizeof(int16_t) );
+ this->audio_used[ index ] -= *samples;
+ memmove( src, &src[ *samples * *channels ], this->audio_used[ index ] * *channels * sizeof(int16_t) );
+ }
+ else
+ {
+ // Otherwise fill with silence
+ memset( *buffer, 0, *samples * *channels * sizeof(int16_t) );
+ }
+ if ( !this->audio_resample[ index ] )
+ {
+ // TODO: uncomment and remove following line when full multi-channel support is ready
+ // *channels = codec_context->channels;
+ *frequency = this->audio_codec[ index ]->sample_rate;
+ }
+ }
}
else
{
// Get silence and don't touch the context
mlt_frame_get_audio( frame, buffer, format, frequency, channels, samples );
}
-
+
// Regardless of speed (other than paused), we expect to get the next frame
if ( !paused )
this->audio_expected = position + 1;
+ mlt_service_unlock( MLT_PRODUCER_SERVICE(this->parent) );
+
return 0;
}
static int audio_codec_init( producer_avformat this, int index, mlt_properties properties )
{
// Initialise the codec if necessary
- if ( !this->audio_codec )
+ if ( !this->audio_codec[ index ] )
{
- // Get the audio stream
- AVStream *stream = this->audio_format->streams[ index ];
-
// Get codec context
- AVCodecContext *codec_context = stream->codec;
+ AVCodecContext *codec_context = this->audio_format->streams[index]->codec;
// Find the codec
- AVCodec *codec = avcodec_find_decoder( stream->codec->codec_id );
+ AVCodec *codec = avcodec_find_decoder( codec_context->codec_id );
// If we don't have a codec and we can't initialise it, we can't do much more...
avformat_lock( );
if ( codec && avcodec_open( codec_context, codec ) >= 0 )
{
// Now store the codec with its destructor
- producer_codec_close( this->audio_codec );
- this->audio_codec = codec_context;
+ if ( this->audio_codec[ index ] )
+ avcodec_close( this->audio_codec[ index ] );
+ this->audio_codec[ index ] = codec_context;
}
else
{
// Process properties as AVOptions
apply_properties( codec_context, properties, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_DECODING_PARAM );
}
- return this->audio_codec && this->audio_index > -1;
+ return this->audio_codec[ index ] && this->audio_index > -1;
}
/** Set up audio handling.
static void producer_set_up_audio( producer_avformat this, mlt_frame frame )
{
// Get the producer
- mlt_producer producer = &this->parent;
+ mlt_producer producer = this->parent;
// Get the properties
mlt_properties properties = MLT_PRODUCER_PROPERTIES( producer );
// Fetch the audio format context
AVFormatContext *context = this->audio_format;
+ mlt_properties frame_properties = MLT_FRAME_PROPERTIES( frame );
+
// Get the audio_index
int index = mlt_properties_get_int( properties, "audio_index" );
+ // Handle all audio tracks
+ if ( this->audio_index > -1 &&
+ mlt_properties_get( properties, "audio_index" ) &&
+ !strcmp( mlt_properties_get( properties, "audio_index" ), "all" ) )
+ index = INT_MAX;
+
// Reopen the file if necessary
- if ( !context && index > -1 )
+ if ( !context && this->audio_index > -1 && index > -1 )
{
mlt_events_block( properties, producer );
producer_open( this, mlt_service_profile( MLT_PRODUCER_SERVICE(producer) ),
mlt_properties_get( properties, "resource" ) );
context = this->audio_format;
- producer_format_close( this->dummy_context );
+ if ( this->dummy_context )
+ {
+ avformat_lock();
+ av_close_input_file( this->dummy_context );
+ avformat_unlock();
+ }
this->dummy_context = NULL;
mlt_events_unblock( properties, producer );
+ get_audio_streams_info( this );
}
// Exception handling for audio_index
- if ( context && index >= (int) context->nb_streams )
+ if ( context && index >= (int) context->nb_streams && index < INT_MAX )
{
for ( index = context->nb_streams - 1;
index >= 0 && context->streams[ index ]->codec->codec_type != CODEC_TYPE_AUDIO;
index-- );
mlt_properties_set_int( properties, "audio_index", index );
}
- if ( context && index > -1 && context->streams[ index ]->codec->codec_type != CODEC_TYPE_AUDIO )
+ if ( context && index > -1 && index < INT_MAX &&
+ context->streams[ index ]->codec->codec_type != CODEC_TYPE_AUDIO )
{
- index = -1;
+ index = this->audio_index;
mlt_properties_set_int( properties, "audio_index", index );
}
// Update the audio properties if the index changed
- if ( index > -1 && index != this->audio_index )
+ if ( context && index > -1 && index != this->audio_index )
{
- this->audio_index = index;
- producer_codec_close( this->audio_codec );
- this->audio_codec = NULL;
+ if ( this->audio_codec[ this->audio_index ] )
+ {
+ avformat_lock();
+ avcodec_close( this->audio_codec[ this->audio_index ] );
+ avformat_unlock();
+ }
+ this->audio_codec[ this->audio_index ] = NULL;
}
+ if ( this->audio_index != -1 )
+ this->audio_index = index;
+ else
+ index = -1;
- // Get the codec
- if ( context && index > -1 && audio_codec_init( this, index, properties ) )
+ // Get the codec(s)
+ if ( context && index == INT_MAX )
+ {
+ mlt_properties_set_int( frame_properties, "frequency", this->max_frequency );
+ mlt_properties_set_int( frame_properties, "channels", this->total_channels );
+ for ( index = 0; index < context->nb_streams; index++ )
+ {
+ if ( context->streams[ index ]->codec->codec_type == CODEC_TYPE_AUDIO )
+ audio_codec_init( this, index, properties );
+ }
+ }
+ else if ( context && index > -1 && audio_codec_init( this, index, properties ) )
{
// Set the frame properties
- mlt_properties frame_properties = MLT_FRAME_PROPERTIES( frame );
- mlt_properties_set_int( frame_properties, "frequency", this->audio_codec->sample_rate );
- mlt_properties_set_int( frame_properties, "channels", this->audio_codec->channels );
+ if ( index < INT_MAX )
+ {
+ mlt_properties_set_int( frame_properties, "frequency", this->audio_codec[ index ]->sample_rate );
+ mlt_properties_set_int( frame_properties, "channels", this->audio_codec[ index ]->channels );
+ }
+ }
+ if ( context && index > -1 )
+ {
+ // Add our audio operation
mlt_frame_push_audio( frame, this );
mlt_frame_push_audio( frame, producer_get_audio );
}
static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int index )
{
// Access the private data
- producer_avformat this = producer->child;
+ mlt_service service = MLT_PRODUCER_SERVICE( producer );
+ mlt_cache_item cache_item = mlt_service_cache_get( service, "producer_avformat" );
+ producer_avformat this = mlt_cache_item_data( cache_item, NULL );
+
+ // If cache miss
+ if ( !this )
+ {
+ this = calloc( 1, sizeof( struct producer_avformat_s ) );
+ producer->child = this;
+ this->parent = producer;
+ mlt_service_cache_put( service, "producer_avformat", this, 0, (mlt_destructor) producer_avformat_close );
+ cache_item = mlt_service_cache_get( service, "producer_avformat" );
+ }
// Create an empty frame
- *frame = mlt_frame_init( MLT_PRODUCER_SERVICE( producer ) );
+ *frame = mlt_frame_init( service);
+
+ if ( *frame )
+ {
+ mlt_properties_set_data( MLT_FRAME_PROPERTIES(*frame), "avformat_cache", cache_item, 0, (mlt_destructor) mlt_cache_item_close, NULL );
+ }
+ else
+ {
+ mlt_cache_item_close( cache_item );
+ return 1;
+ }
// Update timecode on the frame we're creating
mlt_frame_set_position( *frame, mlt_producer_position( producer ) );
// Set the position of this producer
mlt_properties_set_position( MLT_FRAME_PROPERTIES( *frame ), "avformat_position", mlt_producer_frame( producer ) );
-
+
// Set up the video
producer_set_up_video( this, *frame );
// Set up the audio
producer_set_up_audio( this, *frame );
- // Set the aspect_ratio
- mlt_properties_set_double( MLT_FRAME_PROPERTIES( *frame ), "aspect_ratio",
- mlt_properties_get_double( MLT_PRODUCER_PROPERTIES( producer ), "aspect_ratio" ) );
-
// Calculate the next timecode
mlt_producer_prepare_next( producer );
return 0;
}
-static void producer_close( mlt_producer parent )
+static void producer_avformat_close( producer_avformat this )
{
- // Obtain this
- producer_avformat this = parent->child;
-
+ mlt_log_debug( NULL, "producer_avformat_close\n" );
// Close the file
av_free( this->av_frame );
- if ( this->audio_resample )
- audio_resample_close( this->audio_resample );
- mlt_pool_release( this->audio_buffer );
- av_free( this->decode_buffer );
- producer_codec_close( this->audio_codec );
- producer_codec_close( this->video_codec );
- producer_format_close( this->dummy_context );
- producer_format_close( this->audio_format );
- producer_format_close( this->video_context );
+ avformat_lock();
+ int i;
+ for ( i = 0; i < MAX_AUDIO_STREAMS; i++ )
+ {
+ if ( this->audio_resample[i] )
+ audio_resample_close( this->audio_resample[i] );
+ mlt_pool_release( this->audio_buffer[i] );
+ av_free( this->decode_buffer[i] );
+ if ( this->audio_codec[i] )
+ avcodec_close( this->audio_codec[i] );
+ }
+ if ( this->video_codec )
+ avcodec_close( this->video_codec );
+ if ( this->dummy_context )
+ av_close_input_file( this->dummy_context );
+ if ( this->audio_format )
+ av_close_input_file( this->audio_format );
+ if ( this->video_format )
+ av_close_input_file( this->video_format );
+ avformat_unlock();
+#ifdef VDPAU
+ vdpau_producer_close( this );
+#endif
+ if ( this->image_cache )
+ mlt_cache_close( this->image_cache );
+ free( this );
+}
+static void producer_close( mlt_producer parent )
+{
// Close the parent
parent->close = NULL;
mlt_producer_close( parent );
// Free the memory
- free( this );
+ free( parent );
}
projects / mlt / blobdiff