snprintf( key, sizeof(key), "meta.media.%d.codec.height", i );
mlt_properties_set_int( meta_media, key, codec_context->height );
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 ) );
+ AVRational frame_rate = { codec_context->time_base.den, codec_context->time_base.num * codec_context->ticks_per_frame };
+ mlt_properties_set_double( meta_media, key, av_q2d( frame_rate ) );
snprintf( key, sizeof(key), "meta.media.%d.codec.pix_fmt", i );
#if LIBAVUTIL_VERSION_INT >= ((51<<16)+(3<<8)+0)
mlt_properties_set( meta_media, key, av_get_pix_fmt_name( codec_context->pix_fmt ) );
return meta_media;
}
-static inline int dv_is_pal( AVPacket *pkt )
+static void get_aspect_ratio( mlt_properties properties, AVStream *stream, AVCodecContext *codec_context )
{
- return pkt->data[3] & 0x80;
-}
-
-static int dv_is_wide( AVPacket *pkt )
-{
- int i = 80 /* block size */ *3 /* VAUX starts at block 3 */ +3 /* skip block header */;
-
- for ( ; i < pkt->size; i += 5 /* packet size */ )
- {
- if ( pkt->data[ i ] == 0x61 )
- {
- uint8_t x = pkt->data[ i + 2 ] & 0x7;
- return ( x == 2 ) || ( x == 7 );
- }
- }
- return 0;
-}
-
-static double get_aspect_ratio( mlt_properties properties, AVStream *stream, AVCodecContext *codec_context, AVPacket *pkt )
-{
- double aspect_ratio = 1.0;
-
- if ( codec_context->codec_id == AV_CODEC_ID_DVVIDEO )
- {
- if ( pkt )
- {
- if ( dv_is_pal( pkt ) )
- {
- 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
- {
- 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
- {
- AVRational ar = stream->sample_aspect_ratio;
- // Override FFmpeg's notion of DV aspect ratios, which are
- // based upon a width of 704. Since we do not have a normaliser
- // that crops (nor is cropping 720 wide ITU-R 601 video always desirable)
- // we just coerce the values to facilitate a passive behaviour through
- // the rescale normaliser when using equivalent producers and consumers.
- // = display_aspect / (width * height)
- if ( ar.num == 10 && ar.den == 11 )
- {
- // 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 )
- {
- // 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 )
- {
- // 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 )
- {
- // 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
- {
- AVRational codec_sar = codec_context->sample_aspect_ratio;
- AVRational stream_sar = stream->sample_aspect_ratio;
- if ( codec_sar.num > 0 )
- {
- 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 )
- {
- 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;
+ AVRational sar = stream->sample_aspect_ratio;
+ if ( sar.num <= 0 || sar.den <= 0 )
+ sar = codec_context->sample_aspect_ratio;
+ if ( sar.num <= 0 || sar.den <= 0 )
+ sar.num = sar.den = 1;
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_num", sar.num );
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_den", sar.den );
+ mlt_properties_set_double( properties, "aspect_ratio", av_q2d( sar ) );
}
#if LIBAVFORMAT_VERSION_INT > ((53<<16)+(6<<8)+0)
AVCodecContext *codec_context = format->streams[ self->video_index ]->codec;
mlt_properties_set_int( properties, "width", codec_context->width );
mlt_properties_set_int( properties, "height", codec_context->height );
-
- if ( codec_context->codec_id == AV_CODEC_ID_DVVIDEO )
- {
- // Fetch the first frame of DV so we can read it directly
- AVPacket pkt;
- int ret = 0;
- while ( ret >= 0 )
- {
- ret = av_read_frame( format, &pkt );
- if ( ret >= 0 && pkt.stream_index == self->video_index && pkt.size > 0 )
- {
- get_aspect_ratio( properties, format->streams[ self->video_index ], codec_context, &pkt );
- av_free_packet(&pkt);
- break;
- }
- if ( ret >= 0 )
- av_free_packet(&pkt);
- }
- }
- else
- {
- get_aspect_ratio( properties, format->streams[ self->video_index ], codec_context, NULL );
- }
+ get_aspect_ratio( properties, format->streams[ self->video_index ], codec_context );
// Verify that we can convert this to YUV 4:2:2
// TODO: we can now also return RGB and RGBA and quite possibly more in the future.
return error;
}
-static void reopen_video( producer_avformat self, mlt_producer producer )
+static void prepare_reopen( producer_avformat self )
{
- mlt_properties properties = MLT_PRODUCER_PROPERTIES( producer );
- mlt_service_lock( MLT_PRODUCER_SERVICE( producer ) );
+ mlt_service_lock( MLT_PRODUCER_SERVICE( self->parent ) );
pthread_mutex_lock( &self->audio_mutex );
pthread_mutex_lock( &self->open_mutex );
+ int i;
+ for ( i = 0; i < MAX_AUDIO_STREAMS; i++ )
+ {
+ mlt_pool_release( self->audio_buffer[i] );
+ self->audio_buffer[i] = NULL;
+ av_free( self->decode_buffer[i] );
+ self->decode_buffer[i] = NULL;
+ 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;
+
#if LIBAVFORMAT_VERSION_INT >= ((53<<16)+(17<<8)+0)
- if ( self->dummy_context )
- avformat_close_input( &self->dummy_context );
+ if ( self->seekable && self->audio_format )
+ avformat_close_input( &self->audio_format );
if ( self->video_format )
avformat_close_input( &self->video_format );
#else
- if ( self->dummy_context )
- av_close_input_file( self->dummy_context );
+ 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
- self->dummy_context = NULL;
+ self->audio_format = NULL;
self->video_format = NULL;
pthread_mutex_unlock( &self->open_mutex );
- int audio_index = self->audio_index;
- int video_index = self->video_index;
-
- producer_open( self, mlt_service_profile( MLT_PRODUCER_SERVICE(producer) ),
- mlt_properties_get( properties, "resource" ), 0 );
-
- self->audio_index = audio_index;
- if ( self->video_format && video_index > -1 )
+ // Cleanup the packet queues
+ AVPacket *pkt;
+ if ( self->apackets )
{
- self->video_index = video_index;
- video_codec_init( self, video_index, properties );
+ while ( ( pkt = mlt_deque_pop_back( self->apackets ) ) )
+ {
+ av_free_packet( pkt );
+ free( pkt );
+ }
+ mlt_deque_close( self->apackets );
+ self->apackets = NULL;
+ }
+ if ( self->vpackets )
+ {
+ while ( ( pkt = mlt_deque_pop_back( self->vpackets ) ) )
+ {
+ av_free_packet( pkt );
+ free( pkt );
+ }
+ mlt_deque_close( self->vpackets );
+ self->vpackets = NULL;
}
-
pthread_mutex_unlock( &self->audio_mutex );
- mlt_service_unlock( MLT_PRODUCER_SERVICE( producer ) );
+ mlt_service_unlock( MLT_PRODUCER_SERVICE( self->parent ) );
}
static int64_t best_pts( producer_avformat self, int64_t pts, int64_t dts )
timestamp -= 2 / av_q2d( self->video_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",
+ mlt_log_debug( MLT_PRODUCER_SERVICE(producer), "seeking timestamp %"PRId64" position " MLT_POSITION_FMT " expected "MLT_POSITION_FMT" last_pos %"PRId64"\n",
timestamp, position, self->video_expected, self->last_position );
// Seek to the timestamp
- // NOTE: reopen_video is disabled at this time because it is causing trouble with A/V sync.
- if ( 1 || req_position > 0 || self->last_position <= 0 )
- {
- codec_context->skip_loop_filter = AVDISCARD_NONREF;
- av_seek_frame( context, self->video_index, timestamp, AVSEEK_FLAG_BACKWARD );
+ codec_context->skip_loop_filter = AVDISCARD_NONREF;
+ av_seek_frame( context, self->video_index, timestamp, AVSEEK_FLAG_BACKWARD );
- // flush any pictures still in decode buffer
- avcodec_flush_buffers( codec_context );
- }
- 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 );
- }
+ // flush any pictures still in decode buffer
+ avcodec_flush_buffers( codec_context );
// Remove the cached info relating to the previous position
self->current_position = POSITION_INVALID;
pthread_mutex_lock( &self->video_mutex );
+ uint8_t *alpha = NULL;
+ int got_picture = 0;
+ int image_size = 0;
+
// Fetch the video format context
AVFormatContext *context = self->video_format;
+ if ( !context )
+ goto exit_get_image;
// Get the video stream
AVStream *stream = context->streams[ self->video_index ];
// Get codec context
AVCodecContext *codec_context = stream->codec;
- uint8_t *alpha = NULL;
- int got_picture = 0;
- int image_size = 0;
-
// Get the image cache
if ( ! self->image_cache )
{
mlt_deque_push_back( self->apackets, tmp );
}
}
+ else if ( ret < 0 )
+ {
+ mlt_log_verbose( MLT_PRODUCER_SERVICE(producer), "av_read_frame returned error %d inside get_image\n", ret );
+ if ( !self->seekable && mlt_properties_get_int( properties, "reconnect" ) )
+ {
+ // Try to reconnect to live sources by closing context and codecs,
+ // and letting next call to get_frame() reopen.
+ prepare_reopen( self );
+ pthread_mutex_unlock( &self->packets_mutex );
+ goto exit_get_image;
+ }
+ if ( !self->seekable && mlt_properties_get_int( properties, "exit_on_disconnect" ) )
+ {
+ mlt_log_fatal( MLT_PRODUCER_SERVICE(producer), "Exiting with error due to disconnected source.\n" );
+ exit( EXIT_FAILURE );
+ }
+ }
}
pthread_mutex_unlock( &self->packets_mutex );
{
if ( ++decode_errors <= 10 )
ret = 0;
+ else
+ mlt_log_warning( MLT_PRODUCER_SERVICE(producer), "video decoding error %d\n", ret );
}
else
{
{
mlt_properties_set_int( properties, "width", self->video_codec->width );
mlt_properties_set_int( properties, "height", self->video_codec->height );
+ get_aspect_ratio( properties, stream, self->video_codec );
}
- // For DV, we'll just use the saved aspect ratio
- if ( codec_context->codec_id != AV_CODEC_ID_DVVIDEO )
- get_aspect_ratio( properties, stream, self->video_codec, NULL );
- // Determine the fps first from the codec
- double codec_fps = (double) self->video_codec->time_base.den /
- ( self->video_codec->time_base.num == 0 ? 1 : self->video_codec->time_base.num );
-
- {
- // If the muxer reports a frame rate different than the codec
+ // Start with the muxer frame rate.
#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(42<<8)+0)
- double muxer_fps = av_q2d( stream->avg_frame_rate );
-#if LIBAVFORMAT_VERSION_MAJOR < 55
- if ( isnan( muxer_fps ) || muxer_fps == 0 )
- muxer_fps = av_q2d( stream->r_frame_rate );
-#endif
+ AVRational frame_rate = stream->avg_frame_rate;
#else
- double muxer_fps = av_q2d( stream->r_frame_rate );
+ AVRational frame_rate = stream->r_frame_rate;
#endif
- if ( !isnan( muxer_fps ) && muxer_fps > 0 )
- {
-#if LIBAVFORMAT_VERSION_MAJOR >= 55
- AVRational frame_rate = stream->avg_frame_rate;
-#else
- AVRational frame_rate = stream->r_frame_rate;
+ double fps = av_q2d( frame_rate );
+
+#if LIBAVFORMAT_VERSION_MAJOR < 55
+ // Verify and sanitize the muxer frame rate.
+ if ( isnan( fps ) || isinf( fps ) || fps == 0 )
+ {
+ frame_rate = stream->r_frame_rate;
+ fps = av_q2d( frame_rate );
+ }
#endif
- // 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) && LIBAVFORMAT_VERSION_MAJOR < 55
- 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 );
+ // 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 ( 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 );
+ fps = av_q2d( frame_rate );
+ }
#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 if ( codec_fps >= 1.0 )
- {
- mlt_properties_set_int( properties, "meta.media.frame_rate_num", self->video_codec->time_base.den );
- mlt_properties_set_int( properties, "meta.media.frame_rate_den", self->video_codec->time_base.num == 0 ? 1 : self->video_codec->time_base.num );
- }
- else
- {
- AVRational frame_rate = av_d2q( mlt_producer_get_fps( self->parent ), 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 );
- }
+ // XXX frame rates less than 1 fps are not considered sane
+ if ( isnan( fps ) || isinf( fps ) || fps < 1.0 )
+ {
+ // Get the frame rate from the codec.
+ frame_rate.num = self->video_codec->time_base.den;
+ frame_rate.den = self->video_codec->time_base.num * self->video_codec->ticks_per_frame;
+ fps = av_q2d( frame_rate );
}
+ if ( isnan( fps ) || isinf( fps ) || fps < 1.0 )
+ {
+ // Use the profile frame rate if all else fails.
+ mlt_profile profile = mlt_service_profile( MLT_PRODUCER_SERVICE( self->parent ) );
+ frame_rate.num = profile->frame_rate_num;
+ frame_rate.den = profile->frame_rate_den;
+ }
+
self->video_time_base = stream->time_base;
if ( mlt_properties_get( properties, "force_fps" ) )
{
- AVRational fps = av_d2q( mlt_properties_get_double( properties, "force_fps" ), 1024 );
- self->video_time_base.num *= mlt_properties_get_int( properties, "meta.media.frame_rate_num" ) * fps.den;
- self->video_time_base.den *= mlt_properties_get_int( properties, "meta.media.frame_rate_den" ) * fps.num;
- mlt_properties_set_int( properties, "meta.media.frame_rate_num", fps.num );
- mlt_properties_set_int( properties, "meta.media.frame_rate_den", fps.den );
+ AVRational force_fps = av_d2q( mlt_properties_get_double( properties, "force_fps" ), 1024 );
+ self->video_time_base = av_mul_q( stream->time_base, av_div_q( frame_rate, force_fps ) );
+ frame_rate = force_fps;
}
+ 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 );
// Set the YUV colorspace from override or detect
self->colorspace = mlt_properties_get_int( properties, "force_colorspace" );
-#if LIBAVCODEC_VERSION_INT > ((52<<16)+(28<<8)+0)
+#if LIBAVCODEC_VERSION_INT > ((52<<16)+(28<<8)+0)
if ( ! self->colorspace )
{
switch ( self->video_codec->colorspace )
// Get the video_index
int index = mlt_properties_get_int( properties, "video_index" );
+ int unlock_needed = 0;
+
// Reopen the file if necessary
if ( !context && index > -1 )
{
+ unlock_needed = 1;
+ pthread_mutex_lock( &self->video_mutex );
producer_open( self, mlt_service_profile( MLT_PRODUCER_SERVICE(producer) ),
- mlt_properties_get( properties, "resource" ), 1 );
+ mlt_properties_get( properties, "resource" ), 0 );
context = self->video_format;
}
// If something failed, use test card image
mlt_properties_set_int( frame_properties, "test_image", 1 );
}
+ if ( unlock_needed )
+ pthread_mutex_unlock( &self->video_mutex );
}
static int seek_audio( producer_avformat self, mlt_position position, double timecode )
#endif
}
-static void planar_to_interleaved( uint8_t *dest, uint8_t *src, int samples, int channels, int bytes_per_sample )
+#if LIBAVCODEC_VERSION_MAJOR >= 55
+static void planar_to_interleaved( uint8_t *dest, AVFrame *src, int samples, int channels, int bytes_per_sample )
{
int s, c;
for ( s = 0; s < samples; s++ )
{
for ( c = 0; c < channels; c++ )
{
- memcpy( dest, src + ( c * samples + s ) * bytes_per_sample, bytes_per_sample );
+ memcpy( dest, &src->data[c][s * bytes_per_sample], bytes_per_sample );
dest += bytes_per_sample;
}
}
}
-
-static void planar_to_interleaved2( uint8_t *dest, AVFrame *src, int samples, int channels, int bytes_per_sample )
+#else
+static void planar_to_interleaved( uint8_t *dest, uint8_t *src, int samples, int channels, int bytes_per_sample )
{
int s, c;
for ( s = 0; s < samples; s++ )
{
for ( c = 0; c < channels; c++ )
{
- memcpy( dest, &src->data[c][s * bytes_per_sample], bytes_per_sample );
+ memcpy( dest, src + ( c * samples + s ) * bytes_per_sample, bytes_per_sample );
dest += bytes_per_sample;
}
}
}
+#endif
static int decode_audio( producer_avformat self, int *ignore, AVPacket pkt, int channels, int samples, double timecode, double fps )
{
case AV_SAMPLE_FMT_S32P:
case AV_SAMPLE_FMT_FLTP:
#if LIBAVCODEC_VERSION_MAJOR >= 55
- planar_to_interleaved2( dest, self->audio_frame, convert_samples, codec_context->channels, sizeof_sample );
+ planar_to_interleaved( dest, self->audio_frame, convert_samples, codec_context->channels, sizeof_sample );
#else
planar_to_interleaved( dest, decode_buffer, convert_samples, codec_context->channels, sizeof_sample );
#endif
// Fetch the audio_format
AVFormatContext *context = self->audio_format;
+ if ( !context )
+ goto exit_get_audio;
int sizeof_sample = sizeof( int16_t );
mlt_deque_push_back( self->vpackets, tmp );
}
}
+ else if ( ret < 0 )
+ {
+ mlt_producer producer = self->parent;
+ mlt_properties properties = MLT_PRODUCER_PROPERTIES( producer );
+ mlt_log_verbose( MLT_PRODUCER_SERVICE(producer), "av_read_frame returned error %d inside get_audio\n", ret );
+ if ( !self->seekable && mlt_properties_get_int( properties, "reconnect" ) )
+ {
+ // Try to reconnect to live sources by closing context and codecs,
+ // and letting next call to get_frame() reopen.
+ prepare_reopen( self );
+ pthread_mutex_unlock( &self->packets_mutex );
+ goto exit_get_audio;
+ }
+ if ( !self->seekable && mlt_properties_get_int( properties, "exit_on_disconnect" ) )
+ {
+ mlt_log_fatal( MLT_PRODUCER_SERVICE(producer), "Exiting with error due to disconnected source.\n" );
+ exit( EXIT_FAILURE );
+ }
+ }
}
pthread_mutex_unlock( &self->packets_mutex );
}
else
{
+exit_get_audio:
// Get silence and don't touch the context
mlt_frame_get_audio( frame, buffer, format, frequency, channels, samples );
}
audio_codec_init( self, index, properties );
}
}
- else if ( context && index > -1 && audio_codec_init( self, index, properties ) )
+ else if ( context && index > -1 && index < MAX_AUDIO_STREAMS &&
+ audio_codec_init( self, index, properties ) )
{
- // Set the frame properties
- if ( index < MAX_AUDIO_STREAMS )
- {
- mlt_properties_set_int( frame_properties, "audio_frequency", self->audio_codec[ index ]->sample_rate );
- mlt_properties_set_int( frame_properties, "audio_channels", self->audio_codec[ index ]->channels );
- }
+ mlt_properties_set_int( frame_properties, "audio_frequency", self->audio_codec[ index ]->sample_rate );
+ mlt_properties_set_int( frame_properties, "audio_channels", self->audio_codec[ index ]->channels );
}
if ( context && index > -1 )
{