X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl_preview.c;h=4e55bd6f99f7c382c116eee3e2558433834c01aa;hb=833934cc90094c909078f709532e6fe6f8f13b60;hp=66aaf7e21015ab11b041a745295986dbc743a61c;hpb=3dbc8c2612d74b25557cc343eaf85ebdf262b91d;p=melted diff --git a/src/modules/sdl/consumer_sdl_preview.c b/src/modules/sdl/consumer_sdl_preview.c index 66aaf7e..4e55bd6 100644 --- a/src/modules/sdl/consumer_sdl_preview.c +++ b/src/modules/sdl/consumer_sdl_preview.c @@ -45,6 +45,7 @@ struct consumer_sdl_s pthread_cond_t refresh_cond; pthread_mutex_t refresh_mutex; + int refresh_count; }; /** Forward references to static functions. @@ -121,12 +122,10 @@ static void consumer_refresh_cb( mlt_consumer sdl, mlt_consumer parent, char *na 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 ); } } @@ -136,19 +135,13 @@ static int consumer_start( mlt_consumer parent ) if ( !this->running ) { - pthread_attr_t thread_attributes; - 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 ); - - pthread_create( &this->thread, &thread_attributes, consumer_thread, this ); + pthread_create( &this->thread, NULL, consumer_thread, this ); } return 0; @@ -211,6 +204,8 @@ static void *consumer_thread( void *arg ) mlt_properties play = MLT_CONSUMER_PROPERTIES( this->play ); mlt_properties still = MLT_CONSUMER_PROPERTIES( this->still ); + int progressive = mlt_properties_get_int( properties, "progressive" ) | mlt_properties_get_int( properties, "deinterlace" ); + if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE ) < 0 ) { fprintf( stderr, "Failed to initialize SDL: %s\n", SDL_GetError() ); @@ -238,8 +233,10 @@ static void *consumer_thread( void *arg ) 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_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." ); @@ -258,24 +255,22 @@ static void *consumer_thread( void *arg ) // Get a frame from the attached producer frame = mlt_consumer_get_frame( consumer ); - // Ensure that we have a frame if ( 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 ) ); @@ -289,12 +284,13 @@ 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 { + //mlt_consumer_purge( this->play ); last_position = -1; } @@ -310,13 +306,13 @@ static void *consumer_thread( void *arg ) 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 ); @@ -330,7 +326,7 @@ static void *consumer_thread( void *arg ) 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 ); @@ -353,20 +349,25 @@ static void *consumer_thread( void *arg ) if ( this->active == this->still ) { pthread_mutex_lock( &this->refresh_mutex ); - if ( speed == 0 && mlt_properties_get_int( properties, "refresh" ) == 0 ) + if ( 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 + { + 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; } @@ -382,13 +383,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 ); }