Fix occassional sdl core dumps

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

diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c
index 23ff27c..06171b9 100644 (file)
--- a/src/modules/sdl/consumer_sdl.c
+++ b/src/modules/sdl/consumer_sdl.c
@@ -40,6 +40,7 @@ struct consumer_sdl_s
        mlt_properties properties;
        mlt_deque queue;
        pthread_t thread;
+       int joined;
        int running;
        uint8_t audio_buffer[ 4096 * 10 ];
        int audio_avail;
@@ -131,7 +132,7 @@ mlt_consumer consumer_sdl_init( char *arg )
                        this->height = mlt_properties_get_int( this->properties, "height" );
                        
                        // Default window size
-                       this->window_width = ( float )this->height * this->display_aspect + 0.5;
+                       this->window_width = ( float )this->height * this->display_aspect;
                        this->window_height = this->height;
                }
                else
@@ -178,6 +179,7 @@ int consumer_start( mlt_consumer parent )
                pthread_attr_t thread_attributes;
                
                this->running = 1;
+               this->joined = 0;
 
                // Allow the user to force resizing to window size
                if ( mlt_properties_get_int( this->properties, "resize" ) )
@@ -189,7 +191,7 @@ int consumer_start( mlt_consumer parent )
                // 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 );
        }
 
@@ -201,7 +203,7 @@ int consumer_stop( mlt_consumer parent )
        // Get the actual object
        consumer_sdl this = parent->child;
 
-       if ( this->running )
+       if ( this->joined == 0 )
        {
                // Kill the thread and clean up
                this->running = 0;
@@ -211,6 +213,7 @@ int consumer_stop( mlt_consumer parent )
                pthread_mutex_unlock( &this->audio_mutex );
 
                pthread_join( this->thread, NULL );
+               this->joined = 1;
        }
 
        return 0;
@@ -447,7 +450,7 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
                                        if ( this->rect.w > this->window_width )
                                        {
                                                this->rect.w = this->window_width;
-                                               this->rect.h = this_aspect / frame_aspect * this->window_height + 0.5;
+                                               this->rect.h = this_aspect / frame_aspect * this->window_height;
                                        }
                                }
                        }
@@ -462,16 +465,21 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
                        else if ( this->window_height * this->display_aspect > this->window_width )
                        {
                                this->rect.w = this->window_width;
-                               this->rect.h = this->window_width / this->display_aspect + 0.5;
+                               this->rect.h = this->window_width / this->display_aspect;
                        }
                        else
                        {
-                               this->rect.w = this->window_height * this->display_aspect + 0.5;
+                               this->rect.w = this->window_height * this->display_aspect;
                                this->rect.h = this->window_height;
                        }
                        
                        this->rect.x = ( this->window_width - this->rect.w ) / 2;
                        this->rect.y = ( this->window_height - this->rect.h ) / 2;
+
+                       mlt_properties_set_int( this->properties, "rect_x", this->rect.x );
+                       mlt_properties_set_int( this->properties, "rect_y", this->rect.y );
+                       mlt_properties_set_int( this->properties, "rect_w", this->rect.w );
+                       mlt_properties_set_int( this->properties, "rect_h", this->rect.h );
                        
                        // Force an overlay recreation
                        if ( this->sdl_overlay != NULL )
@@ -533,6 +541,9 @@ static void *video_thread( void *arg )
        mlt_properties properties = NULL;
        double speed = 0;
 
+       // Get real time flag
+       int real_time = mlt_properties_get_int( this->properties, "real_time" );
+
        // Get the current time
        gettimeofday( &now, NULL );
 
@@ -569,7 +580,7 @@ static void *video_thread( void *arg )
                        mlt_position difference = scheduled - elapsed;
 
                        // Smooth playback a bit
-                       if ( difference > 20000 && speed == 1.0 )
+                       if ( real_time && ( difference > 20000 && speed == 1.0 ) )
                        {
                                tm.tv_sec = difference / 1000000;
                                tm.tv_nsec = ( difference % 1000000 ) * 500;
@@ -577,11 +588,11 @@ static void *video_thread( void *arg )
                        }
 
                        // Show current frame if not too old
-                       if ( difference > -10000 || speed != 1.0 || mlt_deque_count( this->queue ) < 2 )
+                       if ( !real_time || ( difference > -10000 || speed != 1.0 || mlt_deque_count( this->queue ) < 2 ) )
                                consumer_play_video( this, next );
 
                        // If the queue is empty, recalculate start to allow build up again
-                       if ( mlt_deque_count( this->queue ) == 0 && speed == 1.0 )
+                       if ( real_time && ( mlt_deque_count( this->queue ) == 0 && speed == 1.0 ) )
                        {
                                gettimeofday( &now, NULL );
                                start = ( ( int64_t )now.tv_sec * 1000000 + now.tv_usec ) - scheduled + 20000;
@@ -592,6 +603,8 @@ static void *video_thread( void *arg )
                mlt_frame_close( next );
        }
 
+       mlt_consumer_stopped( &this->parent );
+
        return NULL;
 }