#include <framework/mlt_frame.h>
#include <framework/mlt_factory.h>
#include <framework/mlt_producer.h>
+#include <framework/mlt_log.h>
#include <stdlib.h>
#include <string.h>
#include <pthread.h>
#include <SDL.h>
#include <SDL_syswm.h>
-#include <assert.h>
+#include <sys/time.h>
extern pthread_mutex_t mlt_sdl_mutex;
int sdl_flags;
double last_speed;
mlt_position last_position;
+
pthread_cond_t refresh_cond;
pthread_mutex_t refresh_mutex;
int refresh_count;
// Create child consumers
this->play = mlt_factory_consumer( profile, "sdl", arg );
this->still = mlt_factory_consumer( profile, "sdl_still", arg );
- mlt_properties_set( properties, "real_time", "0" );
mlt_properties_set( properties, "rescale", "nearest" );
mlt_properties_set( properties, "deinterlace_method", "onefield" );
+ mlt_properties_set_int( properties, "prefill", 1 );
parent->close = consumer_close;
parent->start = consumer_start;
parent->stop = consumer_stop;
{
consumer_sdl this = parent->child;
pthread_mutex_lock( &this->refresh_mutex );
- this->refresh_count = this->refresh_count <= 0 ? 1 : this->refresh_count ++;
+ this->refresh_count = this->refresh_count <= 0 ? 1 : this->refresh_count + 1;
pthread_cond_broadcast( &this->refresh_cond );
pthread_mutex_unlock( &this->refresh_mutex );
}
char *audio_device = mlt_properties_get( properties, "audio_device" );
char *output_display = mlt_properties_get( properties, "output_display" );
int progressive = mlt_properties_get_int( properties, "progressive" ) | mlt_properties_get_int( properties, "deinterlace" );
- int audio_off = mlt_properties_get_int( properties, "audio_off" );
consumer_stop( parent );
SDL_EnableKeyRepeat( SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL );
SDL_EnableUNICODE( 1 );
- // init audio sub-system (if enabled)
- if ( !audio_off )
- SDL_InitSubSystem( SDL_INIT_AUDIO );
-
// Pass properties down
mlt_properties_set_data( play, "transport_producer", mlt_properties_get_data( properties, "transport_producer", NULL ), 0, NULL, NULL );
mlt_properties_set_data( still, "transport_producer", mlt_properties_get_data( properties, "transport_producer", NULL ), 0, NULL, NULL );
mlt_properties_set_int( play, "progressive", progressive );
mlt_properties_set_int( still, "progressive", progressive );
- mlt_properties_pass_list( play, properties, "resize,rescale,width,height,aspect_ratio,display_ratio,volume" );
- mlt_properties_pass_list( still, properties, "resize,rescale,width,height,aspect_ratio,display_ratio" );
- mlt_properties_pass_list( play, properties, "deinterlace_method" );
- mlt_properties_pass_list( still, properties, "deinterlace_method" );
- mlt_properties_pass_list( play, properties, "preview_off,preview_format,window_background" );
- mlt_properties_pass_list( still, properties, "preview_off,preview_format,window_background" );
+ mlt_properties_pass_list( play, properties,
+ "deinterlace_method,resize,rescale,width,height,aspect_ratio,display_ratio,preview_off,preview_format,window_background"
+ ",volume,real_time,buffer,prefill,audio_off,frequency,drop_max" );
+ mlt_properties_pass_list( still, properties,
+ "deinterlace_method,resize,rescale,width,height,aspect_ratio,display_ratio,preview_off,preview_format,window_background" );
mlt_properties_pass( play, properties, "play." );
mlt_properties_pass( still, properties, "still." );
mlt_properties_set_int( play, "sdl_started", 1 );
mlt_properties_set_int( still, "sdl_started", 1 );
- // Inform the sdl child consumer to not quit the audio sub-system
- mlt_properties_set_int( play, "quit_audio_subsystem", 0 );
-
pthread_create( &this->thread, NULL, consumer_thread, this );
}
if ( this->joined == 0 )
{
- // inform child sdl consumer to quit the audio sub-system
- mlt_properties_set_int( MLT_CONSUMER_PROPERTIES( this->play ), "quit_audio_subsystem", 1 );
-
mlt_properties properties = MLT_CONSUMER_PROPERTIES( parent );
int app_locked = mlt_properties_get_int( properties, "app_locked" );
void ( *lock )( void ) = mlt_properties_get_data( properties, "app_lock", NULL );
pthread_mutex_lock( &this->refresh_mutex );
pthread_cond_broadcast( &this->refresh_cond );
pthread_mutex_unlock( &this->refresh_mutex );
+#ifndef WIN32
if ( this->thread )
+#endif
pthread_join( this->thread, NULL );
this->joined = 1;
if ( app_locked && lock ) lock( );
+
pthread_mutex_lock( &mlt_sdl_mutex );
SDL_Quit( );
pthread_mutex_unlock( &mlt_sdl_mutex );
if ( speed != 1 )
{
mlt_producer producer = MLT_PRODUCER( mlt_service_get_producer( MLT_CONSUMER_SERVICE( consumer ) ) );
- mlt_position duration = mlt_producer_get_playtime( producer );
+ mlt_position duration = producer? mlt_producer_get_playtime( producer ) : -1;
int pause = 0;
+#ifndef SKIP_WAIT_EOS
if ( this->active == this->play )
{
// Do not interrupt the play consumer near the end
}
else
{
- // Send frame with speed 0 once to stop it
- if ( frame && !eos && speed == 0.0 )
+ // Send frame with speed 0 to stop it
+ if ( frame && !mlt_consumer_is_stopped( this->play ) )
{
mlt_consumer_put_frame( this->play, frame );
+ frame = NULL;
eos = 1;
}
if ( mlt_consumer_is_stopped( this->play ) )
{
// Stream has ended
+ mlt_log_verbose( MLT_CONSUMER_SERVICE( consumer ), "END OF STREAM\n" );
pause = 1;
- eos = 0; // reset eof indicator
+ eos = 0; // reset eos indicator
+ }
+ else
+ {
+ // Prevent a tight busy loop
+ struct timespec tm = { 0, 100000L }; // 100 usec
+ nanosleep( &tm, NULL );
}
}
}
+#else
+ pause = this->active == this->play;
+#endif
if ( pause )
{
// Start the still consumer
projects / mlt / blobdiff