avformat/configure: add --avformat-svn-extra

[melted] / src / modules / avformat / producer_avformat.c

diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c
index 9491d64..03b62b6 100644 (file)
--- a/src/modules/avformat/producer_avformat.c
+++ b/src/modules/avformat/producer_avformat.c
@@ -272,9 +272,9 @@ static int producer_open( mlt_producer this, char *file )
                        if ( context->duration != AV_NOPTS_VALUE ) 
                        {
                                // This isn't going to be accurate for all formats
-                               mlt_position frames = ( mlt_position )( ( ( double )context->duration / ( double )AV_TIME_BASE ) * fps );
-                               mlt_properties_set_position( properties, "out", frames - 2 );
-                               mlt_properties_set_position( properties, "length", frames - 1 );
+                               mlt_position frames = ( mlt_position )( ( ( double )context->duration / ( double )AV_TIME_BASE ) * fps + 0.5 );
+                               mlt_properties_set_position( properties, "out", frames - 1 );
+                               mlt_properties_set_position( properties, "length", frames );
                        }
 
                        // Find default audio and video streams
@@ -492,7 +492,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
        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 );
+       int req_position = ( int )( position / fps * source_fps + 0.5 );
 
        // Get the seekable status
        int seekable = mlt_properties_get_int( properties, "seekable" );
@@ -552,7 +552,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
                else if ( seekable && ( position < expected || position - expected >= 12 ) )
                {
                        // Calculate the timestamp for the requested frame
-                       int64_t timestamp = ( int64_t )( ( double )req_position / source_fps * AV_TIME_BASE );
+                       int64_t timestamp = ( int64_t )( ( double )req_position / source_fps * AV_TIME_BASE + 0.5 );
                        if ( ( uint64_t )context->start_time != AV_NOPTS_VALUE )
                                timestamp += context->start_time;
                        if ( must_decode )
@@ -572,7 +572,9 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
        }
 
        // 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 )
+       int current_position = mlt_properties_get_int( properties, "_current_position" );
+       int got_picture = mlt_properties_get_int( properties, "_got_picture" );
+       if ( av_frame != NULL && got_picture && ( paused || current_position >= req_position ) && av_bypass == 0 )
        {
                // Duplicate it
                convert_image( av_frame, *buffer, codec_context->pix_fmt, *format, *width, *height );
@@ -583,8 +585,8 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
        else
        {
                int ret = 0;
-               int got_picture = 0;
                int int_position = 0;
+               got_picture = 0;
 
                av_init_packet( &pkt );
 
@@ -604,10 +606,9 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
                        if ( ret >= 0 && pkt.stream_index == index && pkt.size > 0 )
                        {
                                // Determine time code of the packet
-                               int_position = ( int )( av_q2d( stream->time_base ) * pkt.dts * source_fps );
+                               int_position = ( int )( av_q2d( stream->time_base ) * pkt.dts * source_fps + 0.5 );
                                if ( context->start_time != AV_NOPTS_VALUE )
-                                       int_position -= ( int )( context->start_time * source_fps / AV_TIME_BASE );
-
+                                       int_position -= ( int )( context->start_time * source_fps / AV_TIME_BASE + 0.5 );
                                int last_position = mlt_properties_get_int( properties, "_last_position" );
                                if ( int_position == last_position )
                                        int_position = last_position + 1;
@@ -615,17 +616,8 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
 
                                // Decode the image
                                if ( must_decode || int_position >= req_position )
-                               {
-#ifdef FF_INPUT_BUFFER_PADDING_SIZE
-                                       uint8_t *inbuf = mlt_pool_alloc( pkt.size + FF_INPUT_BUFFER_PADDING_SIZE );
-                                       memcpy( inbuf, pkt.data, pkt.size );
-                                       inbuf[ pkt.size ] = 0;
-                                       ret = avcodec_decode_video( codec_context, av_frame, &got_picture, inbuf, pkt.size );
-                                       mlt_pool_release( inbuf );
-#else
                                        ret = avcodec_decode_video( codec_context, av_frame, &got_picture, pkt.data, pkt.size );
-#endif
-                               }
+
                                if ( got_picture )
                                {
                                        // Handle ignore
@@ -653,6 +645,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
                                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_int( properties, "_current_position", int_position );
+                               mlt_properties_set_int( properties, "_got_picture", 1 );
                        }
 
                        // We're finished with this packet regardless
@@ -885,7 +878,7 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form
        {
                int ret = 0;
                int got_audio = 0;
-               int16_t *temp = mlt_pool_alloc( sizeof( int16_t ) * AVCODEC_MAX_AUDIO_FRAME_SIZE );
+               int16_t *temp = av_malloc( sizeof( int16_t ) * AVCODEC_MAX_AUDIO_FRAME_SIZE );
 
                av_init_packet( &pkt );
 
@@ -901,24 +894,20 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form
                        // Read a packet
                        ret = av_read_frame( context, &pkt );
 
-               int len = pkt.size;
-               uint8_t *ptr = pkt.data;
-                       int data_size = sizeof( int16_t ) * AVCODEC_MAX_AUDIO_FRAME_SIZE;
+                       int len = pkt.size;
+                       uint8_t *ptr = pkt.data;
 
                        // We only deal with audio from the selected audio_index
                        while ( ptr != NULL && ret >= 0 && pkt.stream_index == index && len > 0 )
                        {
+                               int data_size = sizeof( int16_t ) * AVCODEC_MAX_AUDIO_FRAME_SIZE;
+
                                // Decode the audio
 #if (LIBAVCODEC_VERSION_INT >= ((51<<16)+(29<<8)+0))
-                               uint8_t *inbuf = mlt_pool_alloc( len + FF_INPUT_BUFFER_PADDING_SIZE );
-                               memcpy( inbuf, ptr, len );
-                               inbuf[ len ] = 0;
-                               ret = avcodec_decode_audio2( codec_context, temp, &data_size, inbuf, len );
-                               mlt_pool_release( inbuf );
+                               ret = avcodec_decode_audio2( codec_context, temp, &data_size, ptr, len );
 #else
                                ret = avcodec_decode_audio( codec_context, temp, &data_size, ptr, len );
 #endif
-
                                if ( ret < 0 )
                                {
                                        ret = 0;
@@ -978,7 +967,7 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form
                mlt_properties_set_int( properties, "_audio_used", audio_used );
 
                // Release the temporary audio
-               mlt_pool_release( temp );
+               av_free( temp );
        }
        else
        {