int width = mlt_properties_get_int( properties, "width" );
int height = mlt_properties_get_int( properties, "height" );
+ // See if video is turned off
+ int video_off = mlt_properties_get_int( properties, "video_off" );
+
+ // Get the audio settings
+ mlt_audio_format afmt = mlt_audio_pcm;
+ int counter = 0;
+ double fps = mlt_properties_get_double( properties, "fps" );
+ int channels = mlt_properties_get_int( properties, "channels" );
+ int frequency = mlt_properties_get_int( properties, "frequency" );
+ int samples = 0;
+ int16_t *pcm = NULL;
+
+ // See if audio is turned off
+ int audio_off = mlt_properties_get_int( properties, "audio_off" );
+
// Get the maximum size of the buffer
- int buffer = mlt_properties_get_int( properties, "buffer" );
+ int buffer = mlt_properties_get_int( properties, "buffer" ) + 1;
// General frame variable
mlt_frame frame = NULL;
while ( this->ahead )
{
// Put the current frame into the queue
+ time_difference( &ante );
pthread_mutex_lock( &this->mutex );
while( this->ahead && mlt_deque_count( this->queue ) >= buffer )
pthread_cond_wait( &this->cond, &this->mutex );
mlt_deque_push_back( this->queue, frame );
pthread_cond_broadcast( &this->cond );
pthread_mutex_unlock( &this->mutex );
- time_wait += time_difference( &ante );
+ time_wait = time_difference( &ante );
// Get the next frame
frame = mlt_consumer_get_frame( this );
skipped = 0;
time_frame = 0;
time_image = 0;
- time_wait = 0;
count = 1;
}
// Get the image
- if ( ( time_frame + time_image ) / count < ( 40000 - ( time_wait / count ) ) )
+ if ( ( time_frame + time_image ) / count < 40000 )
{
// Get the image, mark as rendered and time it
- mlt_frame_get_image( frame, &image, &this->format, &width, &height, 0 );
+ if ( !video_off )
+ mlt_frame_get_image( frame, &image, &this->format, &width, &height, 0 );
mlt_properties_set_int( mlt_frame_properties( frame ), "rendered", 1 );
- time_image += time_difference( &ante );
// Reset the skipped count
skipped = 0;
skipped = 0;
time_frame = 0;
time_image = 0;
- time_wait = 0;
count = 0;
}
}
+
+ // Always process audio
+ if ( !audio_off )
+ {
+ samples = mlt_sample_calculator( fps, frequency, counter++ );
+ mlt_frame_get_audio( frame, &pcm, &afmt, &frequency, &channels, &samples );
+ frame->get_audio = NULL;
+ }
+
+ // Increment the time take for this frame
+ time_image += time_difference( &ante );
}
// Remove the last frame
int buffer = mlt_properties_get_int( properties, "buffer" );
consumer_read_ahead_start( this );
if ( buffer > 1 )
- size = buffer / 2;
+ size = buffer;
}
// Get frame from queue