Fix inaccurate seeking in consumer producer.

[mlt] / src / modules / core / producer_consumer.c

diff --git a/src/modules/core/producer_consumer.c b/src/modules/core/producer_consumer.c
index 5b63f16b3cfb5eaac885e69e00d2db3f5cd5ace1..d777e949bb756f7c4b70f94683e721c32314ccb4 100644 (file)
--- a/src/modules/core/producer_consumer.c
+++ b/src/modules/core/producer_consumer.c
@@ -89,13 +89,14 @@ static int get_audio( mlt_frame frame, void **buffer, mlt_audio_format *format,
                mlt_frame_set_audio( frame, new_buffer, *format, size, mlt_pool_release );
                memcpy( new_buffer, *buffer, size );
                *buffer = new_buffer;
+               cx->audio_position = mlt_frame_get_position( nested_frame );
        }
        else
        {
                // otherwise return no samples
                *samples = 0;
+               *buffer = NULL;
        }
-       cx->audio_position = mlt_frame_get_position( nested_frame );
 
        return result;
 }
@@ -167,8 +168,8 @@ static int get_frame( mlt_producer this, mlt_frame_ptr frame, int index )
                if ( mlt_producer_get_speed( this ) != 0 )
                        actual_position *= mlt_producer_get_speed( this );
                mlt_position need_first = floor( actual_position );
-               mlt_producer_seek( cx->producer, need_first * mlt_profile_fps( cx->profile )
-                       / mlt_producer_get_fps( this ) );
+               mlt_producer_seek( cx->producer,
+                       lrint( need_first * mlt_profile_fps( cx->profile ) / mlt_producer_get_fps( this ) ) );
 
                // Get the nested frame
                mlt_frame nested_frame = mlt_consumer_rt_frame( cx->consumer );