/*
* 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>
#if (LIBAVCODEC_VERSION_INT >= ((51<<16)+(71<<8)+0))
# include "audioconvert.h"
#endif
+#ifdef VDPAU
+#include <vdpau.h>
+#endif
// System header files
#include <stdlib.h>
#define POSITION_INITIAL (-2)
#define POSITION_INVALID (-1)
-#define MAX_AUDIO_STREAMS (8)
+#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_format;
int max_channel;
int max_frequency;
unsigned int invalid_pts_counter;
+ double resample_factor;
+ mlt_cache image_cache;
+#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_format );
- this->video_format = 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;
}
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;
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 );
if ( av == 0 && audio_index != -1 && video_index != -1 )
{
// We'll use the open one as our video_format
- avformat_unlock();
- producer_format_close( this->video_format );
- avformat_lock();
this->video_format = context;
// And open again for our audio context
av_find_stream_info( context );
// Audio context
- avformat_unlock();
- producer_format_close( this->audio_format );
- avformat_lock();
this->audio_format = context;
}
else if ( av != 2 && video_index != -1 )
{
// We only have a video context
- avformat_unlock();
- producer_format_close( this->video_format );
- avformat_lock();
this->video_format = context;
}
else if ( audio_index != -1 )
{
// We only have an audio context
- avformat_unlock();
- producer_format_close( this->audio_format );
- avformat_lock();
this->audio_format = context;
}
else
}
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 inline void convert_image( AVFrame *frame, uint8_t *buffer, int pix_fmt, mlt_image_format *format, int width, int height )
{
*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, SWS_BILINEAR, NULL, NULL, NULL);
AVPicture output;
avpicture_fill( &output, buffer, PIX_FMT_RGBA, width, height );
sws_scale( context, frame->data, frame->linesize, 0, height,
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, SWS_BILINEAR, 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;
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, SWS_BILINEAR, NULL, NULL, NULL);
AVPicture output;
avpicture_fill( &output, buffer, PIX_FMT_RGB24, width, height );
sws_scale( context, frame->data, frame->linesize, 0, height,
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, SWS_BILINEAR, NULL, NULL, NULL);
AVPicture output;
avpicture_fill( &output, buffer, PIX_FMT_RGBA, width, height );
sws_scale( context, frame->data, frame->linesize, 0, height,
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, SWS_BILINEAR, NULL, NULL, NULL);
AVPicture output;
avpicture_fill( &output, buffer, PIX_FMT_YUYV422, width, height );
sws_scale( context, frame->data, frame->linesize, 0, height,
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;
{
// Get the producer
producer_avformat this = mlt_frame_pop_service( frame );
- mlt_producer producer = &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 format context
AVFormatContext *context = this->video_format;
// 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, format );
+ if ( *buffer )
+ {
+ // Set the resolution
+ *width = codec_context->width;
+ *height = codec_context->height;
+ mlt_properties_set_int( frame_properties, "width", *width );
+ mlt_properties_set_int( frame_properties, "height", *height );
+
+ // 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;
}
// Duplicate the last image if necessary (see comment on rawvideo below)
- if ( this->av_frame && this->got_picture && this->seekable
+ 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 ) )
+ if ( ( image_size = allocate_buffer( frame_properties, codec_context, buffer, format, width, height ) ) )
+#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 );
+ }
+ else
+#endif
convert_image( this->av_frame, *buffer, codec_context->pix_fmt, format, *width, *height );
else
mlt_frame_get_image( frame, buffer, format, width, height, writable );
{
this->invalid_pts_counter = 0;
}
- mlt_log_debug( MLT_PRODUCER_SERVICE(producer), "pkt.pts %llu req_pos %d cur_pos %d pkt_pos %d",
+ 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 )
// 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 ) ) )
{
+#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 );
+ }
+ 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 );
- 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;
this->current_position = int_position;
this->got_picture = 1;
}
}
}
- 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();
+ 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 );
+ }
+
+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
mlt_properties_set_int( frame_properties, "top_field_first", this->top_field_first );
// Regardless of speed, we expect to get the next frame (cos we ain't too bright)
this->video_expected = position + 1;
- return 0;
+ 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) );
+ av_set_string( obj, opt_name, mlt_properties_get( properties, opt_name) );
#endif
+ }
}
}
// 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 ( codec && avcodec_open( codec_context, codec ) >= 0 )
{
// Now store the codec with its destructor
- producer_codec_close( this->video_codec );
this->video_codec = codec_context;
}
else
// Reset some image properties
mlt_properties_set_int( properties, "width", this->video_codec->width );
mlt_properties_set_int( properties, "height", this->video_codec->height );
- mlt_properties_set_double( properties, "aspect_ratio", get_aspect_ratio( stream, this->video_codec, NULL ) );
+ // For DV, we'll just use the saved aspect ratio
+ if ( codec_context->codec_id != CODEC_ID_DVVIDEO )
+ mlt_properties_set_double( properties, "aspect_ratio", get_aspect_ratio( 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 the muxer reports a frame rate different than the codec
- double muxer_fps = av_q2d( stream->r_frame_rate );
- if ( source_fps != muxer_fps )
+
+ if ( mlt_properties_get( properties, "force_fps" ) )
+ {
+ source_fps = mlt_properties_get_double( properties, "force_fps" );
+ stream->time_base = av_d2q( source_fps, 255 );
+ }
+ else
+ {
+ // If the muxer reports a frame rate different than the codec
+ double muxer_fps = av_q2d( stream->r_frame_rate );
// Choose the lesser - the wrong tends to be off by some multiple of 10
- source_fps = muxer_fps < source_fps ? muxer_fps : source_fps;
+ source_fps = FFMIN( source_fps, muxer_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( &this->parent ) );
+ mlt_properties_set_double( properties, "source_fps", mlt_producer_get_fps( this->parent ) );
}
return this->video_codec && this->video_index > -1;
}
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 );
producer_open( this, mlt_service_profile( MLT_PRODUCER_SERVICE(producer) ),
mlt_properties_get( properties, "resource" ) );
context = this->video_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 );
if ( this->audio_format )
{
// Reset the video properties if the index changed
this->video_index = index;
- producer_codec_close( this->video_codec );
+ if ( this->video_codec )
+ {
+ avformat_lock();
+ avcodec_close( this->video_codec );
+ avformat_unlock();
+ }
this->video_codec = NULL;
}
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 );
- if ( mlt_properties_get( properties, "force_progressive" ) )
- mlt_properties_set_int( frame_properties, "progressive", mlt_properties_get_int( properties, "force_progressive" ) );
// Add our image operation
mlt_frame_push_service( frame, this );
{
int paused = 0;
- // Fetch the audio_format
- AVFormatContext *context = this->audio_format;
-
// Seek if necessary
if ( 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;
return paused;
}
-static int decode_audio( producer_avformat this, int *ignore, AVPacket *pkt, int samples, double timecode, double source_fps )
+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;
int16_t *decode_buffer = this->decode_buffer[ index ];
int audio_used = this->audio_used[ index ];
- int channels = codec_context->channels;
uint8_t *ptr = pkt->data;
int len = pkt->size;
int ret = 0;
int data_size = sizeof( int16_t ) * AVCODEC_MAX_AUDIO_FRAME_SIZE;
// Decode the audio
-#if (LIBAVCODEC_VERSION_INT >= ((51<<16)+(29<<8)+0))
+#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 );
// 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 + data_size > this->audio_buffer_size[ index ] )
+ if ( audio_used * channels + samples_needed > this->audio_buffer_size[ index ] )
{
- mlt_pool_release( this->audio_buffer[ index ] );
- this->audio_buffer_size[ index ] = audio_used * channels * sizeof(int16_t) + data_size * 2;
- audio_buffer = this->audio_buffer[ index ] = mlt_pool_alloc( this->audio_buffer_size[ index ] );
+ 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 ];
- int convert_samples = data_size / channels / ( av_get_bits_per_sample_format( codec_context->sample_fmt ) / 8 );
audio_used += audio_resample( resample, dest, source, convert_samples );
}
else
{
// Straight copy to audio buffer
- 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 );
+ memcpy( &audio_buffer[ audio_used * codec_context->channels ], decode_buffer, data_size );
+ audio_used += convert_samples;
}
// Handle ignore
{
*ignore -= 1;
audio_used -= samples;
- memmove( audio_buffer, &audio_buffer[ samples * channels ], audio_used * sizeof( int16_t ) );
+ memmove( audio_buffer, &audio_buffer[ samples * (resample? channels : codec_context->channels) ],
+ audio_used * sizeof( int16_t ) );
}
}
}
if ( pkt->pts >= 0 )
{
double current_pts = av_q2d( context->streams[ index ]->time_base ) * pkt->pts;
- int req_position = ( int )( timecode * source_fps + 0.5 );
- int int_position = ( int )( current_pts * source_fps + 0.5 );
-
+ 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 )( source_fps * context->start_time / AV_TIME_BASE + 0.5 );
- if ( this->seekable && *ignore == 0 && int_position < req_position )
- *ignore = 1;
+ int_position -= ( int )( fps * context->start_time / AV_TIME_BASE + 0.5 );
+
+ if ( this->seekable && *ignore == 0 )
+ {
+ 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 );
+ }
}
this->audio_used[ index ] = 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( &this->parent, position );
+ double real_timecode = producer_time_of_frame( this->parent, position );
- // Get the source fps
- double source_fps = mlt_properties_get_double( MLT_PRODUCER_PROPERTIES( &this->parent ), "source_fps" );
+ // Get the producer fps
+ double fps = mlt_producer_get_fps( this->parent );
// Number of frames to ignore (for ffwd)
int ignore = 0;
// 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;
// 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(
}
// Check for audio buffer and create if necessary
- this->audio_buffer[ index ] = mlt_pool_alloc( AVCODEC_MAX_AUDIO_FRAME_SIZE * sizeof( int16_t ) );
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 ) );
// Check for decoder buffer and create if necessary
this->decode_buffer[ index ] = av_malloc( AVCODEC_MAX_AUDIO_FRAME_SIZE * sizeof( int16_t ) );
AVPacket pkt;
av_init_packet( &pkt );
+
+ // 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 )
{
// 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 ) ) )
- ret = decode_audio( this, &ignore, &pkt, *samples, real_timecode, source_fps );
+ {
+ 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 ( this->audio_index == INT_MAX && ret >= 0 )
}
}
}
-
+
// Allocate and set the frame's audio buffer
int size = *samples * *channels * sizeof(int16_t);
*buffer = mlt_pool_alloc( size );
}
}
for ( index = 0; index < index_max; index++ )
- if ( this->audio_codec[ 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;
// 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;
if ( codec && avcodec_open( codec_context, codec ) >= 0 )
{
// Now store the codec with its destructor
- avformat_unlock();
- producer_codec_close( this->audio_codec[index] );
+ if ( this->audio_codec[ index ] )
+ avcodec_close( this->audio_codec[ index ] );
this->audio_codec[ index ] = codec_context;
}
else
{
// Remember that we can't use this later
this->audio_index = -1;
- avformat_unlock( );
}
+ avformat_unlock( );
// Process properties as AVOptions
apply_properties( codec_context, properties, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_DECODING_PARAM );
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 );
int index = mlt_properties_get_int( properties, "audio_index" );
// Handle all audio tracks
- if ( mlt_properties_get( properties, "audio_index" ) &&
- !strcmp( mlt_properties_get( properties, "audio_index" ), "all" ) )
+ 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 );
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 )
{
- producer_codec_close( this->audio_codec[ this->audio_index ] );
+ 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;
}
- this->audio_index = index;
+ if ( this->audio_index != -1 )
+ this->audio_index = index;
+ else
+ index = -1;
// Get the codec(s)
if ( context && index == INT_MAX )
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 );
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 );
+ avformat_lock();
int i;
for ( i = 0; i < MAX_AUDIO_STREAMS; i++ )
{
audio_resample_close( this->audio_resample[i] );
mlt_pool_release( this->audio_buffer[i] );
av_free( this->decode_buffer[i] );
- producer_codec_close( this->audio_codec[i] );
+ if ( this->audio_codec[i] )
+ avcodec_close( this->audio_codec[i] );
}
- producer_codec_close( this->video_codec );
- producer_format_close( this->dummy_context );
- producer_format_close( this->audio_format );
- producer_format_close( this->video_format );
+ 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