Aspect ratio modifications

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

diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c
index de43e43..e78e329 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;
@@ -71,6 +72,7 @@ static int consumer_is_stopped( mlt_consumer parent );
 static void consumer_close( mlt_consumer parent );
 static void *consumer_thread( void * );
 static int consumer_get_dimensions( int *width, int *height );
+static void consumer_sdl_event( mlt_listener listener, mlt_properties owner, mlt_service this, void **args );
 
 /** This is what will be called by the factory - anything can be passed in
        via the argument, but keep it simple.
@@ -120,6 +122,9 @@ mlt_consumer consumer_sdl_init( char *arg )
 
                // Get sample aspect ratio
                this->aspect_ratio = mlt_properties_get_double( this->properties, "aspect_ratio" );
+
+               // Ensure we don't join on a non-running object
+               this->joined = 1;
                
                // Default display aspect ratio
                this->display_aspect = 4.0 / 3.0;
@@ -129,27 +134,12 @@ mlt_consumer consumer_sdl_init( char *arg )
                {
                        this->width = mlt_properties_get_int( this->properties, "width" );
                        this->height = mlt_properties_get_int( this->properties, "height" );
-                       
-                       // Default window size
-                       this->window_width = ( float )this->height * this->display_aspect;
-                       this->window_height = this->height;
-               }
-               else
-               {
-                       if ( (int)( ( float )this->width / this->height * 1000 ) != 
-                                (int)( this->display_aspect * 1000 ) ) 
-                       {
-                               // Override these
-                               this->display_aspect = ( float )this->width / this->height;
-                               this->aspect_ratio = 1.0;
-                               mlt_properties_set_double( this->properties, "aspect_ratio", this->aspect_ratio );
-                       }
-                       
-                       // Set window size
-                       this->window_width = this->width;
-                       this->window_height = this->height;
                }
 
+               // Default window size
+               this->window_width = ( float )this->height * this->display_aspect;
+               this->window_height = this->height;
+
                // Set the sdl flags
                this->sdl_flags = SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL | SDL_RESIZABLE | SDL_DOUBLEBUF;
 
@@ -158,6 +148,9 @@ mlt_consumer consumer_sdl_init( char *arg )
                parent->stop = consumer_stop;
                parent->is_stopped = consumer_is_stopped;
 
+               // Register specific events
+               mlt_events_register( this->properties, "consumer-sdl-event", ( mlt_transmitter )consumer_sdl_event );
+
                // Return the consumer produced
                return parent;
        }
@@ -169,6 +162,12 @@ mlt_consumer consumer_sdl_init( char *arg )
        return NULL;
 }
 
+static void consumer_sdl_event( mlt_listener listener, mlt_properties owner, mlt_service this, void **args )
+{
+       if ( listener != NULL )
+               listener( owner, this, ( SDL_Event * )args[ 0 ] );
+}
+
 int consumer_start( mlt_consumer parent )
 {
        consumer_sdl this = parent->child;
@@ -177,7 +176,10 @@ int consumer_start( mlt_consumer parent )
        {
                pthread_attr_t thread_attributes;
                
+               consumer_stop( parent );
+
                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;
@@ -374,6 +377,7 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
        if ( mlt_properties_get_int( properties, "video_off" ) == 0 )
        {
                // Get the image, width and height
+               mlt_events_fire( properties, "consumer-frame-show", frame, NULL );
                mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 );
                
                // Handle events
@@ -385,6 +389,8 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
        
                        while ( SDL_PollEvent( &event ) )
                        {
+                               mlt_events_fire( this->properties, "consumer-sdl-event", &event, NULL );
+
                                switch( event.type )
                                {
                                        case SDL_VIDEORESIZE:
@@ -411,7 +417,10 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
                        }
                }
        
-               if ( width != this->width || height != this->height || this->last_frame_aspect != mlt_frame_get_aspect_ratio( frame ) )
+               if ( width != this->width || height != this->height || 
+                        ( ( int )( this->last_frame_aspect * 1000 ) != ( int )( mlt_frame_get_aspect_ratio( frame ) * 1000 ) &&
+                        ( mlt_frame_get_aspect_ratio( frame ) != 1.0 || this->last_frame_aspect == 0.0 ) ) )
+
                {
                        this->width = width;
                        this->height = height;
@@ -600,6 +609,8 @@ static void *video_thread( void *arg )
                mlt_frame_close( next );
        }
 
+       mlt_consumer_stopped( &this->parent );
+
        return NULL;
 }