// Get the codec context
AVCodecContext *codec_context = context->streams[ i ]->codec;
+ if ( avcodec_find_decoder( codec_context->codec_id ) == NULL )
+ continue;
+
// Determine the type and obtain the first index of each type
switch( codec_context->codec_type )
{
}
// Now attempt to open the file
- error = av_open_input_file( &context, file, format, 0, params );
- error = error < 0;
+ error = av_open_input_file( &context, file, format, 0, params ) < 0;
// Cleanup AVFormatParameters
free( standard );
// Store selected audio and video indexes on properties
mlt_properties_set_int( properties, "audio_index", audio_index );
mlt_properties_set_int( properties, "video_index", video_index );
+ mlt_properties_set_int( properties, "_last_position", -1 );
+
+ // Fetch the width, height and aspect ratio
+ if ( video_index != -1 )
+ {
+ AVCodecContext *codec_context = context->streams[ video_index ]->codec;
+ mlt_properties_set_int( properties, "width", codec_context->width );
+ mlt_properties_set_int( properties, "height", codec_context->height );
+ mlt_properties_set_double( properties, "aspect_ratio", av_q2d( codec_context->sample_aspect_ratio ) );
+ }
// We're going to cheat here - for a/v files, we will have two contexts (reasoning will be clear later)
if ( av == 0 && !av_bypass && audio_index != -1 && video_index != -1 )
{
// We'll use the open one as our video_context
mlt_properties_set_data( properties, "video_context", context, 0, producer_file_close, NULL );
+ av_seek_frame( context, -1, 0, AVSEEK_FLAG_BACKWARD );
// And open again for our audio context
av_open_input_file( &context, file, NULL, 0, NULL );
{
// We only have a video context
mlt_properties_set_data( properties, "video_context", context, 0, producer_file_close, NULL );
+ av_seek_frame( context, -1, 0, AVSEEK_FLAG_BACKWARD );
}
else if ( audio_index != -1 )
{
static inline void convert_image( AVFrame *frame, uint8_t *buffer, int pix_fmt, mlt_image_format format, int width, int height )
{
- // EXPERIMENTAL IMAGE NORMALISATIONS
- if ( pix_fmt == PIX_FMT_YUV420P && format == mlt_image_yuv422 )
- {
- register int i, j;
- register int half = width >> 1;
- register uint8_t *Y = ( ( AVPicture * )frame )->data[ 0 ];
- register uint8_t *U = ( ( AVPicture * )frame )->data[ 1 ];
- register uint8_t *V = ( ( AVPicture * )frame )->data[ 2 ];
- register uint8_t *d = buffer;
- register uint8_t *y, *u, *v;
-
- i = height >> 1;
- while ( i -- )
- {
- y = Y;
- u = U;
- v = V;
- j = half;
- while ( j -- )
- {
- *d ++ = *y ++;
- *d ++ = *u ++;
- *d ++ = *y ++;
- *d ++ = *v ++;
- }
-
- Y += ( ( AVPicture * )frame )->linesize[ 0 ];
- y = Y;
- u = U;
- v = V;
- j = half;
- while ( j -- )
- {
- *d ++ = *y ++;
- *d ++ = *u ++;
- *d ++ = *y ++;
- *d ++ = *v ++;
- }
-
- Y += ( ( AVPicture * )frame )->linesize[ 0 ];
- U += ( ( AVPicture * )frame )->linesize[ 1 ];
- V += ( ( AVPicture * )frame )->linesize[ 2 ];
- }
- }
- else if ( format == mlt_image_yuv420p )
+ if ( format == mlt_image_yuv420p )
{
AVPicture pict;
pict.data[0] = buffer;
int ignore = 0;
// Current time calcs
- double current_time = mlt_properties_get_double( properties, "_current_time" );
+ int current_position = mlt_properties_get_double( properties, "_current_position" );
// We may want to use the source fps if available
double source_fps = mlt_properties_get_double( properties, "source_fps" );
+ double fps = mlt_properties_get_double( properties, "fps" );
+
+ // This is the physical frame position in the source
+ int req_position = ( int )( position / fps * source_fps );
// Get the seekable status
int seekable = mlt_properties_get_int( properties, "seekable" );
// Hopefully provide better support for streams...
int av_bypass = mlt_properties_get_int( properties, "av_bypass" );
+ // Determines if we have to decode all frames in a sequence
+ int must_decode = 1;
+
// Set the result arguments that we know here (only *buffer is now required)
*width = codec_context->width;
*height = codec_context->height;
// Construct the output image
*buffer = mlt_pool_alloc( size );
+ // Temporary hack to improve intra frame only
+ must_decode = strcmp( codec_context->codec->name, "mjpeg" ) &&
+ strcmp( codec_context->codec->name, "rawvideo" ) &&
+ strcmp( codec_context->codec->name, "dvvideo" );
+
// Seek if necessary
if ( position != expected )
{
- if ( position + 1 == expected )
+ if ( av_frame != NULL && position + 1 == expected )
{
// We're paused - use last image
paused = 1;
else if ( !seekable && position > expected && ( position - expected ) < 250 )
{
// Fast forward - seeking is inefficient for small distances - just ignore following frames
- ignore = position - expected;
+ ignore = ( int )( ( position - expected ) / fps * source_fps );
}
else if ( seekable && ( position < expected || position - expected >= 12 ) )
{
- // Set to the real timecode
- av_seek_frame( context, -1, mlt_properties_get_double( properties, "_start_time" ) + real_timecode * 1000000.0, AVSEEK_FLAG_BACKWARD );
+ // Calculate the timestamp for the requested frame
+ int64_t timestamp = ( int64_t )( ( double )req_position / source_fps * AV_TIME_BASE );
+ if ( ( uint64_t )context->start_time != AV_NOPTS_VALUE )
+ timestamp += context->start_time;
+ if ( must_decode )
+ timestamp -= AV_TIME_BASE;
+ if ( timestamp < 0 )
+ timestamp = 0;
+
+ // Set to the timestamp
+ av_seek_frame( context, -1, timestamp, AVSEEK_FLAG_BACKWARD );
// Remove the cached info relating to the previous position
- mlt_properties_set_double( properties, "_current_time", real_timecode );
-
+ mlt_properties_set_int( properties, "_current_position", -1 );
+ mlt_properties_set_int( properties, "_last_position", -1 );
mlt_properties_set_data( properties, "av_frame", NULL, 0, NULL, NULL );
av_frame = NULL;
}
}
-
- // Duplicate the last image if necessary
- if ( av_frame != NULL && ( paused || mlt_properties_get_double( properties, "_current_time" ) >= real_timecode ) &&
- av_bypass == 0 )
+
+ // Duplicate the last image if necessary (see comment on rawvideo below)
+ if ( av_frame != NULL && ( paused || mlt_properties_get_int( properties, "_current_position" ) >= req_position ) && av_bypass == 0 )
{
// Duplicate it
convert_image( av_frame, *buffer, codec_context->pix_fmt, *format, *width, *height );
{
int ret = 0;
int got_picture = 0;
- int must_decode = 1;
-
- // Temporary hack to improve intra frame only
- if ( !strcmp( codec_context->codec->name, "mjpeg" ) )
- must_decode = 0;
+ int int_position = 0;
- memset( &pkt, 0, sizeof( pkt ) );
+ av_init_packet( &pkt );
// Construct an AVFrame for YUV422 conversion
if ( av_frame == NULL )
{
- av_frame = calloc( 1, sizeof( AVFrame ) );
- mlt_properties_set_data( properties, "av_frame", av_frame, 0, free, NULL );
+ av_frame = avcodec_alloc_frame( );
+ mlt_properties_set_data( properties, "av_frame", av_frame, 0, av_free, NULL );
}
while( ret >= 0 && !got_picture )
if ( ret >= 0 && pkt.stream_index == index && pkt.size > 0 )
{
// Determine time code of the packet
- if ( pkt.dts != AV_NOPTS_VALUE )
- current_time = av_q2d( stream->time_base ) * pkt.dts;
- else
- current_time = real_timecode;
+ int_position = ( int )( av_q2d( stream->time_base ) * pkt.dts * source_fps );
+ if ( context->start_time != AV_NOPTS_VALUE )
+ int_position -= ( int )( context->start_time * source_fps / AV_TIME_BASE );
+
+ int last_position = mlt_properties_get_int( properties, "_last_position" );
+ if ( int_position == last_position )
+ int_position = last_position + 1;
+ mlt_properties_set_int( properties, "_last_position", int_position );
// Decode the image
- if ( must_decode || current_time >= real_timecode )
+ if ( must_decode || int_position >= req_position )
ret = avcodec_decode_video( codec_context, av_frame, &got_picture, pkt.data, pkt.size );
if ( got_picture )
{
// Handle ignore
- if ( ( int )( current_time * 100 ) < ( int )( real_timecode * 100 ) - 7 )
+ if ( int_position < req_position )
{
ignore = 0;
got_picture = 0;
}
- else if ( current_time >= real_timecode )
+ else if ( int_position >= req_position )
{
ignore = 0;
}
{
got_picture = 0;
}
- mlt_properties_set_int( properties, "top_field_first", av_frame->top_field_first );
}
}
+ // Now handle the picture if we have one
+ if ( got_picture )
+ {
+ mlt_properties_set_int( frame_properties, "progressive", !av_frame->interlaced_frame );
+ mlt_properties_set_int( frame_properties, "top_field_first", av_frame->top_field_first );
+ convert_image( av_frame, *buffer, codec_context->pix_fmt, *format, *width, *height );
+ mlt_properties_set_data( frame_properties, "image", *buffer, size, (mlt_destructor)mlt_pool_release, NULL );
+ mlt_properties_set_double( properties, "_current_position", int_position );
+ }
+
// We're finished with this packet regardless
av_free_packet( &pkt );
}
+ }
- // Now handle the picture if we have one
- if ( got_picture )
- {
- convert_image( av_frame, *buffer, codec_context->pix_fmt, *format, *width, *height );
-
- mlt_properties_set_data( frame_properties, "image", *buffer, size, (mlt_destructor)mlt_pool_release, NULL );
+ // Very untidy - for rawvideo, the packet contains the frame, hence the free packet
+ // above will break the pause behaviour - so we wipe the frame now
+ if ( !strcmp( codec_context->codec->name, "rawvideo" ) )
+ mlt_properties_set_data( properties, "av_frame", NULL, 0, NULL, NULL );
- if ( current_time == 0 && source_fps != 0 )
- {
- double fps = mlt_properties_get_double( properties, "fps" );
- current_time = ceil( source_fps * ( double )position / fps ) * ( 1 / source_fps );
- mlt_properties_set_double( properties, "_current_time", current_time );
- }
- else
- {
- mlt_properties_set_double( properties, "_current_time", current_time );
- }
- }
- }
-
// Set the field order property for this frame
- mlt_properties_set_int( frame_properties, "top_field_first",
- mlt_properties_get_int( properties, "top_field_first" ) );
+ mlt_properties_set_int( frame_properties, "top_field_first", mlt_properties_get_int( properties, "top_field_first" ) );
// Regardless of speed, we expect to get the next frame (cos we ain't too bright)
mlt_properties_set_position( properties, "_video_expected", position + 1 );
{
double source_fps = 0;
int norm_aspect_ratio = mlt_properties_get_int( properties, "norm_aspect_ratio" );
+ double force_aspect_ratio = mlt_properties_get_double( properties, "force_aspect_ratio" );
+ double aspect_ratio;
// XXX: We won't know the real aspect ratio until an image is decoded
// but we do need it now (to satisfy filter_resize) - take a guess based
// on pal/ntsc
- if ( !norm_aspect_ratio && codec_context->sample_aspect_ratio.num > 0 )
+ if ( force_aspect_ratio > 0.0 )
{
- mlt_properties_set_double( properties, "aspect_ratio", av_q2d( codec_context->sample_aspect_ratio ) );
+ aspect_ratio = force_aspect_ratio;
+ }
+ else if ( !norm_aspect_ratio && codec_context->sample_aspect_ratio.num > 0 )
+ {
+ aspect_ratio = av_q2d( codec_context->sample_aspect_ratio );
}
else
{
int is_pal = mlt_properties_get_double( properties, "fps" ) == 25.0;
- mlt_properties_set_double( properties, "aspect_ratio", is_pal ? 59.0/54.0 : 10.0/11.0 );
+ aspect_ratio = is_pal ? 59.0/54.0 : 10.0/11.0;
}
// Determine the fps
// We'll use fps if it's available
if ( source_fps > 0 && source_fps < 30 )
mlt_properties_set_double( properties, "source_fps", source_fps );
+ else
+ mlt_properties_set_double( properties, "source_fps", mlt_properties_get_double( properties, "fps" ) );
+ mlt_properties_set_double( properties, "aspect_ratio", aspect_ratio );
// Set the width and height
mlt_properties_set_int( frame_properties, "width", codec_context->width );
mlt_properties_set_int( frame_properties, "height", codec_context->height );
+ mlt_properties_set_double( frame_properties, "aspect_ratio", aspect_ratio );
mlt_frame_push_get_image( frame, producer_get_image );
mlt_properties_set_data( frame_properties, "avformat_producer", this, 0, NULL, NULL );
int got_audio = 0;
int16_t *temp = mlt_pool_alloc( sizeof( int16_t ) * AVCODEC_MAX_AUDIO_FRAME_SIZE );
- memset( &pkt, 0, sizeof( pkt ) );
+ av_init_packet( &pkt );
while( ret >= 0 && !got_audio )
{
{
mlt_frame_push_audio( frame, producer_get_audio );
mlt_properties_set_data( frame_properties, "avformat_producer", this, 0, NULL, NULL );
+ mlt_properties_set_int( frame_properties, "frequency", codec_context->sample_rate );
+ mlt_properties_set_int( frame_properties, "channels", codec_context->channels );
}
}
}
projects / melted / blobdiff