#include <libavcodec/opt.h>
#endif
+#if LIBAVCODEC_VERSION_MAJOR < 55
+#define AV_CODEC_ID_DVVIDEO CODEC_ID_DVVIDEO
+#define AV_CODEC_ID_H264 CODEC_ID_H264
+#endif
+
#define POSITION_INITIAL (-2)
#define POSITION_INVALID (-1)
AVFormatContext *video_format;
AVCodecContext *audio_codec[ MAX_AUDIO_STREAMS ];
AVCodecContext *video_codec;
- AVFrame *av_frame;
+ AVFrame *video_frame;
+ AVFrame *audio_frame;
AVPacket pkt;
mlt_position audio_expected;
mlt_position video_expected;
mlt_properties_set( meta_media, key, "video" );
snprintf( key, sizeof(key), "meta.media.%d.stream.frame_rate", i );
double ffmpeg_fps = av_q2d( context->streams[ i ]->avg_frame_rate );
+#if LIBAVFORMAT_VERSION_MAJOR < 55
if ( isnan( ffmpeg_fps ) || ffmpeg_fps == 0 )
ffmpeg_fps = av_q2d( context->streams[ i ]->r_frame_rate );
+#endif
mlt_properties_set_double( meta_media, key, ffmpeg_fps );
snprintf( key, sizeof(key), "meta.media.%d.stream.sample_aspect_ratio", i );
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 )
-{
- return pkt->data[3] & 0x80;
-}
-
-static int dv_is_wide( AVPacket *pkt )
+static void get_aspect_ratio( mlt_properties properties, AVStream *stream, AVCodecContext *codec_context )
{
- 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 == 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 == 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 )
if ( self->last_position == POSITION_INITIAL )
find_first_pts( self, self->video_index );
- if ( self->av_frame && position + 1 == self->video_expected )
+ if ( self->video_frame && position + 1 == self->video_expected )
{
// We're paused - use last image
paused = 1;
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;
self->last_position = POSITION_INVALID;
- av_freep( &self->av_frame );
+ av_freep( &self->video_frame );
}
}
return paused;
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 )
{
*format = pick_pix_format( codec_context->pix_fmt );
// Duplicate the last image if necessary
- if ( self->av_frame && self->av_frame->linesize[0]
+ if ( self->video_frame && self->video_frame->linesize[0]
&& ( paused || self->current_position >= req_position ) )
{
// Duplicate it
}
else
#endif
- convert_image( self, self->av_frame, *buffer, codec_context->pix_fmt,
+ convert_image( self, self->video_frame, *buffer, codec_context->pix_fmt,
format, *width, *height, &alpha );
got_picture = 1;
}
int decode_errors = 0;
// Construct an AVFrame for YUV422 conversion
- if ( !self->av_frame )
- self->av_frame = avcodec_alloc_frame( );
+ if ( !self->video_frame )
+ self->video_frame = avcodec_alloc_frame( );
while( ret >= 0 && !got_picture )
{
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 ( 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, self->av_frame, &got_picture, &self->pkt );
+ ret = avcodec_decode_video2( codec_context, self->video_frame, &got_picture, &self->pkt );
#else
- ret = avcodec_decode_video( codec_context, self->av_frame, &got_picture, self->pkt.data, self->pkt.size );
+ ret = avcodec_decode_video( codec_context, self->video_frame, &got_picture, self->pkt.data, self->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 )
{
if ( ++decode_errors <= 10 )
ret = 0;
+ else
+ mlt_log_warning( MLT_PRODUCER_SERVICE(producer), "video decoding error %d\n", ret );
}
else
{
if ( got_picture )
{
// Get position of reordered frame
- int_position = self->av_frame->reordered_opaque;
+ int_position = self->video_frame->reordered_opaque;
#if (LIBAVCODEC_VERSION_INT >= ((52<<16)+(106<<8)+0))
- pts = best_pts( self, self->av_frame->pkt_pts, self->av_frame->pkt_dts );
+ pts = best_pts( self, self->video_frame->pkt_pts, self->video_frame->pkt_dts );
if ( pts != AV_NOPTS_VALUE )
{
if ( self->first_pts != AV_NOPTS_VALUE )
{
if ( self->vdpau->is_decoded )
{
- struct vdpau_render_state *render = (struct vdpau_render_state*) self->av_frame->data[0];
+ struct vdpau_render_state *render = (struct vdpau_render_state*) self->video_frame->data[0];
void *planes[3];
uint32_t pitches[3];
VdpYCbCrFormat dest_format = VDP_YCBCR_FORMAT_YV12;
if ( !self->vdpau->buffer )
self->vdpau->buffer = mlt_pool_alloc( codec_context->width * codec_context->height * 3 / 2 );
- self->av_frame->data[0] = planes[0] = self->vdpau->buffer;
- self->av_frame->data[2] = planes[1] = self->vdpau->buffer + codec_context->width * codec_context->height;
- self->av_frame->data[1] = planes[2] = self->vdpau->buffer + codec_context->width * codec_context->height * 5 / 4;
- self->av_frame->linesize[0] = pitches[0] = codec_context->width;
- self->av_frame->linesize[1] = pitches[1] = codec_context->width / 2;
- self->av_frame->linesize[2] = pitches[2] = codec_context->width / 2;
+ self->video_frame->data[0] = planes[0] = self->vdpau->buffer;
+ self->video_frame->data[2] = planes[1] = self->vdpau->buffer + codec_context->width * codec_context->height;
+ self->video_frame->data[1] = planes[2] = self->vdpau->buffer + codec_context->width * codec_context->height * 5 / 4;
+ self->video_frame->linesize[0] = pitches[0] = codec_context->width;
+ self->video_frame->linesize[1] = pitches[1] = codec_context->width / 2;
+ self->video_frame->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( self, self->av_frame, *buffer, PIX_FMT_YUV420P,
+ convert_image( self, self->video_frame, *buffer, PIX_FMT_YUV420P,
format, *width, *height, &alpha );
}
else
}
else
#endif
- convert_image( self, self->av_frame, *buffer, codec_context->pix_fmt,
+ convert_image( self, self->video_frame, *buffer, codec_context->pix_fmt,
format, *width, *height, &alpha );
- self->top_field_first |= self->av_frame->top_field_first;
+ self->top_field_first |= self->video_frame->top_field_first;
self->current_position = int_position;
}
else
// Try to duplicate last image if there was a decoding failure
// TODO: with multithread decoding a partial frame decoding resulting
// in failure also resets av_frame making test below fail.
- if ( !image_size && self->av_frame && self->av_frame->linesize[0] )
+ if ( !image_size && self->video_frame && self->video_frame->linesize[0] )
{
// Duplicate it
if ( ( image_size = allocate_buffer( frame, codec_context, buffer, format, width, height ) ) )
}
else
#endif
- convert_image( self, self->av_frame, *buffer, codec_context->pix_fmt,
+ convert_image( self, self->video_frame, *buffer, codec_context->pix_fmt,
format, *width, *height, &alpha );
got_picture = 1;
}
// 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 ( self->av_frame )
- mlt_properties_set_int( frame_properties, "progressive", !self->av_frame->interlaced_frame );
+ else if ( self->video_frame )
+ mlt_properties_set_int( frame_properties, "progressive", !self->video_frame->interlaced_frame );
// Set the field order property for this frame
if ( mlt_properties_get( properties, "force_tff" ) )
// Find the codec
AVCodec *codec = avcodec_find_decoder( codec_context->codec_id );
#ifdef VDPAU
- if ( codec_context->codec_id == CODEC_ID_H264 )
+ if ( codec_context->codec_id == AV_CODEC_ID_H264 )
{
if ( ( codec = avcodec_find_decoder_by_name( "h264_vdpau" ) ) )
{
{
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 != CODEC_ID_DVVIDEO )
- get_aspect_ratio( properties, stream, self->video_codec, NULL );
- // Determine the fps first from the codec
- double source_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 ( isnan( muxer_fps ) || muxer_fps == 0 )
- muxer_fps = av_q2d( stream->r_frame_rate );
+ 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
- // Choose the lesser - the wrong tends to be off by some multiple of 10
- source_fps = FFMIN( source_fps, muxer_fps );
- if ( source_fps >= 1.0 && ( source_fps < muxer_fps || isnan( muxer_fps ) ) )
- {
- 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 if ( muxer_fps > 0 )
- {
- AVRational frame_rate = stream->r_frame_rate;
- // 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)
- 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 );
+ 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
- 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
- {
- source_fps = mlt_producer_get_fps( self->parent );
- AVRational frame_rate = av_d2q( source_fps, 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 );
- }
+#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(42<<8)+0) && LIBAVFORMAT_VERSION_MAJOR < 55
+ // 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
+ // 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" ) )
{
- double source_fps = mlt_properties_get_double( properties, "force_fps" );
- AVRational fps = av_d2q( source_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 )
}
}
+static void planar_to_interleaved2( 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->data[c][s * bytes_per_sample], bytes_per_sample );
+ dest += bytes_per_sample;
+ }
+ }
+}
+
static int decode_audio( producer_avformat self, int *ignore, AVPacket pkt, int channels, int samples, double timecode, double fps )
{
// Fetch the audio_format
int data_size = self->audio_buffer_size[ index ];
// Decode the audio
-#if (LIBAVCODEC_VERSION_INT >= ((52<<16)+(26<<8)+0))
- ret = avcodec_decode_audio3( codec_context, (int16_t*) 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 );
+#if LIBAVCODEC_VERSION_MAJOR >= 55
+ if ( !self->audio_frame )
+ self->audio_frame = avcodec_alloc_frame();
+ else
+ avcodec_get_frame_defaults( self->audio_frame );
+ ret = avcodec_decode_audio4( codec_context, self->audio_frame, &data_size, &pkt );
+ if ( data_size ) {
+ data_size = av_samples_get_buffer_size( NULL, codec_context->channels,
+ self->audio_frame->nb_samples, codec_context->sample_fmt, 1 );
+ decode_buffer = self->audio_frame->data[0];
+ }
#else
- ret = avcodec_decode_audio( codec_context, decode_buffer, &data_size, ptr, len );
+ ret = avcodec_decode_audio3( codec_context, (int16_t*) decode_buffer, &data_size, &pkt );
#endif
if ( ret < 0 )
{
self->audio_buffer_size[ index ] = ( audio_used + convert_samples * 2 ) * channels * sizeof_sample;
audio_buffer = self->audio_buffer[ index ] = mlt_pool_realloc( audio_buffer, self->audio_buffer_size[ index ] );
}
- uint8_t *source = decode_buffer;
uint8_t *dest = &audio_buffer[ audio_used * codec_context->channels * sizeof_sample ];
switch ( codec_context->sample_fmt )
{
case AV_SAMPLE_FMT_S16P:
case AV_SAMPLE_FMT_S32P:
case AV_SAMPLE_FMT_FLTP:
- planar_to_interleaved( dest, source, convert_samples, codec_context->channels, sizeof_sample );
+#if LIBAVCODEC_VERSION_MAJOR >= 55
+ planar_to_interleaved2( 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
break;
#endif
default:
// Fetch the audio_format
AVFormatContext *context = self->audio_format;
+ if ( !context )
+ goto exit_get_audio;
int sizeof_sample = sizeof( int16_t );
index = 0;
index_max = FFMIN( MAX_AUDIO_STREAMS, context->nb_streams );
*channels = self->total_channels;
- *samples = *samples * FFMAX( self->max_frequency, *frequency ) / *frequency;
+ *samples = mlt_sample_calculator( fps, FFMAX( self->max_frequency, *frequency ), position );
*frequency = FFMAX( self->max_frequency, *frequency );
}
av_init_packet( &pkt );
- // It requested number samples based on requested frame rate.
- // Do not clean this up with a samples *= ...!
+ // Caller requested number samples based on requested sample rate.
if ( self->audio_index != INT_MAX )
- *samples = *samples * self->audio_codec[ self->audio_index ]->sample_rate / *frequency;
+ *samples = mlt_sample_calculator( fps, self->audio_codec[ self->audio_index ]->sample_rate, position );
while ( ret >= 0 && !got_audio )
{
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 );
}
// Cleanup av contexts
av_free_packet( &self->pkt );
- av_free( self->av_frame );
+ av_free( self->video_frame );
+ av_free( self->audio_frame );
pthread_mutex_lock( &self->open_mutex );
int i;
for ( i = 0; i < MAX_AUDIO_STREAMS; i++ )
projects / mlt / blobdiff