X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl_preview.c;h=ec383ab2e06c57eacc201770e83fcd520665113b;hb=ff8e939e1781bf747b7a9f2d6a26a6f7ca1b9bee;hp=cfb6c0ebbab6e8c7495b96240a4ef0969909da1e;hpb=f00476101550ec7d8e863f6516aa83bc1b524570;p=melted diff --git a/src/modules/sdl/consumer_sdl_preview.c b/src/modules/sdl/consumer_sdl_preview.c index cfb6c0e..ec383ab 100644 --- a/src/modules/sdl/consumer_sdl_preview.c +++ b/src/modules/sdl/consumer_sdl_preview.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -41,6 +42,10 @@ struct consumer_sdl_s 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. @@ -53,6 +58,7 @@ static void consumer_close( mlt_consumer parent ); 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 ) { @@ -90,6 +96,9 @@ mlt_consumer consumer_sdl_preview_init( char *arg ) 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 ); @@ -108,6 +117,18 @@ static void consumer_sdl_event_cb( mlt_consumer sdl, mlt_consumer parent, SDL_Ev 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 ) { consumer_sdl this = parent->child; @@ -149,6 +170,10 @@ static int consumer_stop( mlt_consumer parent ) // 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 ); + if ( this->play ) mlt_consumer_stop( this->play ); if ( this->still ) mlt_consumer_stop( this->still ); @@ -178,6 +203,7 @@ static void *consumer_thread( void *arg ) // internal intialization int first = 1; mlt_frame frame = NULL; + int last_position = -1; // properties mlt_properties properties = MLT_CONSUMER_PROPERTIES( consumer ); @@ -238,17 +264,21 @@ static void *consumer_thread( void *arg ) 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 use_speed = 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 ); @@ -256,6 +286,19 @@ static void *consumer_thread( void *arg ) // Make sure the recipient knows that this frame isn't really rendered 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 ) ) { @@ -266,7 +309,6 @@ static void *consumer_thread( void *arg ) 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 ) @@ -277,9 +319,9 @@ static void *consumer_thread( void *arg ) { this->last_speed = use_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 @@ -294,7 +336,6 @@ static void *consumer_thread( void *arg ) this->ignore_change = 25; mlt_consumer_start( this->play ); } - mlt_properties_set_int( still, "changed", changed ); mlt_consumer_put_frame( this->play, frame ); } @@ -302,21 +343,36 @@ static void *consumer_thread( void *arg ) 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 && this->refresh_count == 0 ) + pthread_cond_wait( &this->refresh_cond, &this->refresh_mutex ); + this->refresh_count = 0; + pthread_mutex_unlock( &this->refresh_mutex ); } // We are definitely not waiting on the first frame any more first = 0; } + else + { + this->running = 0; + } } - mlt_consumer_stop( this->play ); - mlt_consumer_stop( this->still ); + //mlt_consumer_stop( this->play ); + //mlt_consumer_stop( this->still ); - SDL_Quit( ); + //SDL_Quit( ); return NULL; } @@ -332,13 +388,13 @@ static void consumer_close( mlt_consumer parent ) // 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 ); }