- Removed 'resize' property logic and width/height confusion

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

diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c
index 91925c9..577d205 100644 (file)
--- a/src/modules/sdl/consumer_sdl.c
+++ b/src/modules/sdl/consumer_sdl.c
@@ -57,9 +57,8 @@ struct consumer_sdl_s
        pthread_cond_t video_cond;
        int window_width;
        int window_height;
-       float aspect_ratio;
-       float display_aspect;
-       double last_frame_aspect;
+       int previous_width;
+       int previous_height;
        int width;
        int height;
        int playing;
@@ -117,6 +116,9 @@ mlt_consumer consumer_sdl_init( char *arg )
                mlt_service service = MLT_CONSUMER_SERVICE( parent );
                this->properties = MLT_SERVICE_PROPERTIES( service );
 
+               // Default display aspect ratio
+               double display_ratio = mlt_properties_get_double( this->properties, "display_ratio" );
+               
                // Set the default volume
                mlt_properties_set_double( this->properties, "volume", 1.0 );
 
@@ -138,15 +140,9 @@ mlt_consumer consumer_sdl_init( char *arg )
                // Default audio buffer
                mlt_properties_set_int( this->properties, "audio_buffer", 512 );
 
-               // 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;
-               
                // process actual param
                if ( arg == NULL || sscanf( arg, "%dx%d", &this->width, &this->height ) != 2 )
                {
@@ -155,7 +151,7 @@ mlt_consumer consumer_sdl_init( char *arg )
                }
 
                // Default window size
-               this->window_width = ( float )this->height * this->display_aspect;
+               this->window_width = ( double )this->height * display_ratio;
                this->window_height = this->height;
 
                // Set the sdl flags
@@ -197,12 +193,8 @@ int consumer_start( mlt_consumer parent )
                this->running = 1;
                this->joined = 0;
 
-               // Allow the user to force resizing to window size
-               if ( mlt_properties_get_int( this->properties, "resize" ) )
-               {
-                       mlt_properties_set_int( this->properties, "width", this->width );
-                       mlt_properties_set_int( this->properties, "height", this->height );
-               }
+               this->width = mlt_properties_get_int( this->properties, "width" );
+               this->height = mlt_properties_get_int( this->properties, "height" );
 
                pthread_create( &this->thread, NULL, consumer_thread, this );
        }
@@ -250,7 +242,7 @@ static void sdl_fill_audio( void *udata, uint8_t *stream, int len )
        consumer_sdl this = udata;
 
        // Get the volume
-       float volume = mlt_properties_get_double( this->properties, "volume" );
+       double volume = mlt_properties_get_double( this->properties, "volume" );
 
        pthread_mutex_lock( &this->audio_mutex );
 
@@ -261,7 +253,10 @@ static void sdl_fill_audio( void *udata, uint8_t *stream, int len )
        if ( this->audio_avail >= len )
        {
                // Place in the audio buffer
-               memcpy( stream, this->audio_buffer, len );
+               if ( volume != 1.0 )
+                       SDL_MixAudio( stream, this->audio_buffer, len, ( int )( ( float )SDL_MIX_MAXVOLUME * volume ) );
+               else
+                       memcpy( stream, this->audio_buffer, len );
 
                // Remove len from the audio available
                this->audio_avail -= len;
@@ -278,7 +273,7 @@ static void sdl_fill_audio( void *udata, uint8_t *stream, int len )
                memcpy( stream, this->audio_buffer, this->audio_avail );
 
                // Mix the audio 
-               SDL_MixAudio( stream, stream, len, ( int )( ( float )SDL_MIX_MAXVOLUME * volume ) );
+               SDL_MixAudio( stream, this->audio_buffer, len, ( int )( ( float )SDL_MIX_MAXVOLUME * volume ) );
 
                // No audio left
                this->audio_avail = 0;
@@ -459,10 +454,15 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
                if ( this->running )
                {
                        // Determine window's new display aspect ratio
-                       float this_aspect = ( float )this->window_width / this->window_height;
+                       double this_aspect = ( double )this->window_width / this->window_height;
+
+                       // Get the display aspect ratio
+                       double display_ratio = mlt_properties_get_double( properties, "display_ratio" );
 
                        // Determine frame's display aspect ratio
-                       float frame_aspect = mlt_frame_get_aspect_ratio( frame ) * width / height;
+                       double frame_aspect = mlt_frame_get_aspect_ratio( frame ) * width / height;
+
+                       // Store the width and height received
                        this->width = width;
                        this->height = height;
 
@@ -470,42 +470,31 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
                        if ( mlt_properties_get( properties, "rescale" ) != NULL &&
                                !strcmp( mlt_properties_get( properties, "rescale" ), "none" ) )
                        {
-                               // Special case optimisation to negate odd effect of sample aspect ratio
-                               // not corresponding exactly with image resolution.
-                               if ( ( (int)( this_aspect * 1000 ) == (int)( this->display_aspect * 1000 ) ) && 
-                                        ( (int)( mlt_frame_get_aspect_ratio( frame ) * 1000 ) == (int)( this->aspect_ratio * 1000 ) ) )
+                               // Use hardware scaler to normalise display aspect ratio
+                               this->rect.w = frame_aspect / this_aspect * this->window_width;
+                               this->rect.h = this->window_height;
+                               if ( this->rect.w > this->window_width )
                                {
                                        this->rect.w = this->window_width;
-                                       this->rect.h = this->window_height;
-                               }
-                               else
-                               {
-                                       // Use hardware scaler to normalise display aspect ratio
-                                       this->rect.w = frame_aspect / this_aspect * this->window_width;
-                                       this->rect.h = this->window_height;
-                                       if ( this->rect.w > this->window_width )
-                                       {
-                                               this->rect.w = this->window_width;
-                                               this->rect.h = this_aspect / frame_aspect * this->window_height;
-                                       }
+                                       this->rect.h = this_aspect / frame_aspect * this->window_height;
                                }
                        }
                        // Special case optimisation to negate odd effect of sample aspect ratio
                        // not corresponding exactly with image resolution.
-                       else if ( (int)( this_aspect * 1000 ) == (int)( this->display_aspect * 1000 ) ) 
+                       else if ( (int)( this_aspect * 1000 ) == (int)( display_ratio * 1000 ) ) 
                        {
                                this->rect.w = this->window_width;
                                this->rect.h = this->window_height;
                        }
                        // Use hardware scaler to normalise sample aspect ratio
-                       else if ( this->window_height * this->display_aspect > this->window_width )
+                       else if ( this->window_height * display_ratio > this->window_width )
                        {
                                this->rect.w = this->window_width;
-                               this->rect.h = this->window_width / this->display_aspect;
+                               this->rect.h = this->window_width / display_ratio;
                        }
                        else
                        {
-                               this->rect.w = this->window_height * this->display_aspect;
+                               this->rect.w = this->window_height * display_ratio;
                                this->rect.h = this->window_height;
                        }
                        
@@ -525,7 +514,7 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
                        SDL_SetClipRect( this->sdl_screen, &this->rect );
                        SDL_Flip( this->sdl_screen );
                        sdl_lock_display();
-                       this->sdl_overlay = SDL_CreateYUVOverlay( this->width, this->height, SDL_YUY2_OVERLAY, this->sdl_screen );
+                       this->sdl_overlay = SDL_CreateYUVOverlay( width, height, SDL_YUY2_OVERLAY, this->sdl_screen );
                        sdl_unlock_display();
                }