more sdl/consumer tuning and demo updates

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@204 d19143bc-622f-0410-bfdd-b5b2a6649095

diff --git a/demo/consumers.ini b/demo/consumers.ini
new file mode 100644 (file)
index 0000000..d42fbc5
--- /dev/null
+++ b/demo/consumers.ini
@@ -0,0 +1,7 @@
+SDL Default                                            sdl
+SDL Low Latency                                        sdl buffer=1 rescale=none
+SDL Half D1                                            sdl:360x288 buffer=1 rescale=nearest
+Westley to Terminal                            westley
+Westley to File                                        westley:
+Mainconcept DV to /dev/dv1394  mcdv:/dev/dv1394 rescale=nearest buffer=25
+libdv to /dev/dv1394                   libdv:/dev/dv1394 rescale=nearest buffer=25

diff --git a/demo/demo b/demo/demo
index 41a14eaa2da4befb4563aaab9a9859f72491bbcf..9cb2fee34776f3a7e8037d443e1999041b1fe0ab 100755 (executable)
--- a/demo/demo
+++ b/demo/demo
@@ -1,5 +1,16 @@
 #!/bin/bash
 
+function show_consumers( )
+{
+       awk -F '\t' '{ printf( "%d. %s\n", ++ i, $1 ); }' < consumers.ini
+}
+
+function get_consumer( )
+{
+       option=$1
+       [ "$option" != "" ] && [ $option -gt 0 ] && sed 's/\t\+/\t/g' < consumers.ini | cut -f 2 | head -n $option | tail -n -1
+}
+
 function show_menu( )
 {
        sed 's/\t\+/\t/g' < demo.ini |
@@ -39,34 +50,21 @@ function get_demo( )
 while [ 1 ]
 do
 
-cat << "eof"
-Select Consumer
-
-1. Play with Inigo half size
-2. Play with Inigo full size
-3. Serialise with Westley to terminal
-4. Play with Westley
-
-0. Exit
+       echo Select Consumer
+       echo
 
-eof
+       show_consumers
 
+       echo
+       echo 0. Exit
+       echo
        echo -n "Option: "
        read option
        echo
 
-       export MLT_CONSUMER=
+       [ "$option" == "0" ] && break
 
-       case "$option" in
-               "0" ) exit 0 ;;
-               "1" ) export MLT_CONSUMER="sdl:360x288 buffer=1" ;;
-               "2" ) export MLT_CONSUMER="sdl" ;;
-               "3" ) export MLT_CONSUMER="westley" ;;
-               "4" ) export MLT_CONSUMER="westley:" ;;
-               "5" ) export MLT_CONSUMER="mcdv:NTSC target=/dev/dv1394 rescale=nearest" ;;
-               "6" ) export MLT_CONSUMER="bluefish:NTSC" ;;
-               "7" ) export MLT_CONSUMER="sdl rescale=none" ;;
-       esac
+       export MLT_CONSUMER=`get_consumer $option`
 
        while [ "$option" != "0" -a "$MLT_CONSUMER" != "" ]
        do

diff --git a/src/framework/mlt_consumer.c b/src/framework/mlt_consumer.c
index 5ca552f5eb165f50a376f70451aadc098f2abf1c..5249d9fcf4f08cdc46fdb5ca65ea49ddb589ac1c 100644 (file)
--- a/src/framework/mlt_consumer.c
+++ b/src/framework/mlt_consumer.c
@@ -278,6 +278,8 @@ static void *consumer_read_ahead_thread( void *arg )
                                skipped = 0;
                                time_frame = 0;
                                time_image = 0;
+                               time_wait = 0;
+                               count = 0;
                        }
                }
        }

diff --git a/src/modules/core/transition_luma.c b/src/modules/core/transition_luma.c
index 6c7b6e828a9b561da4062b86be314a48aff3f936..ed7de2eb212202d08d5d66e88edb2f1fe7b52da6 100644 (file)
--- a/src/modules/core/transition_luma.c
+++ b/src/modules/core/transition_luma.c
@@ -446,7 +446,10 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
 
        // Since we are the consumer of the b_frame, we must pass along this
        // consumer property from the a_frame
-       mlt_properties_set_double( b_props, "consumer_aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) );
+       if ( !strcmp( mlt_properties_get( a_props, "rescale.interp" ), "none" ) )
+               mlt_properties_set_double( b_props, "consumer_aspect_ratio", mlt_properties_get_double( a_props, "aspect_ratio" ) );
+       else
+               mlt_properties_set_double( b_props, "consumer_aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) );
 
        // Honour the reverse here
        if ( mix >= 1.0 )

diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c
index bfa6e82320d494d34d913594b9e0bc97ca38d0ca..aa88deccb4b214da49545b914c12b840eb75b365 100644 (file)
--- a/src/modules/sdl/consumer_sdl.c
+++ b/src/modules/sdl/consumer_sdl.c
@@ -55,7 +55,6 @@ struct consumer_sdl_s
        SDL_Surface *sdl_screen;
        SDL_Overlay *sdl_overlay;
        uint8_t *buffer;
-       int time_taken;
 };
 
 /** Forward references to static functions.
@@ -264,6 +263,7 @@ static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_aud
        if ( mlt_properties_get_int( properties, "audio_off" ) )
        {
                this->playing = 1;
+               init_audio = 1;
                return init_audio;
        }
 
@@ -295,11 +295,11 @@ static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_aud
 
        if ( init_audio == 0 )
        {
+               mlt_properties properties = mlt_frame_properties( frame );
                bytes = ( samples * channels * 2 );
                pthread_mutex_lock( &this->audio_mutex );
                while ( bytes > ( sizeof( this->audio_buffer) - this->audio_avail ) )
                        pthread_cond_wait( &this->audio_cond, &this->audio_mutex );
-               mlt_properties properties = mlt_frame_properties( frame );
                if ( mlt_properties_get_double( properties, "_speed" ) == 1 )
                        memcpy( &this->audio_buffer[ this->audio_avail ], pcm, bytes );
                else
@@ -316,7 +316,7 @@ static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_aud
        return init_audio;
 }
 
-static int consumer_play_video( consumer_sdl this, mlt_frame frame, int64_t elapsed, int64_t playtime )
+static int consumer_play_video( consumer_sdl this, mlt_frame frame )
 {
        // Get the properties of this consumer
        mlt_properties properties = this->properties;
@@ -326,35 +326,11 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame, int64_t elap
        uint8_t *image;
        int changed = 0;
 
-       if ( mlt_properties_get_int( properties, "video_off" ) )
-       {
-               mlt_frame_close( frame );
-               return 0;
-       }
-
-       // Set skip
-       mlt_properties_set_position( mlt_frame_properties( frame ), "playtime", playtime );
-
-       // Push this frame to the back of the queue
-       mlt_deque_push_back( this->queue, frame );
-       frame = NULL;
-
-       if ( this->playing )
-               frame = mlt_deque_pop_front( this->queue );
-
-       if ( this->playing && frame != NULL && mlt_properties_get_int( mlt_frame_properties( frame ), "rendered" ) == 1 )
+       if ( mlt_properties_get_int( properties, "video_off" ) == 0 )
        {
-               playtime = mlt_properties_get_position( mlt_frame_properties( frame ), "playtime" );
-
                // Get the image, width and height
                mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 );
 
-               if ( playtime > elapsed + 25000 )
-               {
-                       struct timespec tm = { ( playtime - elapsed ) / 1000000, ( ( playtime - elapsed ) % 1000000 ) * 1000 };
-                       nanosleep( &tm, NULL );
-               }
-
                // Handle events
                if ( this->sdl_screen != NULL )
                {
@@ -460,8 +436,7 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame, int64_t elap
        }
 
        // Close the frame
-       if ( frame != NULL )
-               mlt_frame_close( frame );
+       mlt_frame_close( frame );
 
        return 0;
 }
@@ -486,6 +461,9 @@ static void *consumer_thread( void *arg )
        int64_t elapsed = 0;
        int duration = 0;
        int64_t playtime = 0;
+       struct timespec tm;
+       mlt_frame next = NULL;
+       mlt_frame frame = NULL;
 
        if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_NOPARACHUTE ) < 0 )
        {
@@ -500,7 +478,7 @@ static void *consumer_thread( void *arg )
        while( this->running )
        {
                // Get a frame from the attached producer
-               mlt_frame frame = mlt_consumer_rt_frame( consumer );
+               frame = mlt_consumer_rt_frame( consumer );
 
                // Ensure that we have a frame
                if ( frame != NULL )
@@ -518,13 +496,53 @@ static void *consumer_thread( void *arg )
                                        start = ( int64_t )now.tv_sec * 1000000 + now.tv_usec;
                                else
                                        elapsed = ( ( int64_t )now.tv_sec * 1000000 + now.tv_usec) - start;
-
                        }
 
-                       consumer_play_video( this, frame, elapsed, playtime );
+                       // Set playtime for this frame
+                       mlt_properties_set_position( mlt_frame_properties( frame ), "playtime", playtime );
+
+                       // Push this frame to the back of the queue
+                       mlt_deque_push_back( this->queue, frame );
 
+                       // Calculate the next playtime
                        playtime += ( duration * 1000 );
                }
+
+               if ( this->playing )
+               {
+                       // Pop the next frame
+                       next = mlt_deque_pop_front( this->queue );
+
+                       // See if we have to delay the display of the current frame
+                       if ( next != NULL && mlt_properties_get_int( mlt_frame_properties( next ), "rendered" ) == 1 )
+                       {
+                               mlt_position scheduled = mlt_properties_get_position( mlt_frame_properties( next ), "playtime" ) + 5000;
+                               if ( scheduled > elapsed && mlt_deque_count( this->queue ) > 25 )
+                               {
+                                       tm.tv_sec = ( scheduled - elapsed ) / 1000000;
+                                       tm.tv_nsec = ( ( scheduled - elapsed ) % 1000000 ) * 1000;
+                                       nanosleep( &tm, NULL );
+
+                                       // Show current frame
+                                       consumer_play_video( this, next );
+                               }
+                               else if ( scheduled > elapsed )
+                               {
+                                       // More time to kill
+                                       mlt_deque_push_front( this->queue, next );
+                               }
+                               else
+                               {
+                                       // Show current frame
+                                       consumer_play_video( this, next );
+                               }
+                       }
+                       else
+                       {
+                               // This is an unrendered frame - just close it
+                               mlt_frame_close( next );
+                       }
+               }
        }
 
        // internal cleanup