#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
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))
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 ) )
{
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;
if ( format->pb )
{
// protocols can indicate if they support seeking
-#if LIBAVFORMAT_VERSION_MAJOR > 52
+#if LIBAVFORMAT_VERSION_MAJOR >= 53
self->seekable = format->pb->seekable;
#else
URLContext *uc = url_fileno( format->pb );
if ( !error && self->video_format )
{
apply_properties( self->video_format, properties, AV_OPT_FLAG_DECODING_PARAM );
-#if LIBAVFORMAT_VERSION_MAJOR > 52
+#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
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 )
+ if ( !self->audio_format )
{
- if ( self->seekable )
+ // 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 );
- apply_properties( self->audio_format, properties, AV_OPT_FLAG_DECODING_PARAM );
-#if LIBAVFORMAT_VERSION_MAJOR > 52
- 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 );
+ 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 );
+ av_find_stream_info( self->audio_format );
+ }
+ else
+ {
+ self->audio_format = self->video_format;
+ }
}
- else
+ 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 );
}
- 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 )
if ( self->dummy_context )
{
+ avformat_lock();
av_close_input_file( self->dummy_context );
+ avformat_unlock();
self->dummy_context = NULL;
}
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;
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) );
+ 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;
}
{
timestamp = ( req_position - 0.1 / source_fps ) /
( av_q2d( stream->time_base ) * source_fps );
- mlt_log_verbose( MLT_PRODUCER_SERVICE(producer), "pos %"PRId64" pts %"PRId64" ", req_position, timestamp );
+ 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 )
// 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" );
+ strcmp( codec_context->codec->name, "rawvideo" ) );
// Turn on usage of new seek API and PTS for seeking
int use_new_seek = self->seekable &&
// 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
{
// 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
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 ( int_position < req_position )
// We are behind, so skip some
- *ignore = 1;
+ *ignore = req_position - int_position;
- // We use nb_streams in this test because the tolerance is dependent
+ // 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 + context->nb_streams )
+ 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 );
}
// 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
// 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_position position = self->seekable ? mlt_producer_frame( producer ) : self->nonseek_position++;
- mlt_properties_set_position( MLT_FRAME_PROPERTIES( *frame ), "avformat_position", position );
-
// 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 );
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 );
projects / mlt / blobdiff