pthread_cond_t refresh_cond;
pthread_mutex_t refresh_mutex;
+ int refresh_count;
};
/** Forward references to static functions.
if ( !strcmp( name, "refresh" ) )
{
consumer_sdl this = parent->child;
- if ( mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "refresh" ) )
- {
- pthread_mutex_lock( &this->refresh_mutex );
- pthread_cond_broadcast( &this->refresh_cond );
- pthread_mutex_unlock( &this->refresh_mutex );
- }
+ pthread_mutex_lock( &this->refresh_mutex );
+ this->refresh_count = this->refresh_count <= 0 ? 1 : this->refresh_count ++;
+ pthread_cond_broadcast( &this->refresh_cond );
+ pthread_mutex_unlock( &this->refresh_mutex );
}
}
if ( !this->running )
{
- pthread_attr_t thread_attributes;
-
+ mlt_properties properties = MLT_CONSUMER_PROPERTIES( parent );
+ char *window_id = mlt_properties_get( properties, "window_id" );
+ char *audio_driver = mlt_properties_get( properties, "audio_driver" );
+
consumer_stop( parent );
this->running = 1;
this->joined = 0;
this->last_speed = 1;
- // Inherit the scheduling priority
- pthread_attr_init( &thread_attributes );
- pthread_attr_setinheritsched( &thread_attributes, PTHREAD_INHERIT_SCHED );
+ if ( window_id != NULL )
+ setenv( "SDL_WINDOWID", window_id, 1 );
- pthread_create( &this->thread, &thread_attributes, consumer_thread, this );
+ if ( audio_driver != NULL )
+ setenv( "SDL_AUDIODRIVER", audio_driver, 1 );
+
+ if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE ) < 0 )
+ {
+ fprintf( stderr, "Failed to initialize SDL: %s\n", SDL_GetError() );
+ return -1;
+ }
+
+ SDL_EnableKeyRepeat( SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL );
+ SDL_EnableUNICODE( 1 );
+
+ pthread_create( &this->thread, NULL, consumer_thread, this );
}
return 0;
pthread_cond_broadcast( &this->refresh_cond );
pthread_mutex_unlock( &this->refresh_mutex );
- if ( this->play ) mlt_consumer_stop( this->play );
- if ( this->still ) mlt_consumer_stop( this->still );
-
pthread_join( this->thread, NULL );
this->joined = 1;
if ( app_locked && lock ) lock( );
+
+ SDL_Quit( );
}
return 0;
mlt_properties play = MLT_CONSUMER_PROPERTIES( this->play );
mlt_properties still = MLT_CONSUMER_PROPERTIES( this->still );
- if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE ) < 0 )
- {
- fprintf( stderr, "Failed to initialize SDL: %s\n", SDL_GetError() );
- return NULL;
- }
-
- SDL_EnableKeyRepeat( SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL );
- SDL_EnableUNICODE( 1 );
+ int progressive = mlt_properties_get_int( properties, "progressive" ) | mlt_properties_get_int( properties, "deinterlace" );
// Inform child consumers that we control the sdl
mlt_properties_set_int( play, "sdl_started", 1 );
mlt_properties_set_int( still, "width", mlt_properties_get_int( properties, "width" ) );
mlt_properties_set_int( play, "height", mlt_properties_get_int( properties, "height" ) );
mlt_properties_set_int( still, "height", mlt_properties_get_int( properties, "height" ) );
+ mlt_properties_set_double( play, "aspect_ratio", mlt_properties_get_double( properties, "aspect_ratio" ) );
+ mlt_properties_set_double( still, "aspect_ratio", mlt_properties_get_double( properties, "aspect_ratio" ) );
+ mlt_properties_set_double( play, "display_ratio", mlt_properties_get_double( properties, "display_ratio" ) );
+ mlt_properties_set_double( still, "display_ratio", mlt_properties_get_double( properties, "display_ratio" ) );
- mlt_properties_set_int( play, "progressive", 1 );
- mlt_properties_set_int( still, "progressive", 1 );
+ mlt_properties_set_int( play, "progressive", progressive );
+ mlt_properties_set_int( still, "progressive", progressive );
+ mlt_properties_set( play, "deinterlace_method", mlt_properties_get( properties, "deinterlace_method" ) );
+ mlt_properties_set( still, "deinterlace_method", mlt_properties_get( properties, "deinterlace_method" ) );
mlt_properties_pass( play, MLT_CONSUMER_PROPERTIES( consumer ), "play." );
mlt_properties_pass( still, MLT_CONSUMER_PROPERTIES( consumer ), "still." );
mlt_properties_set_int( play, "put_mode", 1 );
mlt_properties_set_int( still, "put_mode", 1 );
+ this->refresh_count = 0;
+
// Loop until told not to
while( this->running )
{
frame = mlt_consumer_get_frame( consumer );
// Ensure that we have a frame
- if ( frame != NULL )
+ if ( this->running && frame != NULL )
{
// Get the speed of the frame
double speed = mlt_properties_get_double( MLT_FRAME_PROPERTIES( frame ), "_speed" );
- // Determine which speed to use
- double use_speed = speed;
+ // Lock during the operation
+ mlt_service_lock( MLT_CONSUMER_SERVICE( consumer ) );
- // Get refresh request for the current frame (effect changes in still mode)
+ // Get refresh request for the current frame
int refresh = mlt_properties_get_int( properties, "refresh" );
// Decrement refresh and clear changed
- mlt_properties_set_int( properties, "refresh", refresh > 0 ? refresh - 1 : 0 );
+ mlt_events_block( properties, properties );
+ mlt_properties_set_int( properties, "refresh", 0 );
+ mlt_events_unblock( properties, properties );
+
+ // Unlock after the operation
+ mlt_service_unlock( MLT_CONSUMER_SERVICE( consumer ) );
// Set the changed property on this frame for the benefit of still
mlt_properties_set_int( MLT_FRAME_PROPERTIES( frame ), "refresh", refresh );
// Optimisation to reduce latency
if ( speed == 1.0 )
{
- //if ( last_position != -1 && last_position + 1 != mlt_frame_get_position( frame ) )
- //mlt_consumer_purge( this->play );
+ if ( last_position != -1 && last_position + 1 != mlt_frame_get_position( frame ) )
+ mlt_consumer_purge( this->play );
last_position = mlt_frame_get_position( frame );
}
else
{
+ //mlt_consumer_purge( this->play );
last_position = -1;
}
mlt_consumer_put_frame( this->active, frame );
}
// If we aren't playing normally, then use the still
- else if ( use_speed != 1 )
+ else if ( speed != 1 )
{
if ( !mlt_consumer_is_stopped( this->play ) )
mlt_consumer_stop( this->play );
if ( mlt_consumer_is_stopped( this->still ) )
{
- this->last_speed = use_speed;
+ this->last_speed = speed;
this->active = this->still;
this->ignore_change = 0;
mlt_consumer_start( this->still );
mlt_consumer_stop( this->still );
if ( mlt_consumer_is_stopped( this->play ) )
{
- this->last_speed = use_speed;
+ this->last_speed = speed;
this->active = this->play;
this->ignore_change = 25;
mlt_consumer_start( this->play );
if ( this->running )
{
mlt_properties active = MLT_CONSUMER_PROPERTIES( this->active );
+ mlt_service_lock( MLT_CONSUMER_SERVICE( consumer ) );
mlt_properties_set_int( properties, "rect_x", mlt_properties_get_int( active, "rect_x" ) );
mlt_properties_set_int( properties, "rect_y", mlt_properties_get_int( active, "rect_y" ) );
mlt_properties_set_int( properties, "rect_w", mlt_properties_get_int( active, "rect_w" ) );
mlt_properties_set_int( properties, "rect_h", mlt_properties_get_int( active, "rect_h" ) );
+ mlt_service_unlock( MLT_CONSUMER_SERVICE( consumer ) );
}
if ( this->active == this->still )
{
pthread_mutex_lock( &this->refresh_mutex );
- if ( speed == 0 && mlt_properties_get_int( properties, "refresh" ) == 0 )
+ if ( this->running && speed == 0 && this->refresh_count <= 0 )
pthread_cond_wait( &this->refresh_cond, &this->refresh_mutex );
+ this->refresh_count --;
pthread_mutex_unlock( &this->refresh_mutex );
}
// We are definitely not waiting on the first frame any more
first = 0;
}
+ else
+ {
+ if ( frame ) mlt_frame_close( frame );
+ mlt_consumer_put_frame( this->active, NULL );
+ this->running = 0;
+ }
}
- mlt_consumer_stop( this->play );
- mlt_consumer_stop( this->still );
-
- SDL_Quit( );
+ if ( this->play ) mlt_consumer_stop( this->play );
+ if ( this->still ) mlt_consumer_stop( this->still );
return NULL;
}
// Stop the consumer
mlt_consumer_stop( parent );
- // Now clean up the rest
- mlt_consumer_close( parent );
-
// Close the child consumers
mlt_consumer_close( this->play );
mlt_consumer_close( this->still );
+ // Now clean up the rest
+ mlt_consumer_close( parent );
+
// Finally clean up this
free( this );
}
projects / melted / blobdiff