#define POSITION_INITIAL (-2)
#define POSITION_INVALID (-1)
-#define MAX_AUDIO_STREAMS (10)
+#define MAX_AUDIO_STREAMS (32)
#define MAX_VDPAU_SURFACES (10)
struct producer_avformat_s
AVCodecContext *audio_codec[ MAX_AUDIO_STREAMS ];
AVCodecContext *video_codec;
AVFrame *av_frame;
+ AVPacket pkt;
ReSampleContext *audio_resample[ MAX_AUDIO_STREAMS ];
mlt_position audio_expected;
mlt_position video_expected;
int audio_index;
int video_index;
- int first_pts;
+ int64_t first_pts;
int64_t last_position;
int seekable;
int64_t current_position;
mlt_position nonseek_position;
- int got_picture;
int top_field_first;
uint8_t *audio_buffer[ MAX_AUDIO_STREAMS ];
size_t audio_buffer_size[ MAX_AUDIO_STREAMS ];
int max_channel;
int max_frequency;
unsigned int invalid_pts_counter;
+ unsigned int invalid_dts_counter;
double resample_factor;
mlt_cache image_cache;
- mlt_cache alpha_cache;
int colorspace;
+ int full_luma;
pthread_mutex_t video_mutex;
pthread_mutex_t audio_mutex;
mlt_deque apackets;
// Register our get_frame implementation
producer->get_frame = producer_get_frame;
+ // init mutexes
+ pthread_mutex_init( &self->audio_mutex, NULL );
+ pthread_mutex_init( &self->video_mutex, NULL );
+ pthread_mutex_init( &self->packets_mutex, NULL );
+ pthread_mutex_init( &self->open_mutex, NULL );
+
+ // init queues
+ self->apackets = mlt_deque_init();
+ self->vpackets = mlt_deque_init();
+
if ( strcmp( service, "avformat-novalidate" ) )
{
// Open the file
// Clean up
mlt_producer_close( producer );
producer = NULL;
+ producer_avformat_close( self );
}
else if ( self->seekable )
{
snprintf( key, sizeof(key), "meta.media.%d.stream.sample_aspect_ratio", i );
mlt_properties_set_double( meta_media, key, av_q2d( context->streams[ i ]->sample_aspect_ratio ) );
#endif
+ snprintf( key, sizeof(key), "meta.media.%d.codec.width", i );
+ mlt_properties_set_int( meta_media, key, codec_context->width );
+ 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 ) );
#endif
break;
case CODEC_TYPE_AUDIO:
+ if ( !codec_context->channels )
+ break;
// Use first audio stream
if ( self->audio_index < 0 )
self->audio_index = i;
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
// Lock the service
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_init( &self->open_mutex, NULL );
pthread_mutex_lock( &self->audio_mutex );
pthread_mutex_lock( &self->video_mutex );
}
error = get_basic_info( self, profile, filename );
// Initialize position info
- self->first_pts = -1;
+ self->first_pts = AV_NOPTS_VALUE;
self->last_position = POSITION_INITIAL;
if ( !self->audio_format )
}
if ( filename )
free( filename );
- if ( !error )
- {
- self->apackets = mlt_deque_init();
- self->vpackets = mlt_deque_init();
- }
if ( self->dummy_context )
{
mlt_service_unlock( MLT_PRODUCER_SERVICE( producer ) );
}
+static int64_t best_pts( producer_avformat self, int64_t pts, int64_t dts )
+{
+ self->invalid_pts_counter += pts == AV_NOPTS_VALUE;
+ self->invalid_dts_counter += dts == AV_NOPTS_VALUE;
+ if ( ( self->invalid_pts_counter <= self->invalid_dts_counter
+ || dts == AV_NOPTS_VALUE ) && pts != AV_NOPTS_VALUE )
+ return pts;
+ else
+ return dts;
+}
+
static int seek_video( producer_avformat self, mlt_position position,
- int64_t req_position, int must_decode, int use_new_seek, int *ignore )
+ int64_t req_position, int preseek )
{
mlt_producer producer = self->parent;
int paused = 0;
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 ) )
+ // find initial PTS
+ if ( self->last_position == POSITION_INITIAL )
{
- if ( use_new_seek && self->last_position == POSITION_INITIAL )
- {
- // find first key frame
- int ret = 0;
- int toscan = 100;
- AVPacket pkt;
+ int ret = 0;
+ int toscan = 500;
+ AVPacket pkt;
- while ( ret >= 0 && toscan-- > 0 )
+ while ( ret >= 0 && toscan-- > 0 )
+ {
+ ret = av_read_frame( context, &pkt );
+ if ( ret >= 0 && pkt.stream_index == self->video_index && ( pkt.flags & PKT_FLAG_KEY ) )
{
- 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;
+ 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 = best_pts( self, pkt.pts, pkt.dts );
+ if ( self->first_pts != AV_NOPTS_VALUE )
toscan = 0;
- }
- av_free_packet( &pkt );
}
- // Rewind
- av_seek_frame( context, -1, 0, AVSEEK_FLAG_BACKWARD );
+ av_free_packet( &pkt );
}
+ av_seek_frame( context, -1, 0, AVSEEK_FLAG_BACKWARD );
+ }
+ 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 >= 12 || self->last_position < 0 ) )
+ {
// 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;
+ int64_t timestamp = req_position / ( av_q2d( stream->time_base ) * source_fps );
+ if ( req_position <= 0 )
+ timestamp = 0;
+ else if ( self->first_pts != AV_NOPTS_VALUE )
+ timestamp += self->first_pts;
+ else if ( context->start_time != AV_NOPTS_VALUE )
+ timestamp += context->start_time;
+ if ( preseek && av_q2d( stream->time_base ) != 0 )
+ timestamp -= 2 / av_q2d( stream->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 )
+ // 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 );
- }
- else if ( req_position > 0 || self->last_position <= 0 )
- {
- av_seek_frame( context, -1, timestamp, AVSEEK_FLAG_BACKWARD );
+
+ // flush any pictures still in decode buffer
+ avcodec_flush_buffers( codec_context );
}
else
{
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;
#endif
}
-static mlt_image_format pick_format( enum PixelFormat pix_fmt )
+static mlt_image_format pick_pix_format( enum PixelFormat pix_fmt )
{
switch ( pix_fmt )
{
}
}
-static void convert_image( AVFrame *frame, uint8_t *buffer, int pix_fmt,
- mlt_image_format *format, int width, int height, int colorspace, uint8_t **alpha )
+static mlt_audio_format pick_audio_format( enum AVSampleFormat sample_fmt )
+{
+ switch ( sample_fmt )
+ {
+ // interleaved
+ case AV_SAMPLE_FMT_S16:
+ return mlt_audio_s16;
+ case AV_SAMPLE_FMT_S32:
+ return mlt_audio_s32le;
+ case AV_SAMPLE_FMT_FLT:
+ return mlt_audio_f32le;
+ // planar - this producer converts planar to interleaved
+#if LIBAVUTIL_VERSION_INT >= ((51<<16)+(17<<8)+0)
+ case AV_SAMPLE_FMT_S16P:
+ return mlt_audio_s16;
+ case AV_SAMPLE_FMT_S32P:
+ return mlt_audio_s32le;
+ case AV_SAMPLE_FMT_FLTP:
+ return mlt_audio_f32le;
+#endif
+ default:
+ return mlt_audio_none;
+ }
+}
+
+static void convert_image( producer_avformat self, AVFrame *frame, uint8_t *buffer, int pix_fmt,
+ mlt_image_format *format, int width, int height, uint8_t **alpha )
{
#ifdef SWSCALE
- int full_range = -1;
int flags = SWS_BICUBIC | SWS_ACCURATE_RND;
#ifdef USE_MMX
// extract alpha from planar formats
if ( ( pix_fmt == PIX_FMT_YUVA420P
-#if LIBAVUTIL_VERSION_INT >= ((51<<16)+(35<<8)+0)
+#if defined(FFUDIV) && LIBAVUTIL_VERSION_INT >= ((51<<16)+(35<<8)+101)
|| pix_fmt == PIX_FMT_YUVA444P
#endif
) &&
output.linesize[0] = width;
output.linesize[1] = width >> 1;
output.linesize[2] = width >> 1;
- set_luma_transfer( context, colorspace, full_range );
+ set_luma_transfer( context, self->colorspace, -1 );
sws_scale( context, (const uint8_t* const*) frame->data, frame->linesize, 0, height,
output.data, output.linesize);
sws_freeContext( context );
width, height, PIX_FMT_RGB24, flags | SWS_FULL_CHR_H_INT, NULL, NULL, NULL);
AVPicture output;
avpicture_fill( &output, buffer, PIX_FMT_RGB24, width, height );
- set_luma_transfer( context, colorspace, full_range );
+ set_luma_transfer( context, self->colorspace, self->full_luma );
sws_scale( context, (const uint8_t* const*) frame->data, frame->linesize, 0, height,
output.data, output.linesize);
sws_freeContext( context );
width, height, PIX_FMT_RGBA, flags | SWS_FULL_CHR_H_INT, NULL, NULL, NULL);
AVPicture output;
avpicture_fill( &output, buffer, PIX_FMT_RGBA, width, height );
- set_luma_transfer( context, colorspace, full_range );
+ set_luma_transfer( context, self->colorspace, self->full_luma );
sws_scale( context, (const uint8_t* const*) frame->data, frame->linesize, 0, height,
output.data, output.linesize);
sws_freeContext( context );
width, height, PIX_FMT_YUYV422, flags | SWS_FULL_CHR_H_INP, NULL, NULL, NULL);
AVPicture output;
avpicture_fill( &output, buffer, PIX_FMT_YUYV422, width, height );
- set_luma_transfer( context, colorspace, full_range );
+ set_luma_transfer( context, self->colorspace, -1 );
sws_scale( context, (const uint8_t* const*) frame->data, frame->linesize, 0, height,
output.data, output.linesize);
sws_freeContext( context );
avpicture_fill( &output, buffer, PIX_FMT_RGB24, width, height );
img_convert( &output, PIX_FMT_RGB24, (AVPicture *)frame, pix_fmt, width, height );
}
- else if ( format == mlt_image_rgb24a || format == mlt_image_opengl )
+ else if ( *format == mlt_image_rgb24a || *format == mlt_image_opengl )
{
AVPicture output;
avpicture_fill( &output, buffer, PIX_FMT_RGB32, width, height );
mlt_properties frame_properties = MLT_FRAME_PROPERTIES( frame );
// Obtain the frame number of this frame
- mlt_position position = mlt_properties_get_position( frame_properties, "avformat_position" );
+ mlt_position position = mlt_frame_original_position( frame );
// Get the producer properties
mlt_properties properties = MLT_PRODUCER_PROPERTIES( producer );
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_properties_get_int( properties, "noimagecache" ) )
+ if ( ! self->image_cache )
{
- self->image_cache = mlt_cache_init();
- self->alpha_cache = mlt_cache_init();
+ // if cache size supplied by environment variable
+ int cache_supplied = getenv( "MLT_AVFORMAT_CACHE" ) != NULL;
+ int cache_size = cache_supplied? atoi( getenv( "MLT_AVFORMAT_CACHE" ) ) : 0;
+
+ // cache size supplied via property
+ if ( mlt_properties_get( properties, "cache" ) )
+ {
+ cache_supplied = 1;
+ cache_size = mlt_properties_get_int( properties, "cache" );
+ }
+ if ( mlt_properties_get_int( properties, "noimagecache" ) )
+ cache_size = 0;
+ // create cache if not disabled
+ if ( !cache_supplied || cache_size > 0 )
+ self->image_cache = mlt_cache_init();
+ // set cache size if supplied
+ if ( self->image_cache && cache_supplied )
+ mlt_cache_set_size( self->image_cache, cache_size );
}
if ( self->image_cache )
{
- mlt_cache_item item = mlt_cache_get( self->image_cache, (void*) position );
- uint8_t *original = mlt_cache_item_data( item, (int*) format );
+ mlt_frame original = mlt_cache_get_frame( self->image_cache, position );
if ( original )
{
+ mlt_properties orig_props = MLT_FRAME_PROPERTIES( original );
+ int size = 0;
+
+ *buffer = mlt_properties_get_data( orig_props, "alpha", &size );
+ if (*buffer)
+ mlt_frame_set_alpha( frame, *buffer, size, NULL );
+ *buffer = mlt_properties_get_data( orig_props, "image", &size );
+ mlt_frame_set_image( frame, *buffer, size, NULL );
+ mlt_properties_set_data( frame_properties, "avformat.image_cache", original, 0, (mlt_destructor) mlt_frame_close, NULL );
+ *format = mlt_properties_get_int( orig_props, "format" );
+
// Set the resolution
*width = codec_context->width;
*height = codec_context->height;
if ( *height == 1088 && mlt_profile_dar( mlt_service_profile( MLT_PRODUCER_SERVICE( producer ) ) ) == 16.0/9.0 )
*height = 1080;
- // Cache hit
- int size = mlt_image_format_size( *format, *width, *height, NULL );
- if ( writable )
- {
- *buffer = mlt_pool_alloc( size );
- mlt_frame_set_image( frame, *buffer, size, mlt_pool_release );
- memcpy( *buffer, original, size );
- mlt_cache_item_close( item );
- }
- else
- {
- *buffer = original;
- mlt_properties_set_data( frame_properties, "avformat.image_cache", item, 0, ( mlt_destructor )mlt_cache_item_close, NULL );
- mlt_frame_set_image( frame, *buffer, size, NULL );
- }
- self->got_picture = 1;
-
- // check for alpha
- item = mlt_cache_get( self->alpha_cache, (void*) position );
- original = mlt_cache_item_data( item, &size );
- if ( original )
- {
- alpha = mlt_pool_alloc( size );
- memcpy( alpha, original, size );
- mlt_cache_item_close( item );
- }
-
+ got_picture = 1;
goto exit_get_image;
}
}
// Cache miss
- int image_size = 0;
-
- // Packet
- AVPacket pkt;
-
- // 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" ) /
strcmp( codec_context->codec->name, "mjpeg" ) &&
strcmp( codec_context->codec->name, "rawvideo" ) );
- // Turn on usage of new seek API and PTS for seeking
- 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" );
double delay = mlt_properties_get_double( properties, "video_delay" );
// Seek if necessary
- int paused = seek_video( self, position, req_position, must_decode, use_new_seek, &ignore );
+ const char *interp = mlt_properties_get( frame_properties, "rescale.interp" );
+ int preseek = must_decode
+#if defined(FFUDIV) && LIBAVFORMAT_VERSION_INT >= ((53<<16)+(24<<8)+2)
+ && ( interp && strcmp( interp, "nearest" ) )
+#endif
+ && codec_context->has_b_frames;
+ int paused = seek_video( self, position, req_position, preseek );
// Seek might have reopened the file
context = self->video_format;
codec_context->pix_fmt == PIX_FMT_RGBA ||
codec_context->pix_fmt == PIX_FMT_ABGR ||
codec_context->pix_fmt == PIX_FMT_BGRA )
- *format = pick_format( codec_context->pix_fmt );
+ *format = pick_pix_format( codec_context->pix_fmt );
// Duplicate the last image if necessary
- 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 ) ) )
+ if ( self->av_frame && self->av_frame->linesize[0]
+ && ( paused || self->current_position >= req_position ) )
{
// Duplicate it
if ( ( image_size = allocate_buffer( frame, codec_context, buffer, format, width, height ) ) )
picture.linesize[0] = codec_context->width;
picture.linesize[1] = codec_context->width / 2;
picture.linesize[2] = codec_context->width / 2;
- convert_image( (AVFrame*) &picture, *buffer,
- PIX_FMT_YUV420P, format, *width, *height, self->colorspace, &alpha );
+ convert_image( self, (AVFrame*) &picture, *buffer,
+ PIX_FMT_YUV420P, format, *width, *height, &alpha );
}
else
#endif
- convert_image( self->av_frame, *buffer, codec_context->pix_fmt,
- format, *width, *height, self->colorspace, &alpha );
+ convert_image( self, self->av_frame, *buffer, codec_context->pix_fmt,
+ format, *width, *height, &alpha );
+ got_picture = 1;
}
- else
- mlt_frame_get_image( frame, buffer, format, width, height, writable );
}
else
{
int ret = 0;
int64_t int_position = 0;
int decode_errors = 0;
- int got_picture = 0;
-
- av_init_packet( &pkt );
// Construct an AVFrame for YUV422 conversion
if ( !self->av_frame )
while( ret >= 0 && !got_picture )
{
// Read a packet
+ if ( self->pkt.stream_index == self->video_index )
+ av_free_packet( &self->pkt );
+ av_init_packet( &self->pkt );
pthread_mutex_lock( &self->packets_mutex );
if ( mlt_deque_count( self->vpackets ) )
{
AVPacket *tmp = (AVPacket*) mlt_deque_pop_front( self->vpackets );
- pkt = *tmp;
+ self->pkt = *tmp;
free( tmp );
}
else
{
- ret = av_read_frame( context, &pkt );
- if ( ret >= 0 && !self->seekable && pkt.stream_index == self->audio_index )
+ ret = av_read_frame( context, &self->pkt );
+ if ( ret >= 0 && !self->seekable && self->pkt.stream_index == self->audio_index )
{
- if ( !av_dup_packet( &pkt ) )
+ if ( !av_dup_packet( &self->pkt ) )
{
AVPacket *tmp = malloc( sizeof(AVPacket) );
- *tmp = pkt;
+ *tmp = self->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 )
+ if ( ret >= 0 && self->pkt.stream_index == self->video_index && self->pkt.size > 0 )
{
- // Determine time code of the packet
- if ( use_new_seek )
+ int64_t pts = best_pts( self, self->pkt.pts, self->pkt.dts );
+ if ( pts != AV_NOPTS_VALUE )
{
- int64_t pts = pkt.pts;
- if ( self->first_pts > 0 )
+ if ( !self->seekable && self->first_pts == AV_NOPTS_VALUE )
+ self->first_pts = pts;
+ if ( self->first_pts != AV_NOPTS_VALUE )
pts -= self->first_pts;
else if ( context->start_time != AV_NOPTS_VALUE )
pts -= context->start_time;
- int_position = ( int64_t )( ( av_q2d( stream->time_base ) * pts + delay ) * source_fps + 0.1 );
- if ( pkt.pts == AV_NOPTS_VALUE )
- {
- self->invalid_pts_counter++;
- if ( self->invalid_pts_counter > 20 )
- {
- mlt_log_panic( MLT_PRODUCER_SERVICE(producer), "\ainvalid PTS; DISABLING NEW_SEEK!\n" );
- mlt_properties_set_int( properties, "new_seek", 0 );
- int_position = req_position;
- use_new_seek = 0;
- }
- }
- else
- {
- self->invalid_pts_counter = 0;
- }
- 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 );
+ int_position = ( int64_t )( ( av_q2d( stream->time_base ) * pts + delay ) * source_fps + 0.5 );
+ if ( int_position == self->last_position )
+ int_position = self->last_position + 1;
}
- else
+ mlt_log_debug( MLT_PRODUCER_SERVICE(producer),
+ "V pkt.pts %"PRId64" pkt.dts %"PRId64" req_pos %"PRId64" cur_pos %"PRId64" pkt_pos %"PRId64"\n",
+ self->pkt.pts, self->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 )
{
- if ( pkt.dts != AV_NOPTS_VALUE )
- {
- 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 -= ( 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 %"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 )
- {
- int_position = req_position;
- mlt_log_debug( MLT_PRODUCER_SERVICE(producer), " WILD TIMESTAMP!" );
- }
+ int_position = req_position;
+ mlt_log_warning( MLT_PRODUCER_SERVICE(producer), " WILD TIMESTAMP!\n" );
}
self->last_position = int_position;
self->vdpau->is_decoded = 0;
}
#endif
- codec_context->reordered_opaque = pkt.pts;
+ codec_context->reordered_opaque = int_position;
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, &pkt );
+ ret = avcodec_decode_video2( codec_context, self->av_frame, &got_picture, &self->pkt );
#else
- ret = avcodec_decode_video( codec_context, self->av_frame, &got_picture, pkt.data, pkt.size );
+ ret = avcodec_decode_video( codec_context, self->av_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 ( got_picture )
{
- if ( use_new_seek )
+ // Get position of reordered frame
+ int_position = self->av_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 );
+ if ( pts != AV_NOPTS_VALUE )
{
- // Determine time code of the packet
- int64_t pts = self->av_frame->reordered_opaque;
- if ( self->first_pts > 0 )
+ if ( self->first_pts != AV_NOPTS_VALUE )
pts -= self->first_pts;
else if ( context->start_time != AV_NOPTS_VALUE )
pts -= context->start_time;
- 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 );
+ int_position = ( int64_t )( ( av_q2d( stream->time_base ) * pts + delay ) * source_fps + 0.5 );
}
- // Handle ignore
+#endif
+
if ( int_position < req_position )
- {
- ignore = 0;
got_picture = 0;
- }
else if ( int_position >= req_position )
- {
- ignore = 0;
codec_context->skip_loop_filter = AVDISCARD_NONE;
- }
- else if ( ignore -- )
- {
- got_picture = 0;
- }
}
- mlt_log_debug( MLT_PRODUCER_SERVICE(producer), " got_pic %d key %d\n", got_picture, pkt.flags & PKT_FLAG_KEY );
+ mlt_log_debug( MLT_PRODUCER_SERVICE(producer), " got_pic %d key %d\n", got_picture, self->pkt.flags & PKT_FLAG_KEY );
}
// Now handle the picture if we have one
VdpStatus status = vdp_surface_get_bits( render->surface, dest_format, planes, pitches );
if ( status == VDP_STATUS_OK )
{
- convert_image( self->av_frame, *buffer, PIX_FMT_YUV420P,
- format, *width, *height, self->colorspace, &alpha );
+ convert_image( self, self->av_frame, *buffer, PIX_FMT_YUV420P,
+ format, *width, *height, &alpha );
}
else
{
}
else
#endif
- convert_image( self->av_frame, *buffer, codec_context->pix_fmt,
- format, *width, *height, self->colorspace, &alpha );
+ convert_image( self, self->av_frame, *buffer, codec_context->pix_fmt,
+ format, *width, *height, &alpha );
self->top_field_first |= self->av_frame->top_field_first;
self->current_position = int_position;
- self->got_picture = 1;
}
else
{
got_picture = 0;
}
}
- if ( self->seekable || pkt.stream_index != self->audio_index )
- av_free_packet( &pkt );
+
+ // Free packet data if not video and not live audio packet
+ if ( self->pkt.stream_index != self->video_index &&
+ !( !self->seekable && self->pkt.stream_index == self->audio_index ) )
+ av_free_packet( &self->pkt );
}
}
- if ( self->got_picture && image_size > 0 && self->image_cache )
+ // set alpha
+ if ( alpha )
+ mlt_frame_set_alpha( frame, alpha, (*width) * (*height), mlt_pool_release );
+
+ if ( image_size > 0 && self->image_cache )
{
- // Copy buffer to image cache
- uint8_t *image = mlt_pool_alloc( image_size );
- memcpy( image, *buffer, image_size );
- mlt_cache_put( self->image_cache, (void*) position, image, *format, mlt_pool_release );
- if ( alpha )
- {
- int alpha_size = (*width) * (*height);
- image = mlt_pool_alloc( alpha_size );
- memcpy( image, alpha, alpha_size );
- mlt_cache_put( self->alpha_cache, (void*) position, image, alpha_size, mlt_pool_release );
- }
+ mlt_properties_set_int( frame_properties, "format", *format );
+ mlt_cache_put_frame( self->image_cache, frame );
}
+
// Try to duplicate last image if there was a decoding failure
- else if ( !image_size && self->av_frame && self->av_frame->linesize[0] )
+ // 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] )
{
// Duplicate it
if ( ( image_size = allocate_buffer( frame, codec_context, buffer, format, width, height ) ) )
picture.linesize[0] = codec_context->width;
picture.linesize[1] = codec_context->width / 2;
picture.linesize[2] = codec_context->width / 2;
- convert_image( (AVFrame*) &picture, *buffer,
- PIX_FMT_YUV420P, format, *width, *height, self->colorspace, &alpha );
+ convert_image( self, (AVFrame*) &picture, *buffer,
+ PIX_FMT_YUV420P, format, *width, *height, &alpha );
}
else
#endif
- convert_image( self->av_frame, *buffer, codec_context->pix_fmt,
- format, *width, *height, self->colorspace, &alpha );
- self->got_picture = 1;
+ convert_image( self, self->av_frame, *buffer, codec_context->pix_fmt,
+ format, *width, *height, &alpha );
+ got_picture = 1;
}
- else
- mlt_frame_get_image( frame, buffer, format, width, height, writable );
}
// Regardless of speed, we expect to get the next frame (cos we ain't too bright)
mlt_properties_set_int( properties, "meta.media.progressive", mlt_properties_get_int( frame_properties, "progressive" ) );
mlt_service_unlock( MLT_PRODUCER_SERVICE( producer ) );
- // set alpha
- if ( alpha )
- mlt_frame_set_alpha( frame, alpha, (*width) * (*height), mlt_pool_release );
+ // If we already have RGB, then the full range processing either happened already
+ // or does not apply (RGB source).
+ if ( *format == mlt_image_rgb24 || *format == mlt_image_rgb24a || *format == mlt_image_opengl )
+ mlt_properties_set( frame_properties, "force_full_luma", NULL );
- return !self->got_picture;
+ return !got_picture;
}
/** Process properties as AVOptions and apply to AV context obj
#endif
// Reset some image properties
- mlt_properties_set_int( properties, "width", self->video_codec->width );
- mlt_properties_set_int( properties, "height", self->video_codec->height );
+ if ( self->video_codec )
+ {
+ mlt_properties_set_int( properties, "width", self->video_codec->width );
+ mlt_properties_set_int( properties, "height", self->video_codec->height );
+ }
// 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 );
#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 );
- source_fps = av_q2d( frame_rate );
}
else
{
}
}
- // source_fps is deprecated in favor of meta.media.frame_rate_num and .frame_rate_den
- if ( source_fps > 0 )
- mlt_properties_set_double( properties, "source_fps", source_fps );
- else
- mlt_properties_set_double( properties, "source_fps", mlt_producer_get_fps( self->parent ) );
-
// 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)
#endif
// Let apps get chosen colorspace
mlt_properties_set_int( properties, "meta.media.colorspace", self->colorspace );
+
+ self->full_luma = -1;
+#if LIBAVCODEC_VERSION_INT >= ((52<<16)+(72<<8)+2)
+ mlt_log_debug( MLT_PRODUCER_SERVICE(self->parent), "color_range %d\n", codec_context->color_range );
+ if ( codec_context->color_range == AVCOL_RANGE_JPEG )
+ self->full_luma = 1;
+#endif
+ if ( mlt_properties_get( properties, "set.force_full_luma" ) )
+ self->full_luma = mlt_properties_get_int( properties, "set.force_full_luma" );
}
return self->video_codec && self->video_index > -1;
}
// Set the width and height
mlt_properties_set_int( frame_properties, "width", self->video_codec->width );
mlt_properties_set_int( frame_properties, "height", self->video_codec->height );
- // real_width and real_height are deprecated in favor of meta.media.width and .height
mlt_properties_set_int( properties, "meta.media.width", self->video_codec->width );
mlt_properties_set_int( properties, "meta.media.height", self->video_codec->height );
- mlt_properties_set_int( frame_properties, "real_width", self->video_codec->width );
- mlt_properties_set_int( frame_properties, "real_height", self->video_codec->height );
mlt_properties_set_double( frame_properties, "aspect_ratio", aspect_ratio );
mlt_properties_set_int( frame_properties, "colorspace", self->colorspace );
if ( self->video_codec->height == 1088 && mlt_profile_dar( mlt_service_profile( MLT_PRODUCER_SERVICE( producer ) ) ) == 16.0/9.0 )
{
mlt_properties_set_int( properties, "meta.media.height", 1080 );
- mlt_properties_set_int( frame_properties, "real_height", 1080 );
}
// Add our image operation
}
}
-static int seek_audio( producer_avformat self, mlt_position position, double timecode, int *ignore )
+static int seek_audio( producer_avformat self, mlt_position position, double timecode )
{
int paused = 0;
// We're paused - silence required
paused = 1;
}
- else if ( !self->seekable && position > self->audio_expected && ( position - self->audio_expected ) < 250 )
- {
- // Fast forward - seeking is inefficient for small distances - just ignore following frames
- *ignore = position - self->audio_expected;
- }
else if ( position < self->audio_expected || position - self->audio_expected >= 12 )
{
AVFormatContext *context = self->audio_format;
#endif
}
+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 + ( c * samples + 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
}
else
{
- // Straight copy to audio buffer
- memcpy( &audio_buffer[ audio_used * codec_context->channels * sizeof_sample ], decode_buffer, data_size );
+ uint8_t *source = decode_buffer;
+ uint8_t *dest = &audio_buffer[ audio_used * codec_context->channels * sizeof_sample ];
+ switch ( codec_context->sample_fmt )
+ {
+#if LIBAVUTIL_VERSION_INT >= ((51<<16)+(17<<8)+0)
+ 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 );
+ break;
+#endif
+ default:
+ // Straight copy to audio buffer
+ memcpy( dest, decode_buffer, data_size );
+ }
audio_used += convert_samples;
}
// Skip this on non-seekable, audio-only inputs.
if ( pkt.pts >= 0 && ( self->seekable || self->video_format ) && *ignore == 0 && audio_used > samples / 2 )
{
- double current_pts = av_q2d( context->streams[ index ]->time_base ) * pkt.pts;
+ int64_t pts = pkt.pts;
+ if ( self->first_pts != 0 )
+ pts -= self->first_pts;
+ else if ( context->start_time != AV_NOPTS_VALUE )
+ pts -= context->start_time;
+ double timebase = av_q2d( context->streams[ index ]->time_base );
+ int64_t int_position = ( int64_t )( timebase * 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 -= ( int64_t )( fps * context->start_time / AV_TIME_BASE + 0.5 );
+
+ mlt_log_debug( MLT_PRODUCER_SERVICE(self->parent),
+ "A pkt.pts %"PRId64" pkt.dts %"PRId64" req_pos %"PRId64" cur_pos %"PRId64" pkt_pos %"PRId64"\n",
+ pkt.pts, pkt.dts, req_position, self->current_position, int_position );
if ( int_position > 0 )
{
*ignore = req_position - int_position;
else if ( self->audio_index != INT_MAX && int_position > req_position + 2 )
// We are ahead, so seek backwards some more
- seek_audio( self, req_position, timecode - 1.0, ignore );
+ seek_audio( self, req_position, timecode - 1.0 );
}
}
pthread_mutex_lock( &self->audio_mutex );
// Obtain the frame number of this frame
- mlt_position position = mlt_properties_get_position( MLT_FRAME_PROPERTIES( frame ), "avformat_position" );
+ mlt_position position = mlt_frame_original_position( frame );
// Calculate the real time code
double real_timecode = producer_time_of_frame( self->parent, position );
int ignore[ MAX_AUDIO_STREAMS ] = { 0 };
// Flag for paused (silence)
- int paused = seek_audio( self, position, real_timecode, &ignore[0] );
+ int paused = seek_audio( self, position, real_timecode );
// Initialize ignore for all streams from the seek return value
int i = MAX_AUDIO_STREAMS;
if ( self->audio_index == INT_MAX )
{
index = 0;
- index_max = context->nb_streams;
+ index_max = FFMIN( MAX_AUDIO_STREAMS, context->nb_streams );
*channels = self->total_channels;
*samples = *samples * FFMAX( self->max_frequency, *frequency ) / *frequency;
*frequency = FFMAX( self->max_frequency, *frequency );
}
// Initialize the resamplers and buffers
- for ( ; index < index_max; index++ )
+ for ( ; index < index_max && index < MAX_AUDIO_STREAMS; index++ )
{
// Get codec context
AVCodecContext *codec_context = self->audio_codec[ index ];
if ( codec_context && !self->audio_buffer[ index ] )
{
+#if LIBAVCODEC_VERSION_INT < ((54<<16)+(26<<8)+0)
// Check for resample and create if necessary
if ( codec_context->channels <= 2 )
{
#endif
}
else
+#endif
{
codec_context->request_channels = self->audio_index == INT_MAX ? codec_context->channels : *channels;
sizeof_sample = sample_bytes( codec_context );
{
// Check if there is enough audio for all streams
got_audio = 1;
- for ( index = 0; got_audio && index < context->nb_streams; index++ )
+ for ( index = 0; got_audio && index < index_max; index++ )
if ( ( self->audio_codec[ index ] && self->audio_used[ index ] < *samples ) || ignore[ index ] )
got_audio = 0;
if ( got_audio )
// We only deal with audio from the selected audio index
index = pkt.stream_index;
- if ( ret >= 0 && pkt.data && pkt.size > 0 && ( index == self->audio_index ||
+ if ( index < MAX_AUDIO_STREAMS && ret >= 0 && pkt.data && pkt.size > 0 && ( index == self->audio_index ||
( self->audio_index == INT_MAX && context->streams[ index ]->codec->codec_type == CODEC_TYPE_AUDIO ) ) )
{
int channels2 = ( self->audio_index == INT_MAX || !self->audio_resample[index] ) ?
index = self->audio_index;
*channels = self->audio_codec[ index ]->channels;
*frequency = self->audio_codec[ index ]->sample_rate;
- *format = self->audio_codec[ index ]->sample_fmt == AV_SAMPLE_FMT_S32 ? mlt_audio_s32le
- : self->audio_codec[ index ]->sample_fmt == AV_SAMPLE_FMT_FLT ? mlt_audio_f32le
- : mlt_audio_s16;
+ *format = pick_audio_format( self->audio_codec[ index ]->sample_fmt );
sizeof_sample = sample_bytes( self->audio_codec[ index ] );
}
else if ( self->audio_index == INT_MAX )
{
- // This only works if all audio tracks have the same sample format.
for ( index = 0; index < index_max; index++ )
if ( self->audio_codec[ index ] && !self->audio_resample[ index ] )
{
- *format = self->audio_codec[ index ]->sample_fmt == AV_SAMPLE_FMT_S32 ? mlt_audio_s32le
- : self->audio_codec[ index ]->sample_fmt == AV_SAMPLE_FMT_FLT ? mlt_audio_f32le
- : mlt_audio_s16;
+ // XXX: This only works if all audio tracks have the same sample format.
+ *format = pick_audio_format( self->audio_codec[ index ]->sample_fmt );
sizeof_sample = sample_bytes( self->audio_codec[ index ] );
break;
}
else if ( context && index > -1 && audio_codec_init( self, index, properties ) )
{
// Set the frame properties
- if ( index < INT_MAX )
+ if ( index < MAX_AUDIO_STREAMS )
{
mlt_properties_set_int( frame_properties, "frequency", self->audio_codec[ index ]->sample_rate );
mlt_properties_set_int( frame_properties, "channels", self->audio_codec[ index ]->channels );
// 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 );
+ mlt_properties_set_position( MLT_FRAME_PROPERTIES( *frame ), "original_position", position );
// Calculate the next timecode
mlt_producer_prepare_next( producer );
mlt_log_debug( NULL, "producer_avformat_close\n" );
// Cleanup av contexts
+ av_free_packet( &self->pkt );
av_free( self->av_frame );
pthread_mutex_lock( &self->open_mutex );
int i;
#endif
if ( self->image_cache )
mlt_cache_close( self->image_cache );
- if ( self->alpha_cache )
- mlt_cache_close( self->alpha_cache );
// Cleanup the mutexes
pthread_mutex_destroy( &self->audio_mutex );