SMP/HT fixes

[melted] / src / modules / sdl / consumer_sdl_preview.c

diff --git a/src/modules/sdl/consumer_sdl_preview.c b/src/modules/sdl/consumer_sdl_preview.c
index 99c495e..ec383ab 100644 (file)
--- 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 );
        }
 }
 
@@ -267,11 +266,19 @@ static void *consumer_thread( void *arg )
                        // Determine which speed to use
                        double use_speed = speed;
 
-                       // Get refresh request for the current frame (effect changes in still mode)
+                       // Lock during the operation
+                       mlt_service_lock( MLT_CONSUMER_SERVICE( consumer ) );
+
+                       // 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 );
@@ -282,12 +289,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;
                        }
 
@@ -335,29 +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 && 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 = 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;
 }
@@ -373,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 );
 }