#ifdef SWSCALE
# include <libswscale/swscale.h>
#endif
-#if LIBAVCODEC_VERSION_MAJOR > 52
+#if LIBAVCODEC_VERSION_MAJOR >= 53
#include <libavutil/samplefmt.h>
#elif (LIBAVCODEC_VERSION_INT >= ((51<<16)+(71<<8)+0))
const char *avcodec_get_sample_fmt_name(int sample_fmt);
#define PIX_FMT_YUYV422 PIX_FMT_YUV422
#endif
-#if LIBAVCODEC_VERSION_MAJOR > 52
+#if LIBAVCODEC_VERSION_MAJOR >= 53
#include <libavutil/opt.h>
#define CODEC_TYPE_VIDEO AVMEDIA_TYPE_VIDEO
#define CODEC_TYPE_AUDIO AVMEDIA_TYPE_AUDIO
int video_index;
double start_time;
int first_pts;
- int last_position;
+ int64_t last_position;
int seekable;
- int current_position;
+ int64_t current_position;
+ mlt_position nonseek_position;
int got_picture;
int top_field_first;
uint8_t *audio_buffer[ MAX_AUDIO_STREAMS ];
int colorspace;
pthread_mutex_t video_mutex;
pthread_mutex_t audio_mutex;
+ mlt_deque apackets;
+ mlt_deque vpackets;
+ pthread_mutex_t packets_mutex;
#ifdef VDPAU
struct
{
// Forward references.
static int list_components( char* file );
-static int producer_open( producer_avformat self, mlt_profile profile, const char *URL );
+static int producer_open( producer_avformat self, mlt_profile profile, const char *URL, int take_lock );
static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int index );
static void producer_avformat_close( producer_avformat );
static void producer_close( mlt_producer parent );
static void producer_set_up_audio( producer_avformat self, mlt_frame frame );
static void apply_properties( void *obj, mlt_properties properties, int flags );
static int video_codec_init( producer_avformat self, int index, mlt_properties properties );
+static void get_audio_streams_info( producer_avformat self );
#ifdef VDPAU
#include "vdpau.c"
if ( strcmp( service, "avformat-novalidate" ) )
{
// Open the file
- if ( producer_open( self, profile, file ) != 0 )
+ if ( producer_open( self, profile, file, 1 ) != 0 )
{
// Clean up
mlt_producer_close( producer );
producer = NULL;
}
- else
+ else if ( self->seekable )
{
// Close the file to release resources for large playlists - reopen later as needed
avformat_lock();
- if ( self->dummy_context )
- av_close_input_file( self->dummy_context );
- self->dummy_context = NULL;
if ( self->audio_format )
av_close_input_file( self->audio_format );
self->audio_format = NULL;
av_close_input_file( self->video_format );
self->video_format = NULL;
avformat_unlock();
-
- // Default the user-selectable indices from the auto-detected indices
- mlt_properties_set_int( properties, "audio_index", self->audio_index );
- mlt_properties_set_int( properties, "video_index", self->video_index );
}
}
if ( producer )
{
+ // Default the user-selectable indices from the auto-detected indices
+ mlt_properties_set_int( properties, "audio_index", self->audio_index );
+ mlt_properties_set_int( properties, "video_index", self->video_index );
#ifdef VDPAU
mlt_service_cache_set_size( MLT_PRODUCER_SERVICE(producer), "producer_avformat", 5 );
#endif
if ( self->audio_index < 0 )
self->audio_index = i;
mlt_properties_set( meta_media, key, "audio" );
-#if LIBAVCODEC_VERSION_MAJOR > 52
+#if LIBAVCODEC_VERSION_MAJOR >= 53
snprintf( key, sizeof(key), "meta.media.%d.codec.sample_fmt", i );
mlt_properties_set( meta_media, key, av_get_sample_fmt_name( codec_context->sample_fmt ) );
#elif (LIBAVCODEC_VERSION_INT >= ((51<<16)+(71<<8)+0))
return aspect_ratio;
}
-static char* parse_url( mlt_profile profile, const char* URL, AVInputFormat **format, AVFormatParameters **parameters )
+static char* parse_url( mlt_profile profile, const char* URL, AVInputFormat **format, AVFormatParameters *params )
{
if ( !URL ) return NULL;
- char *result = NULL;
+ const char *result = URL;
char *protocol = strdup( URL );
char *url = strchr( protocol, ':' );
// Only if there is not a protocol specification that avformat can handle
-#if LIBAVFORMAT_VERSION_MAJOR > 52
+#if LIBAVFORMAT_VERSION_MAJOR >= 53
if ( url && avio_check( URL, 0 ) < 0 )
#else
if ( url && !url_exist( URL ) )
{
// Truncate protocol string
url[0] = 0;
+ mlt_log_debug( NULL, "%s: protocol=%s resource=%s\n", __FUNCTION__, protocol, url + 1 );
// Lookup the format
*format = av_find_input_format( protocol );
if ( *format )
{
- // Allocate params
- AVFormatParameters *params = *parameters = calloc( 1, sizeof( AVFormatParameters ) );
-
// These are required by video4linux2 (defaults)
params->width = profile->width;
params->height = profile->height;
- params->time_base= (AVRational){ profile->frame_rate_den, profile->frame_rate_num };
+ if ( !strstr( URL, "&frame_rate" ) )
+ params->time_base = (AVRational){ profile->frame_rate_den, profile->frame_rate_num };
params->channels = 2;
params->sample_rate = 48000;
{
url[0] = 0;
char *name = strdup( ++url );
- char *value = strchr( name, ':' );
+ char *value = strchr( name, '=' );
+ if ( !value )
+ // Also accept : as delimiter for backwards compatibility.
+ value = strchr( name, ':' );
if ( value )
{
value[0] = 0;
}
}
}
+ result = strdup( result );
free( protocol );
- return result ? strdup( result ) : strdup( URL );
+ return result;
}
static int get_basic_info( producer_avformat self, mlt_profile profile, const char *filename )
if ( format->pb )
{
// protocols can indicate if they support seeking
-#if LIBAVFORMAT_VERSION_MAJOR > 52
- self->seekable = context->pb->seekable;
+#if LIBAVFORMAT_VERSION_MAJOR >= 53
+ self->seekable = format->pb->seekable;
#else
URLContext *uc = url_fileno( format->pb );
if ( uc )
/** Open the file.
*/
-static int producer_open( producer_avformat self, mlt_profile profile, const char *URL )
+static int producer_open( producer_avformat self, mlt_profile profile, const char *URL, int take_lock )
{
// Return an error code (0 == no error)
int error = 0;
+ mlt_properties properties = MLT_PRODUCER_PROPERTIES( self->parent );
// Lock the service
- pthread_mutex_init( &self->audio_mutex, NULL );
- pthread_mutex_init( &self->video_mutex, NULL );
- pthread_mutex_lock( &self->audio_mutex );
- pthread_mutex_lock( &self->video_mutex );
+ if ( take_lock )
+ {
+ pthread_mutex_init( &self->audio_mutex, NULL );
+ pthread_mutex_init( &self->video_mutex, NULL );
+ pthread_mutex_init( &self->packets_mutex, NULL );
+ pthread_mutex_lock( &self->audio_mutex );
+ pthread_mutex_lock( &self->video_mutex );
+ }
+ mlt_events_block( properties, self->parent );
// Parse URL
AVInputFormat *format = NULL;
- AVFormatParameters *params = NULL;
+ AVFormatParameters params;
+ memset( ¶ms, 0, sizeof(params) );
char *filename = parse_url( profile, URL, &format, ¶ms );
- // Now attempt to open the file
- error = av_open_input_file( &self->video_format, filename, format, 0, params ) < 0;
+ // Now attempt to open the file or device with filename
+ error = av_open_input_file( &self->video_format, filename, format, 0, ¶ms ) < 0;
+ if ( error )
+ // If the URL is a network stream URL, then we probably need to open with full URL
+ error = av_open_input_file( &self->video_format, URL, format, 0, ¶ms ) < 0;
- // Cleanup AVFormatParameters
- if ( params )
+ // Set MLT properties onto video AVFormatContext
+ if ( !error && self->video_format )
{
- if ( params->standard )
- free( (void*) params->standard );
- free( params );
+ apply_properties( self->video_format, properties, AV_OPT_FLAG_DECODING_PARAM );
+#if LIBAVFORMAT_VERSION_MAJOR >= 53
+ if ( self->video_format->iformat && self->video_format->iformat->priv_class && self->video_format->priv_data )
+ apply_properties( self->video_format->priv_data, properties, AV_OPT_FLAG_DECODING_PARAM );
+#endif
}
+ // Cleanup AVFormatParameters
+ if ( params.standard )
+ free( (void*) params.standard );
+
// If successful, then try to get additional info
- if ( !error )
+ if ( !error && self->video_format )
{
// Get the stream info
error = av_find_stream_info( self->video_format ) < 0;
// Continue if no error
- if ( !error )
+ if ( !error && self->video_format )
{
// Find default audio and video streams
find_default_streams( self );
self->first_pts = -1;
self->last_position = POSITION_INITIAL;
- // We're going to cheat here - for seekable A/V files, we will have separate contexts
- // to support independent seeking of audio from video.
- // TODO: Is this really necessary?
- if ( self->audio_index != -1 && self->video_index != -1 )
- {
- // And open again for our audio context
- av_open_input_file( &self->audio_format, filename, NULL, 0, NULL );
- av_find_stream_info( self->audio_format );
- }
- else if ( self->audio_index != -1 )
+ if ( !self->audio_format )
{
- // We only have an audio context
- self->audio_format = self->video_format;
- self->video_format = NULL;
- }
- else if ( self->video_index == -1 )
- {
- // Something has gone wrong
- error = -1;
+ // We're going to cheat here - for seekable A/V files, we will have separate contexts
+ // to support independent seeking of audio from video.
+ // TODO: Is this really necessary?
+ if ( self->audio_index != -1 && self->video_index != -1 )
+ {
+ if ( self->seekable )
+ {
+ // And open again for our audio context
+ av_open_input_file( &self->audio_format, filename, NULL, 0, NULL );
+ apply_properties( self->audio_format, properties, AV_OPT_FLAG_DECODING_PARAM );
+#if LIBAVFORMAT_VERSION_MAJOR >= 53
+ if ( self->audio_format->iformat && self->audio_format->iformat->priv_class && self->audio_format->priv_data )
+ apply_properties( self->audio_format->priv_data, properties, AV_OPT_FLAG_DECODING_PARAM );
+#endif
+ av_find_stream_info( self->audio_format );
+ }
+ else
+ {
+ self->audio_format = self->video_format;
+ }
+ }
+ else if ( self->audio_index != -1 )
+ {
+ // We only have an audio context
+ self->audio_format = self->video_format;
+ self->video_format = NULL;
+ }
+ else if ( self->video_index == -1 )
+ {
+ // Something has gone wrong
+ error = -1;
+ }
+ if ( self->audio_format && !self->audio_streams )
+ get_audio_streams_info( self );
}
}
}
if ( filename )
free( filename );
+ if ( !error )
+ {
+ self->apackets = mlt_deque_init();
+ self->vpackets = mlt_deque_init();
+ }
+
+ if ( self->dummy_context )
+ {
+ avformat_lock();
+ av_close_input_file( self->dummy_context );
+ avformat_unlock();
+ self->dummy_context = NULL;
+ }
// Unlock the service
- pthread_mutex_unlock( &self->audio_mutex );
- pthread_mutex_unlock( &self->video_mutex );
+ if ( take_lock )
+ {
+ pthread_mutex_unlock( &self->audio_mutex );
+ pthread_mutex_unlock( &self->video_mutex );
+ }
+ mlt_events_unblock( properties, self->parent );
return error;
}
-void reopen_video( producer_avformat self, mlt_producer producer, mlt_properties properties )
+static void reopen_video( producer_avformat self, mlt_producer producer )
{
+ mlt_properties properties = MLT_PRODUCER_PROPERTIES( producer );
mlt_service_lock( MLT_PRODUCER_SERVICE( producer ) );
pthread_mutex_lock( &self->audio_mutex );
+ avformat_lock();
if ( self->video_codec )
- {
- avformat_lock();
avcodec_close( self->video_codec );
- avformat_unlock();
- }
self->video_codec = NULL;
if ( self->dummy_context )
av_close_input_file( self->dummy_context );
if ( self->video_format )
av_close_input_file( self->video_format );
self->video_format = NULL;
+ avformat_unlock();
int audio_index = self->audio_index;
int video_index = self->video_index;
- mlt_events_block( properties, producer );
- pthread_mutex_unlock( &self->audio_mutex );
- pthread_mutex_unlock( &self->video_mutex );
producer_open( self, mlt_service_profile( MLT_PRODUCER_SERVICE(producer) ),
- mlt_properties_get( properties, "resource" ) );
- pthread_mutex_lock( &self->video_mutex );
- pthread_mutex_lock( &self->audio_mutex );
- if ( self->dummy_context )
- {
- av_close_input_file( self->dummy_context );
- self->dummy_context = NULL;
- }
- mlt_events_unblock( properties, producer );
- apply_properties( self->video_format, properties, AV_OPT_FLAG_DECODING_PARAM );
-#if LIBAVFORMAT_VERSION_MAJOR > 52
- if ( self->video_format->iformat && self->video_format->iformat->priv_class && self->video_format->priv_data )
- apply_properties( self->video_format->priv_data, properties, AV_OPT_FLAG_DECODING_PARAM );
-#endif
+ mlt_properties_get( properties, "resource" ), 0 );
self->audio_index = audio_index;
if ( self->video_format && video_index > -1 )
mlt_service_unlock( MLT_PRODUCER_SERVICE( producer ) );
}
+static int seek_video( producer_avformat self, mlt_position position,
+ int64_t req_position, int must_decode, int use_new_seek, int *ignore )
+{
+ mlt_producer producer = self->parent;
+ int paused = 0;
+
+ if ( self->seekable && ( position != self->video_expected || self->last_position < 0 ) )
+ {
+ mlt_properties properties = MLT_PRODUCER_PROPERTIES( producer );
+
+ // Fetch the video format context
+ AVFormatContext *context = self->video_format;
+
+ // Get the video stream
+ AVStream *stream = context->streams[ self->video_index ];
+
+ // Get codec context
+ AVCodecContext *codec_context = stream->codec;
+
+ // We may want to use the source fps if available
+ double source_fps = mlt_properties_get_double( properties, "meta.media.frame_rate_num" ) /
+ mlt_properties_get_double( properties, "meta.media.frame_rate_den" );
+
+ if ( self->av_frame && position + 1 == self->video_expected )
+ {
+ // We're paused - use last image
+ paused = 1;
+ }
+ else if ( !self->seekable && position > self->video_expected && ( position - self->video_expected ) < 250 )
+ {
+ // Fast forward - seeking is inefficient for small distances - just ignore following frames
+ *ignore = ( int )( ( position - self->video_expected ) / mlt_producer_get_fps( producer ) * source_fps );
+ codec_context->skip_loop_filter = AVDISCARD_NONREF;
+ }
+ else if ( self->seekable && ( position < self->video_expected || position - self->video_expected >= 12 || self->last_position < 0 ) )
+ {
+ if ( use_new_seek && self->last_position == POSITION_INITIAL )
+ {
+ // find first key frame
+ int ret = 0;
+ int toscan = 100;
+ AVPacket pkt;
+
+ while ( ret >= 0 && toscan-- > 0 )
+ {
+ ret = av_read_frame( context, &pkt );
+ if ( ret >= 0 && ( pkt.flags & PKT_FLAG_KEY ) && pkt.stream_index == self->video_index )
+ {
+ mlt_log_debug( MLT_PRODUCER_SERVICE(producer), "first_pts %"PRId64" dts %"PRId64" pts_dts_delta %d\n", pkt.pts, pkt.dts, (int)(pkt.pts - pkt.dts) );
+ self->first_pts = pkt.pts;
+ toscan = 0;
+ }
+ av_free_packet( &pkt );
+ }
+ // Rewind
+ av_seek_frame( context, -1, 0, AVSEEK_FLAG_BACKWARD );
+ }
+
+ // Calculate the timestamp for the requested frame
+ int64_t timestamp;
+ if ( use_new_seek )
+ {
+ timestamp = ( req_position - 0.1 / source_fps ) /
+ ( av_q2d( stream->time_base ) * source_fps );
+ mlt_log_debug( MLT_PRODUCER_SERVICE(producer), "pos %"PRId64" pts %"PRId64"\n", req_position, timestamp );
+ if ( self->first_pts > 0 )
+ timestamp += self->first_pts;
+ else if ( context->start_time != AV_NOPTS_VALUE )
+ timestamp += context->start_time;
+ }
+ else
+ {
+ timestamp = ( int64_t )( ( double )req_position / source_fps * AV_TIME_BASE + 0.5 );
+ if ( context->start_time != AV_NOPTS_VALUE )
+ timestamp += context->start_time;
+ }
+ if ( must_decode )
+ timestamp -= AV_TIME_BASE;
+ if ( timestamp < 0 )
+ timestamp = 0;
+ mlt_log_debug( MLT_PRODUCER_SERVICE(producer), "seeking timestamp %"PRId64" position %d expected %d last_pos %"PRId64"\n",
+ timestamp, position, self->video_expected, self->last_position );
+
+ // Seek to the timestamp
+ if ( use_new_seek )
+ {
+ codec_context->skip_loop_filter = AVDISCARD_NONREF;
+ av_seek_frame( context, self->video_index, timestamp, AVSEEK_FLAG_BACKWARD );
+ }
+ else if ( req_position > 0 || self->last_position <= 0 )
+ {
+ av_seek_frame( context, -1, timestamp, AVSEEK_FLAG_BACKWARD );
+ }
+ else
+ {
+ // Re-open video stream when rewinding to beginning from somewhere else.
+ // This is rather ugly, and I prefer not to do it this way, but ffmpeg is
+ // not reliably seeking to the first frame across formats.
+ reopen_video( self, producer );
+ }
+
+ // Remove the cached info relating to the previous position
+ self->current_position = POSITION_INVALID;
+ self->last_position = POSITION_INVALID;
+ av_freep( &self->av_frame );
+
+ if ( use_new_seek )
+ {
+ // flush any pictures still in decode buffer
+ avcodec_flush_buffers( codec_context );
+ }
+ }
+ }
+ return paused;
+}
+
/** Convert a frame position to a time code.
*/
// Packet
AVPacket pkt;
- // Special case pause handling flag
- int paused = 0;
-
// Special case ffwd handling
int ignore = 0;
// We may want to use the source fps if available
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
- int req_position = ( int )( position / fps * source_fps + 0.5 );
+ int64_t req_position = ( int64_t )( position / mlt_producer_get_fps( producer ) * source_fps + 0.5 );
// Determines if we have to decode all frames in a sequence
// Temporary hack to improve intra frame only
- int must_decode = strcmp( codec_context->codec->name, "dnxhd" ) &&
+ int must_decode = !( codec_context->codec && codec_context->codec->name ) || (
+ strcmp( codec_context->codec->name, "dnxhd" ) &&
strcmp( codec_context->codec->name, "dvvideo" ) &&
strcmp( codec_context->codec->name, "huffyuv" ) &&
strcmp( codec_context->codec->name, "mjpeg" ) &&
- strcmp( codec_context->codec->name, "rawvideo" );
-
- int last_position = self->last_position;
+ strcmp( codec_context->codec->name, "rawvideo" ) );
// Turn on usage of new seek API and PTS for seeking
- int use_new_seek = codec_context->codec_id == CODEC_ID_H264 && !strcmp( context->iformat->name, "mpegts" );
+ int use_new_seek = self->seekable &&
+ codec_context->codec_id == CODEC_ID_H264 && !strcmp( context->iformat->name, "mpegts" );
if ( mlt_properties_get( properties, "new_seek" ) )
use_new_seek = mlt_properties_get_int( properties, "new_seek" );
// Seek if necessary
- if ( position != self->video_expected || last_position < 0 )
- {
- if ( self->av_frame && position + 1 == self->video_expected )
- {
- // We're paused - use last image
- paused = 1;
- }
- else if ( !self->seekable && position > self->video_expected && ( position - self->video_expected ) < 250 )
- {
- // Fast forward - seeking is inefficient for small distances - just ignore following frames
- ignore = ( int )( ( position - self->video_expected ) / fps * source_fps );
- codec_context->skip_loop_filter = AVDISCARD_NONREF;
- }
- else if ( self->seekable && ( position < self->video_expected || position - self->video_expected >= 12 || last_position < 0 ) )
- {
- if ( use_new_seek && last_position == POSITION_INITIAL )
- {
- // find first key frame
- int ret = 0;
- int toscan = 100;
-
- while ( ret >= 0 && toscan-- > 0 )
- {
- ret = av_read_frame( context, &pkt );
- if ( ret >= 0 && ( pkt.flags & PKT_FLAG_KEY ) && pkt.stream_index == self->video_index )
- {
- mlt_log_verbose( MLT_PRODUCER_SERVICE(producer), "first_pts %"PRId64" dts %"PRId64" pts_dts_delta %d\n", pkt.pts, pkt.dts, (int)(pkt.pts - pkt.dts) );
- self->first_pts = pkt.pts;
- toscan = 0;
- }
- av_free_packet( &pkt );
- }
- // Rewind
- av_seek_frame( context, -1, 0, AVSEEK_FLAG_BACKWARD );
- }
-
- // Calculate the timestamp for the requested frame
- int64_t timestamp;
- if ( use_new_seek )
- {
- timestamp = ( req_position - 0.1 / source_fps ) /
- ( av_q2d( stream->time_base ) * source_fps );
- mlt_log_verbose( MLT_PRODUCER_SERVICE(producer), "pos %d pts %"PRId64" ", req_position, timestamp );
- if ( self->first_pts > 0 )
- timestamp += self->first_pts;
- else if ( context->start_time != AV_NOPTS_VALUE )
- timestamp += context->start_time;
- }
- else
- {
- timestamp = ( int64_t )( ( double )req_position / source_fps * AV_TIME_BASE + 0.5 );
- if ( context->start_time != AV_NOPTS_VALUE )
- timestamp += context->start_time;
- }
- if ( must_decode )
- timestamp -= AV_TIME_BASE;
- if ( timestamp < 0 )
- timestamp = 0;
- mlt_log_debug( MLT_PRODUCER_SERVICE(producer), "seeking timestamp %"PRId64" position %d expected %d last_pos %d\n",
- timestamp, position, self->video_expected, last_position );
-
- // Seek to the timestamp
- if ( use_new_seek )
- {
- codec_context->skip_loop_filter = AVDISCARD_NONREF;
- av_seek_frame( context, self->video_index, timestamp, AVSEEK_FLAG_BACKWARD );
- }
- else if ( req_position > 0 || last_position <= 0 )
- {
- av_seek_frame( context, -1, timestamp, AVSEEK_FLAG_BACKWARD );
- }
- else
- {
- // Re-open video stream when rewinding to beginning from somewhere else.
- // This is rather ugly, and I prefer not to do it this way, but ffmpeg is
- // not reliably seeking to the first frame across formats.
- reopen_video( self, producer, properties );
- context = self->video_format;
- stream = context->streams[ self->video_index ];
- codec_context = stream->codec;
- }
-
- // Remove the cached info relating to the previous position
- self->current_position = POSITION_INVALID;
- self->last_position = POSITION_INVALID;
- av_freep( &self->av_frame );
+ int paused = seek_video( self, position, req_position, must_decode, use_new_seek, &ignore );
- if ( use_new_seek )
- {
- // flush any pictures still in decode buffer
- avcodec_flush_buffers( codec_context );
- }
- }
- }
+ // Seek might have reopened the file
+ context = self->video_format;
+ stream = context->streams[ self->video_index ];
+ codec_context = stream->codec;
// Duplicate the last image if necessary
- if ( self->av_frame && self->av_frame->linesize[0] && self->got_picture && self->seekable
+ if ( self->av_frame && self->av_frame->linesize[0] && self->got_picture
&& ( paused
|| self->current_position == req_position
|| ( !use_new_seek && self->current_position > req_position ) ) )
else
{
int ret = 0;
- int int_position = 0;
+ int64_t int_position = 0;
int decode_errors = 0;
int got_picture = 0;
while( ret >= 0 && !got_picture )
{
// Read a packet
- ret = av_read_frame( context, &pkt );
+ pthread_mutex_lock( &self->packets_mutex );
+ if ( mlt_deque_count( self->vpackets ) )
+ {
+ AVPacket *tmp = (AVPacket*) mlt_deque_pop_front( self->vpackets );
+ pkt = *tmp;
+ free( tmp );
+ }
+ else
+ {
+ ret = av_read_frame( context, &pkt );
+ if ( ret >= 0 && !self->seekable && pkt.stream_index == self->audio_index )
+ {
+ if ( !av_dup_packet( &pkt ) )
+ {
+ AVPacket *tmp = malloc( sizeof(AVPacket) );
+ *tmp = pkt;
+ mlt_deque_push_back( self->apackets, tmp );
+ }
+ }
+ }
+ pthread_mutex_unlock( &self->packets_mutex );
// We only deal with video from the selected video_index
if ( ret >= 0 && pkt.stream_index == self->video_index && pkt.size > 0 )
pts -= self->first_pts;
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 );
+ int_position = ( int64_t )( av_q2d( stream->time_base ) * pts * source_fps + 0.1 );
if ( pkt.pts == AV_NOPTS_VALUE )
{
self->invalid_pts_counter++;
{
self->invalid_pts_counter = 0;
}
- mlt_log_debug( MLT_PRODUCER_SERVICE(producer), "pkt.pts %"PRId64" req_pos %d cur_pos %d pkt_pos %d\n",
+ mlt_log_debug( MLT_PRODUCER_SERVICE(producer), "pkt.pts %"PRId64" req_pos %"PRId64" cur_pos %"PRId64" pkt_pos %"PRId64"\n",
pkt.pts, req_position, self->current_position, int_position );
}
else
{
- if ( self->seekable && pkt.dts != AV_NOPTS_VALUE )
+ if ( pkt.dts != AV_NOPTS_VALUE )
{
- int_position = ( int )( av_q2d( stream->time_base ) * pkt.dts * source_fps + 0.5 );
+ double delay = mlt_properties_get_double( properties, "video_delay" );
+ int_position = ( int64_t )( ( av_q2d( stream->time_base ) * pkt.dts + delay ) * source_fps + 0.5 );
if ( context->start_time != AV_NOPTS_VALUE )
- int_position -= ( int )( context->start_time * source_fps / AV_TIME_BASE + 0.5 );
- last_position = self->last_position;
- if ( int_position == last_position )
- int_position = last_position + 1;
- }
- else
- {
- int_position = req_position;
+ int_position -= ( int64_t )( context->start_time * source_fps / AV_TIME_BASE + 0.5 );
+ if ( int_position == self->last_position )
+ int_position = self->last_position + 1;
}
- mlt_log_debug( MLT_PRODUCER_SERVICE(producer), "pkt.dts %"PRId64" req_pos %d cur_pos %d pkt_pos %d\n",
+ mlt_log_debug( MLT_PRODUCER_SERVICE(producer), "pkt.dts %"PRId64" req_pos %"PRId64" cur_pos %"PRId64" pkt_pos %"PRId64"\n",
pkt.dts, req_position, self->current_position, int_position );
// Make a dumb assumption on streams that contain wild timestamps
if ( abs( req_position - int_position ) > 999 )
pts -= self->first_pts;
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_debug( MLT_PRODUCER_SERVICE(producer), "got frame %d, key %d\n", int_position, self->av_frame->key_frame );
+ int_position = ( int64_t )( av_q2d( stream->time_base) * pts * source_fps + 0.1 );
+ mlt_log_debug( MLT_PRODUCER_SERVICE(producer), "got frame %"PRId64", key %d\n", int_position, self->av_frame->key_frame );
}
// Handle ignore
if ( int_position < req_position )
got_picture = 0;
}
}
- if ( ret >= 0 )
+ if ( self->seekable || pkt.stream_index != self->audio_index )
av_free_packet( &pkt );
}
}
// Process properties as AVOptions
apply_properties( codec_context, properties, AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM );
-#if LIBAVCODEC_VERSION_MAJOR > 52
+#if LIBAVCODEC_VERSION_MAJOR >= 53
if ( codec->priv_class && codec_context->priv_data )
apply_properties( codec_context->priv_data, properties, AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM );
#endif
// Reopen the file if necessary
if ( !context && index > -1 )
{
- mlt_events_block( properties, producer );
producer_open( self, mlt_service_profile( MLT_PRODUCER_SERVICE(producer) ),
- mlt_properties_get( properties, "resource" ) );
+ mlt_properties_get( properties, "resource" ), 1 );
context = self->video_format;
- if ( self->dummy_context )
- {
- av_close_input_file( self->dummy_context );
- self->dummy_context = NULL;
- }
- mlt_events_unblock( properties, producer );
- if ( self->audio_format && !self->audio_streams )
- get_audio_streams_info( self );
-
- // Process properties as AVOptions
- if ( context )
- {
- apply_properties( context, properties, AV_OPT_FLAG_DECODING_PARAM );
-#if LIBAVFORMAT_VERSION_MAJOR > 52
- if ( context->iformat && context->iformat->priv_class && context->priv_data )
- apply_properties( context->priv_data, properties, AV_OPT_FLAG_DECODING_PARAM );
-#endif
- }
}
// Exception handling for video_index
{
// Reset the video properties if the index changed
self->video_index = index;
+ avformat_lock();
if ( self->video_codec )
- {
- avformat_lock();
avcodec_close( self->video_codec );
- avformat_unlock();
- }
self->video_codec = NULL;
+ avformat_unlock();
}
// Get the frame properties
int paused = 0;
// Seek if necessary
- if ( position != self->audio_expected )
+ if ( self->seekable && position != self->audio_expected )
{
if ( position + 1 == self->audio_expected )
{
static int sample_bytes( AVCodecContext *context )
{
-#if LIBAVCODEC_VERSION_MAJOR > 52
+#if LIBAVCODEC_VERSION_MAJOR >= 53
return av_get_bits_per_sample_fmt( context->sample_fmt ) / 8;
#else
return av_get_bits_per_sample_format( context->sample_fmt ) / 8;
}
// Handle ignore
- while ( *ignore && audio_used > samples )
+ while ( *ignore && audio_used )
{
*ignore -= 1;
- audio_used -= samples;
+ audio_used -= audio_used > samples ? samples : audio_used;
memmove( audio_buffer, &audio_buffer[ samples * (resample? channels : codec_context->channels) * sizeof_sample ],
audio_used * sizeof_sample );
}
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 );
+ int64_t req_position = ( int64_t )( timecode * fps + 0.5 );
+ int64_t int_position = ( int64_t )( current_pts * fps + 0.5 );
if ( context->start_time != AV_NOPTS_VALUE )
- int_position -= ( int )( fps * context->start_time / AV_TIME_BASE + 0.5 );
+ int_position -= ( int64_t )( fps * context->start_time / AV_TIME_BASE + 0.5 );
- if ( self->seekable && *ignore == 0 )
+ if ( *ignore == 0 )
{
if ( int_position < req_position )
// We are behind, so skip some
- *ignore = 1;
- else if ( int_position > req_position + 2 )
+ *ignore = req_position - int_position;
+
+ // We use total_channels in this test because the tolerance is dependent
+ // on the interleaving of all streams esp. when there is more than
+ // one audio stream.
+ else if ( int_position > req_position + self->total_channels )
// We are ahead, so seek backwards some more
seek_audio( self, req_position, timecode - 1.0, ignore );
}
double fps = mlt_producer_get_fps( self->parent );
// Number of frames to ignore (for ffwd)
- int ignore = 0;
+ int ignore[ MAX_AUDIO_STREAMS ] = { 0 };
// Flag for paused (silence)
- int paused = seek_audio( self, position, real_timecode, &ignore );
+ int paused = seek_audio( self, position, real_timecode, &ignore[0] );
+
+ // Initialize ignore for all streams from the seek return value
+ int i = MAX_AUDIO_STREAMS;
+ while ( i-- )
+ ignore[i] = ignore[0];
// Fetch the audio_format
AVFormatContext *context = self->audio_format;
while ( ret >= 0 && !got_audio )
{
// Check if the buffer already contains the samples required
- if ( self->audio_index != INT_MAX && self->audio_used[ self->audio_index ] >= *samples && ignore == 0 )
+ if ( self->audio_index != INT_MAX &&
+ self->audio_used[ self->audio_index ] >= *samples &&
+ ignore[ self->audio_index ] == 0 )
{
got_audio = 1;
break;
}
+ else if ( self->audio_index == INT_MAX )
+ {
+ // Check if there is enough audio for all streams
+ got_audio = 1;
+ for ( index = 0; got_audio && index < context->nb_streams; index++ )
+ if ( ( self->audio_codec[ index ] && self->audio_used[ index ] < *samples ) || ignore[ index ] )
+ got_audio = 0;
+ if ( got_audio )
+ break;
+ }
// Read a packet
- ret = av_read_frame( context, &pkt );
+ pthread_mutex_lock( &self->packets_mutex );
+ if ( mlt_deque_count( self->apackets ) )
+ {
+ AVPacket *tmp = (AVPacket*) mlt_deque_pop_front( self->apackets );
+ pkt = *tmp;
+ free( tmp );
+ }
+ else
+ {
+ ret = av_read_frame( context, &pkt );
+ if ( ret >= 0 && !self->seekable && pkt.stream_index == self->video_index )
+ {
+ if ( !av_dup_packet( &pkt ) )
+ {
+ AVPacket *tmp = malloc( sizeof(AVPacket) );
+ *tmp = pkt;
+ mlt_deque_push_back( self->vpackets, tmp );
+ }
+ }
+ }
+ pthread_mutex_unlock( &self->packets_mutex );
// We only deal with audio from the selected audio index
index = pkt.stream_index;
{
int channels2 = ( self->audio_index == INT_MAX || !self->audio_resample[index] ) ?
self->audio_codec[index]->channels : *channels;
- ret = decode_audio( self, &ignore, pkt, channels2, *samples, real_timecode, fps );
+ ret = decode_audio( self, &ignore[index], pkt, channels2, *samples, real_timecode, fps );
}
- av_free_packet( &pkt );
- if ( self->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++ )
- {
- if ( self->audio_codec[ index ] && self->audio_used[ index ] < *samples )
- got_audio = 0;
- }
- }
+ if ( self->seekable || index != self->video_index )
+ av_free_packet( &pkt );
+
}
// Set some additional return values
// Process properties as AVOptions
apply_properties( codec_context, properties, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_DECODING_PARAM );
-#if LIBAVCODEC_VERSION_MAJOR > 52
+#if LIBAVCODEC_VERSION_MAJOR >= 53
if ( codec && codec->priv_class && codec_context->priv_data )
apply_properties( codec_context->priv_data, properties, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_DECODING_PARAM );
#endif
// Reopen the file if necessary
if ( !context && self->audio_index > -1 && index > -1 )
{
- mlt_events_block( properties, producer );
producer_open( self, mlt_service_profile( MLT_PRODUCER_SERVICE(producer) ),
- mlt_properties_get( properties, "resource" ) );
+ mlt_properties_get( properties, "resource" ), 1 );
context = self->audio_format;
- if ( self->dummy_context )
- {
- av_close_input_file( self->dummy_context );
- self->dummy_context = NULL;
- }
- mlt_events_unblock( properties, producer );
- if ( self->audio_format )
- get_audio_streams_info( self );
}
// Exception handling for audio_index
// Update the audio properties if the index changed
if ( context && index > -1 && index != self->audio_index )
{
+ avformat_lock();
if ( self->audio_codec[ self->audio_index ] )
- {
- avformat_lock();
avcodec_close( self->audio_codec[ self->audio_index ] );
- avformat_unlock();
- }
self->audio_codec[ self->audio_index ] = NULL;
+ avformat_unlock();
}
if ( self->audio_index != -1 )
self->audio_index = index;
// 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( self, *frame );
// Set up the audio
producer_set_up_audio( self, *frame );
+ // Set the position of this producer
+ mlt_position position = self->seekable ? mlt_producer_frame( producer ) : self->nonseek_position++;
+ mlt_properties_set_position( MLT_FRAME_PROPERTIES( *frame ), "avformat_position", position );
+
// Calculate the next timecode
mlt_producer_prepare_next( producer );
static void producer_avformat_close( producer_avformat self )
{
mlt_log_debug( NULL, "producer_avformat_close\n" );
- // Close the file
+
+ // Cleanup av contexts
av_free( self->av_frame );
avformat_lock();
int i;
av_free( self->decode_buffer[i] );
if ( self->audio_codec[i] )
avcodec_close( self->audio_codec[i] );
+ self->audio_codec[i] = NULL;
}
if ( self->video_codec )
avcodec_close( self->video_codec );
+ self->video_codec = NULL;
+ // Close the file
if ( self->dummy_context )
av_close_input_file( self->dummy_context );
- if ( self->audio_format )
+ if ( self->seekable && self->audio_format )
av_close_input_file( self->audio_format );
if ( self->video_format )
av_close_input_file( self->video_format );
#endif
if ( self->image_cache )
mlt_cache_close( self->image_cache );
+
+ // Cleanup the mutexes
pthread_mutex_destroy( &self->audio_mutex );
pthread_mutex_destroy( &self->video_mutex );
+ pthread_mutex_destroy( &self->packets_mutex );
+
+ // Cleanup the packet queues
+ AVPacket *pkt;
+ while ( ( pkt = mlt_deque_pop_back( self->apackets ) ) )
+ {
+ av_free_packet( pkt );
+ free( pkt );
+ }
+ while ( ( pkt = mlt_deque_pop_back( self->vpackets ) ) )
+ {
+ av_free_packet( pkt );
+ free( pkt );
+ }
+
free( self );
}
projects / mlt / blobdiff