From: lilo_booter Date: Mon, 31 Jan 2005 15:01:05 +0000 (+0000) Subject: Consumer reworked X-Git-Url: http://research.m1stereo.tv/gitweb?a=commitdiff_plain;h=34302be17d7f9797adf2a3bff34c11a3d9fcdc7d;p=melted Consumer reworked git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@644 d19143bc-622f-0410-bfdd-b5b2a6649095 --- diff --git a/src/modules/sdl/consumer_sdl_preview.c b/src/modules/sdl/consumer_sdl_preview.c index cb2e33c..99c495e 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,9 @@ struct consumer_sdl_s int running; int sdl_flags; double last_speed; + + pthread_cond_t refresh_cond; + pthread_mutex_t refresh_mutex; }; /** Forward references to static functions. @@ -53,6 +57,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 +95,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 +116,20 @@ 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; + 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 ); + } + } +} + static int consumer_start( mlt_consumer parent ) { consumer_sdl this = parent->child; @@ -149,6 +171,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 ); @@ -239,17 +265,13 @@ 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; - - // Get changed requests to the preview (focus changes) - int changed = mlt_properties_get_int( properties, "changed" ); + double use_speed = speed; // Get refresh request for the current frame (effect changes in still mode) 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 ); // Set the changed property on this frame for the benefit of still mlt_properties_set_int( MLT_FRAME_PROPERTIES( frame ), "refresh", refresh ); @@ -260,8 +282,8 @@ static void *consumer_thread( void *arg ) // 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 @@ -279,7 +301,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 ) @@ -290,9 +311,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 @@ -307,7 +328,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 ); } @@ -321,6 +341,14 @@ static void *consumer_thread( void *arg ) mlt_properties_set_int( properties, "rect_h", mlt_properties_get_int( active, "rect_h" ) ); } + if ( this->active == this->still ) + { + pthread_mutex_lock( &this->refresh_mutex ); + if ( speed == 0 && mlt_properties_get_int( properties, "refresh" ) == 0 ) + pthread_cond_wait( &this->refresh_cond, &this->refresh_mutex ); + pthread_mutex_unlock( &this->refresh_mutex ); + } + // We are definitely not waiting on the first frame any more first = 0; } diff --git a/src/modules/sdl/consumer_sdl_still.c b/src/modules/sdl/consumer_sdl_still.c index 6420dfc..f9e3aa7 100644 --- a/src/modules/sdl/consumer_sdl_still.c +++ b/src/modules/sdl/consumer_sdl_still.c @@ -422,7 +422,6 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) mlt_properties_set_int( properties, "changed", 0 ); } - if ( changed == 0 && this->last_position == mlt_frame_get_position( frame ) && this->last_producer == mlt_properties_get_data( MLT_FRAME_PROPERTIES( frame ), "_producer", NULL ) ) @@ -535,7 +534,6 @@ static void *consumer_thread( void *arg ) // internal intialization mlt_frame frame = NULL; - struct timespec tm = { 0, 10000000 }; if ( mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( consumer ), "sdl_started" ) == 0 ) { @@ -568,8 +566,7 @@ static void *consumer_thread( void *arg ) // Ensure that we have a frame if ( frame != NULL ) { - if ( consumer_play_video( this, frame ) == 0 ) - nanosleep( &tm, NULL ); + consumer_play_video( this, frame ); mlt_frame_close( frame ); } }