Fix calloc() parameter ordering

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

diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c
index c11e7e18c8cf0ee2433f658c4e9d6ed85689d10d..4c9489cb6ba2ec71bd932bfd0af7cd6406c9c159 100644 (file)
--- a/src/modules/sdl/consumer_sdl.c
+++ b/src/modules/sdl/consumer_sdl.c
@@ -87,7 +87,7 @@ static void consumer_sdl_event( mlt_listener listener, mlt_properties owner, mlt
 mlt_consumer consumer_sdl_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg )
 {
        // Create the consumer object
-       consumer_sdl this = calloc( sizeof( struct consumer_sdl_s ), 1 );
+       consumer_sdl this = calloc( 1, sizeof( struct consumer_sdl_s ) );
 
        // If no malloc'd and consumer init ok
        if ( this != NULL && mlt_consumer_init( &this->parent, this, profile ) == 0 )
@@ -122,7 +122,7 @@ mlt_consumer consumer_sdl_init( mlt_profile profile, mlt_service_type type, cons
                mlt_properties_set_int( this->properties, "buffer", 1 );
 
                // Default audio buffer
-               mlt_properties_set_int( this->properties, "audio_buffer", 512 );
+               mlt_properties_set_int( this->properties, "audio_buffer", 2048 );
 
                // Ensure we don't join on a non-running object
                this->joined = 1;
@@ -180,12 +180,32 @@ int consumer_start( mlt_consumer parent )
                int display_off = video_off | preview_off;
                int audio_off = mlt_properties_get_int( properties, "audio_off" );
                int sdl_started = mlt_properties_get_int( properties, "sdl_started" );
+               char *output_display = mlt_properties_get( properties, "output_display" );
+               char *window_id = mlt_properties_get( properties, "window_id" );
+               char *audio_driver = mlt_properties_get( properties, "audio_driver" );
+               char *video_driver = mlt_properties_get( properties, "video_driver" );
+               char *audio_device = mlt_properties_get( properties, "audio_device" );
 
                consumer_stop( parent );
 
                this->running = 1;
                this->joined = 0;
 
+               if ( output_display != NULL )
+                       setenv( "DISPLAY", output_display, 1 );
+
+               if ( window_id != NULL )
+                       setenv( "SDL_WINDOWID", window_id, 1 );
+
+               if ( video_driver != NULL )
+                       setenv( "SDL_VIDEODRIVER", video_driver, 1 );
+
+               if ( audio_driver != NULL )
+                       setenv( "SDL_AUDIODRIVER", audio_driver, 1 );
+
+               if ( audio_device != NULL )
+                       setenv( "AUDIODEV", audio_device, 1 );
+
                if ( ! mlt_properties_get_int( this->properties, "_arg_size" ) )
                {
                        if ( mlt_properties_get_int( this->properties, "width" ) > 0 )
@@ -489,7 +509,6 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
        {
                // Get the image, width and height
                mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 );
-               mlt_properties_set_int( MLT_FRAME_PROPERTIES( frame ), "format", vfmt );
                
                void *pool = mlt_cocoa_autorelease_init();
 
@@ -648,7 +667,6 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
                vfmt = preview_format == mlt_image_none ? mlt_image_rgb24a : preview_format;
                if ( !video_off )
                        mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 );
-               mlt_properties_set_int( MLT_FRAME_PROPERTIES( frame ), "format", vfmt );
                mlt_events_fire( properties, "consumer-frame-show", frame, NULL );
        }
 
@@ -773,27 +791,23 @@ static void *consumer_thread( void *arg )
        int init_audio = 1;
        int init_video = 1;
        mlt_frame frame = NULL;
-       mlt_properties properties = NULL;
        int duration = 0;
        int64_t playtime = 0;
        struct timespec tm = { 0, 100000 };
 
        // Loop until told not to
-       while( !terminated && this->running )
+       while( this->running )
        {
                // Get a frame from the attached producer
-               frame = mlt_consumer_rt_frame( consumer );
+               frame = !terminated? mlt_consumer_rt_frame( consumer ) : NULL;
 
                // Check for termination
-               if ( terminate_on_pause && frame != NULL )
+               if ( terminate_on_pause && frame )
                        terminated = mlt_properties_get_double( MLT_FRAME_PROPERTIES( frame ), "_speed" ) == 0.0;
 
                // Ensure that we have a frame
-               if ( frame != NULL )
+               if ( frame )
                {
-                       // Get the frame properties
-                       properties =  MLT_FRAME_PROPERTIES( frame );
-
                        // Play audio
                        init_audio = consumer_play_audio( this, frame, init_audio, &duration );
 
@@ -808,7 +822,7 @@ static void *consumer_thread( void *arg )
                        }
 
                        // Set playtime for this frame
-                       mlt_properties_set_int( properties, "playtime", playtime );
+                       mlt_properties_set_int( MLT_FRAME_PROPERTIES( frame ), "playtime", playtime );
 
                        while ( this->running && mlt_deque_count( this->queue ) > 15 )
                                nanosleep( &tm, NULL );
@@ -822,9 +836,25 @@ static void *consumer_thread( void *arg )
                        // Calculate the next playtime
                        playtime += ( duration * 1000 );
                }
+               else if ( terminated )
+               {
+                       if ( init_video || mlt_deque_count( this->queue ) == 0 )
+                               break;
+                       else
+                               nanosleep( &tm, NULL );
+               }
        }
 
        this->running = 0;
+       
+       // Unblock sdl_preview
+       if ( mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( consumer ), "put_mode" ) == 1 )
+       {
+               frame = mlt_consumer_get_frame( consumer );
+               if ( frame )
+                       mlt_frame_close( frame );
+               frame = NULL;
+       }
 
        // Kill the video thread
        if ( init_video == 0 )