#include <framework/mlt_factory.h>
#include <framework/mlt_producer.h>
#include <stdlib.h>
+#include <string.h>
#include <pthread.h>
#include <SDL/SDL.h>
#include <SDL/SDL_syswm.h>
int running;
int sdl_flags;
double last_speed;
+
+ pthread_cond_t refresh_cond;
+ pthread_mutex_t refresh_mutex;
+ int refresh_count;
};
/** Forward references to static functions.
static void *consumer_thread( void * );
static void consumer_frame_show_cb( mlt_consumer sdl, mlt_consumer this, mlt_frame frame );
static void consumer_sdl_event_cb( mlt_consumer sdl, mlt_consumer this, SDL_Event *event );
+static void consumer_refresh_cb( mlt_consumer sdl, mlt_consumer this, char *name );
mlt_consumer consumer_sdl_preview_init( char *arg )
{
mlt_consumer parent = &this->parent;
// Get the properties
- mlt_properties properties = mlt_consumer_properties( parent );
+ mlt_properties properties = MLT_CONSUMER_PROPERTIES( parent );
// Get the width and height
int width = mlt_properties_get_int( properties, "width" );
// Create child consumers
this->play = mlt_factory_consumer( "sdl", arg );
this->still = mlt_factory_consumer( "sdl_still", arg );
- mlt_properties_set( mlt_consumer_properties( parent ), "real_time", "0" );
- mlt_properties_set( mlt_consumer_properties( parent ), "rescale", "nearest" );
+ mlt_properties_set( MLT_CONSUMER_PROPERTIES( parent ), "real_time", "0" );
+ mlt_properties_set( MLT_CONSUMER_PROPERTIES( parent ), "rescale", "nearest" );
parent->close = consumer_close;
parent->start = consumer_start;
parent->stop = consumer_stop;
parent->is_stopped = consumer_is_stopped;
this->joined = 1;
- mlt_events_listen( mlt_consumer_properties( this->play ), this, "consumer-frame-show", ( mlt_listener )consumer_frame_show_cb );
- mlt_events_listen( mlt_consumer_properties( this->still ), this, "consumer-frame-show", ( mlt_listener )consumer_frame_show_cb );
- mlt_events_listen( mlt_consumer_properties( this->play ), this, "consumer-sdl-event", ( mlt_listener )consumer_sdl_event_cb );
- mlt_events_listen( mlt_consumer_properties( this->still ), this, "consumer-sdl-event", ( mlt_listener )consumer_sdl_event_cb );
+ mlt_events_listen( MLT_CONSUMER_PROPERTIES( this->play ), this, "consumer-frame-show", ( mlt_listener )consumer_frame_show_cb );
+ mlt_events_listen( MLT_CONSUMER_PROPERTIES( this->still ), this, "consumer-frame-show", ( mlt_listener )consumer_frame_show_cb );
+ mlt_events_listen( MLT_CONSUMER_PROPERTIES( this->play ), this, "consumer-sdl-event", ( mlt_listener )consumer_sdl_event_cb );
+ mlt_events_listen( MLT_CONSUMER_PROPERTIES( this->still ), this, "consumer-sdl-event", ( mlt_listener )consumer_sdl_event_cb );
+ pthread_cond_init( &this->refresh_cond, NULL );
+ pthread_mutex_init( &this->refresh_mutex, NULL );
+ mlt_events_listen( MLT_CONSUMER_PROPERTIES( parent ), this, "property-changed", ( mlt_listener )consumer_refresh_cb );
return parent;
}
free( this );
void consumer_frame_show_cb( mlt_consumer sdl, mlt_consumer parent, mlt_frame frame )
{
consumer_sdl this = parent->child;
- this->last_speed = mlt_properties_get_double( mlt_frame_properties( frame ), "_speed" );
- mlt_events_fire( mlt_consumer_properties( parent ), "consumer-frame-show", frame, NULL );
+ this->last_speed = mlt_properties_get_double( MLT_FRAME_PROPERTIES( frame ), "_speed" );
+ mlt_events_fire( MLT_CONSUMER_PROPERTIES( parent ), "consumer-frame-show", frame, NULL );
}
static void consumer_sdl_event_cb( mlt_consumer sdl, mlt_consumer parent, SDL_Event *event )
{
- mlt_events_fire( mlt_consumer_properties( parent ), "consumer-sdl-event", event, NULL );
+ mlt_events_fire( MLT_CONSUMER_PROPERTIES( parent ), "consumer-sdl-event", event, NULL );
+}
+
+static void consumer_refresh_cb( mlt_consumer sdl, mlt_consumer parent, char *name )
+{
+ if ( !strcmp( name, "refresh" ) )
+ {
+ consumer_sdl this = parent->child;
+ 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 );
+ }
}
static int consumer_start( mlt_consumer parent )
if ( !this->running )
{
- pthread_attr_t thread_attributes;
-
+ // properties
+ mlt_properties properties = MLT_CONSUMER_PROPERTIES( parent );
+ mlt_properties play = MLT_CONSUMER_PROPERTIES( this->play );
+ mlt_properties still = MLT_CONSUMER_PROPERTIES( this->still );
+
+ char *window_id = mlt_properties_get( properties, "window_id" );
+ char *audio_driver = mlt_properties_get( properties, "audio_driver" );
+ int progressive = mlt_properties_get_int( properties, "progressive" ) | mlt_properties_get_int( properties, "deinterlace" );
+
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 );
+
+ 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 );
+
+ // 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_data( play, "transport_callback", mlt_properties_get_data( properties, "transport_callback", NULL ), 0, NULL, NULL );
+ mlt_properties_set_data( still, "transport_callback", mlt_properties_get_data( properties, "transport_callback", NULL ), 0, NULL, NULL );
- pthread_create( &this->thread, &thread_attributes, consumer_thread, this );
+ 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" );
+ 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" );
+ mlt_properties_pass_list( still, properties, "preview_off,preview_format" );
+
+ mlt_properties_pass( play, properties, "play." );
+ mlt_properties_pass( still, properties, "still." );
+
+ mlt_properties_set_data( play, "app_lock", mlt_properties_get_data( properties, "app_lock", NULL ), 0, NULL, NULL );
+ mlt_properties_set_data( still, "app_lock", mlt_properties_get_data( properties, "app_lock", NULL ), 0, NULL, NULL );
+ mlt_properties_set_data( play, "app_unlock", mlt_properties_get_data( properties, "app_unlock", NULL ), 0, NULL, NULL );
+ mlt_properties_set_data( still, "app_unlock", mlt_properties_get_data( properties, "app_unlock", NULL ), 0, NULL, NULL );
+
+ mlt_properties_set_int( play, "put_mode", 1 );
+ mlt_properties_set_int( still, "put_mode", 1 );
+
+ // Start the still producer just to initialise the gui
+ mlt_consumer_start( this->still );
+ this->active = this->still;
+
+ // Inform child consumers that we control the sdl
+ mlt_properties_set_int( play, "sdl_started", 1 );
+ mlt_properties_set_int( still, "sdl_started", 1 );
+
+ pthread_create( &this->thread, NULL, consumer_thread, this );
}
return 0;
if ( this->joined == 0 )
{
+ 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 );
+ void ( *unlock )( void ) = mlt_properties_get_data( properties, "app_unlock", NULL );
+
+ if ( app_locked && unlock ) unlock( );
+
// Kill the thread and clean up
this->running = 0;
+ pthread_mutex_lock( &this->refresh_mutex );
+ pthread_cond_broadcast( &this->refresh_cond );
+ pthread_mutex_unlock( &this->refresh_mutex );
+
pthread_join( this->thread, NULL );
this->joined = 1;
+
+ if ( app_locked && lock ) lock( );
+
+ SDL_Quit( );
}
return 0;
// Get the consumer
mlt_consumer consumer = &this->parent;
+ // Get the properties
+ mlt_properties properties = MLT_CONSUMER_PROPERTIES( consumer );
+
// internal intialization
int first = 1;
mlt_frame frame = NULL;
+ int last_position = -1;
- // properties
- mlt_properties properties = mlt_consumer_properties( consumer );
- 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 );
-
- // Inform child consumers that we control the sdl
- mlt_properties_set_int( play, "sdl_started", 1 );
- mlt_properties_set_int( still, "sdl_started", 1 );
-
- // 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_data( play, "transport_callback", mlt_properties_get_data( properties, "transport_callback", NULL ), 0, NULL, NULL );
- mlt_properties_set_data( still, "transport_callback", mlt_properties_get_data( properties, "transport_callback", NULL ), 0, NULL, NULL );
- mlt_properties_set( play, "rescale", mlt_properties_get( properties, "rescale" ) );
- mlt_properties_set( still, "rescale", mlt_properties_get( properties, "rescale" ) );
- mlt_properties_set( play, "width", mlt_properties_get( properties, "width" ) );
- mlt_properties_set( still, "width", mlt_properties_get( properties, "width" ) );
- mlt_properties_set( play, "height", mlt_properties_get( properties, "height" ) );
- mlt_properties_set( still, "height", mlt_properties_get( properties, "height" ) );
-
- mlt_properties_set_int( play, "progressive", 1 );
- mlt_properties_set_int( still, "progressive", 1 );
-
- mlt_properties_pass( play, mlt_consumer_properties( consumer ), "play." );
- mlt_properties_pass( still, mlt_consumer_properties( consumer ), "still." );
+ // Determine if the application is dealing with the preview
+ int preview_off = mlt_properties_get_int( properties, "preview_off" );
- mlt_properties_set_data( play, "app_lock", mlt_properties_get_data( properties, "app_lock", NULL ), 0, NULL, NULL );
- mlt_properties_set_data( still, "app_lock", mlt_properties_get_data( properties, "app_lock", NULL ), 0, NULL, NULL );
- mlt_properties_set_data( play, "app_unlock", mlt_properties_get_data( properties, "app_unlock", NULL ), 0, NULL, NULL );
- mlt_properties_set_data( still, "app_unlock", mlt_properties_get_data( properties, "app_unlock", NULL ), 0, NULL, NULL );
-
- 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 = first ? speed : this->last_speed;
+ double speed = mlt_properties_get_double( MLT_FRAME_PROPERTIES( frame ), "_speed" );
- // Get changed requests to the preview (focus changes)
- int changed = mlt_properties_get_int( properties, "changed" );
+ // 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_properties_set_int( properties, "changed", 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 );
+ mlt_properties_set_int( MLT_FRAME_PROPERTIES( frame ), "refresh", refresh );
// Make sure the recipient knows that this frame isn't really rendered
- mlt_properties_set_int( mlt_frame_properties( frame ), "rendered", 0 );
+ mlt_properties_set_int( MLT_FRAME_PROPERTIES( frame ), "rendered", 0 );
+
+ // 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 );
+ last_position = mlt_frame_get_position( frame );
+ }
+ else
+ {
+ //mlt_consumer_purge( this->play );
+ last_position = -1;
+ }
// If we're not the first frame and both consumers are stopped, then stop ourselves
if ( !first && mlt_consumer_is_stopped( this->play ) && mlt_consumer_is_stopped( this->still ) )
else if ( this->ignore_change -- > 0 && this->active != NULL && !mlt_consumer_is_stopped( this->active ) )
{
mlt_consumer_put_frame( this->active, frame );
- mlt_properties_set_int( still, "changed", changed );
}
// 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_properties_set_int( still, "changed", changed );
mlt_consumer_put_frame( this->still, frame );
}
// Otherwise use the normal player
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 );
}
- mlt_properties_set_int( still, "changed", changed );
mlt_consumer_put_frame( this->play, frame );
}
// Copy the rectangle info from the active consumer
- if ( this->running )
+ if ( this->running && preview_off == 0 )
{
- mlt_properties active = mlt_consumer_properties( this->active );
+ 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 ( 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 / mlt / blobdiff