* producer_avformat.c -- avformat producer
* Copyright (C) 2003-2004 Ushodaya Enterprises Limited
* Author: Charles Yates <charles.yates@pandora.be>
+ * Much code borrowed from ffmpeg.c: Copyright (c) 2000-2003 Fabrice Bellard
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-// Local header files
-#include "producer_avformat.h"
-
// MLT Header files
+#include <framework/mlt_producer.h>
#include <framework/mlt_frame.h>
// ffmpeg Header files
void avformat_unlock( );
// Forward references.
-static int producer_open( mlt_producer this, char *file );
+static int producer_open( mlt_producer this, mlt_profile profile, char *file );
static int producer_get_frame( mlt_producer this, mlt_frame_ptr frame, int index );
/** Constructor for libavformat.
*/
-mlt_producer producer_avformat_init( char *file )
+mlt_producer producer_avformat_init( mlt_profile profile, char *file )
{
mlt_producer this = NULL;
this->get_frame = producer_get_frame;
// Open the file
- if ( producer_open( this, file ) != 0 )
+ if ( producer_open( this, profile, file ) != 0 )
{
// Clean up
mlt_producer_close( this );
for( i = 0; i < context->nb_streams; i++ )
{
// Get the codec context
- AVCodecContext *codec_context = context->streams[ i ]->codec;
+ AVCodecContext *codec_context = context->streams[ i ]->codec;
if ( avcodec_find_decoder( codec_context->codec_id ) == NULL )
continue;
// Determine the type and obtain the first index of each type
- switch( codec_context->codec_type )
+ switch( codec_context->codec_type )
{
case CODEC_TYPE_VIDEO:
if ( *video_index < 0 )
case CODEC_TYPE_AUDIO:
if ( *audio_index < 0 )
*audio_index = i;
- break;
+ break;
default:
- break;
+ break;
}
}
}
/** Open the file.
*/
-static int producer_open( mlt_producer this, char *file )
+static int producer_open( mlt_producer this, mlt_profile profile, char *file )
{
// Return an error code (0 == no error)
int error = 0;
mlt_properties properties = MLT_PRODUCER_PROPERTIES( this );
// We will treat everything with the producer fps
- double fps = mlt_properties_get_double( properties, "fps" );
+ double fps = mlt_profile_fps( profile );
// Lock the mutex now
avformat_lock( );
params->width = 640;
params->height = 480;
params->time_base= (AVRational){1,25};
- params->device = file;
+ // params->device = file;
params->channels = 2;
params->sample_rate = 48000;
}
+ // XXX: this does not work anymore since avdevice
+ // TODO: make producer_avddevice?
// Parse out params
mrl = strchr( file, '?' );
while ( mrl )
// This isn't going to be accurate for all formats
mlt_position frames = ( mlt_position )( ( ( double )context->duration / ( double )AV_TIME_BASE ) * fps + 0.5 );
mlt_properties_set_position( properties, "out", frames - 1 );
- mlt_properties_set_position( properties, "length", frames - 0 );
+ mlt_properties_set_position( properties, "length", frames );
}
// Find default audio and video streams
find_default_streams( context, &audio_index, &video_index );
- if ( context->start_time != AV_NOPTS_VALUE )
- mlt_properties_set_double( properties, "_start_time", context->start_time );
+ if ( context->start_time != AV_NOPTS_VALUE )
+ mlt_properties_set_double( properties, "_start_time", context->start_time );
// Check if we're seekable (something funny about mpeg here :-/)
if ( strcmp( file, "pipe:" ) && strncmp( file, "http://", 6 ) )
static double producer_time_of_frame( mlt_producer this, mlt_position position )
{
- // Get the properties
- mlt_properties properties = MLT_PRODUCER_PROPERTIES( this );
-
- // Obtain the fps
- double fps = mlt_properties_get_double( properties, "fps" );
-
- // Do the calc
- return ( double )position / fps;
+ 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 )
// We may want to use the source fps if available
double source_fps = mlt_properties_get_double( properties, "source_fps" );
- double fps = mlt_properties_get_double( properties, "fps" );
+ double fps = mlt_producer_get_fps( this );
// This is the physical frame position in the source
int req_position = ( int )( position / fps * source_fps + 0.5 );
got_picture = 0;
}
}
+ av_free_packet( &pkt );
+ }
+ else if ( ret >= 0 )
+ {
+ av_free_packet( &pkt );
}
// Now handle the picture if we have one
mlt_properties_set_int( properties, "_current_position", int_position );
mlt_properties_set_int( properties, "_got_picture", 1 );
}
-
- // We're finished with this packet regardless
- av_free_packet( &pkt );
}
}
// Initialise the codec if necessary
if ( codec == NULL )
{
+ // 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;
+ }
+
// Find the codec
codec = avcodec_find_decoder( codec_context->codec_id );
}
else
{
- int is_pal = mlt_properties_get_double( properties, "fps" ) == 25.0;
+ int is_pal = mlt_producer_get_fps( this ) == 25.0;
aspect_ratio = is_pal ? 59.0/54.0 : 10.0/11.0;
}
source_fps = ( double )codec_context->time_base.den / ( codec_context->time_base.num == 0 ? 1 : codec_context->time_base.num );
// We'll use fps if it's available
- if ( source_fps > 0 && source_fps < 30 )
+ if ( source_fps > 0 )
mlt_properties_set_double( properties, "source_fps", source_fps );
else
- mlt_properties_set_double( properties, "source_fps", mlt_properties_get_double( properties, "fps" ) );
+ mlt_properties_set_double( properties, "source_fps", mlt_producer_get_fps( this ) );
mlt_properties_set_double( properties, "aspect_ratio", aspect_ratio );
// Set the width and height
// Initialise the codec if necessary
if ( codec == NULL )
{
+ // 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;
+ }
+
// Find the codec
codec = avcodec_find_decoder( codec_context->codec_id );
static int producer_get_frame( mlt_producer this, mlt_frame_ptr frame, int index )
{
// Create an empty frame
- *frame = mlt_frame_init( );
+ *frame = mlt_frame_init( MLT_PRODUCER_SERVICE( this ) );
// Update timecode on the frame we're creating
mlt_frame_set_position( *frame, mlt_producer_position( this ) );
projects / melted / blobdiff