producer_framebuffer.c: interpret negative speed as reverse

[melted] / src / modules / kdenlive / producer_framebuffer.c

diff --git a/src/modules/kdenlive/producer_framebuffer.c b/src/modules/kdenlive/producer_framebuffer.c
index 0a24269..10dc22f 100644 (file)
--- a/src/modules/kdenlive/producer_framebuffer.c
+++ b/src/modules/kdenlive/producer_framebuffer.c
@@ -194,7 +194,7 @@ static int producer_get_frame( mlt_producer this, mlt_frame_ptr frame, int index
 
 mlt_producer producer_framebuffer_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg )
 {
-
+       if ( !arg ) return NULL;
        mlt_producer this = NULL;
        this = calloc( 1, sizeof( struct mlt_producer_s ) );
        mlt_producer_init( this, NULL );
@@ -205,8 +205,8 @@ mlt_producer producer_framebuffer_init( mlt_profile profile, mlt_service_type ty
        // Check if a speed was specified.
        /** 
 
-       * Speed must be appended to the filename with ':'. To play your video at 50%:
-        inigo framebuffer:my_video.mpg:0.5
+       * Speed must be appended to the filename with '?'. To play your video at 50%:
+        inigo framebuffer:my_video.mpg?0.5
 
        * Stroboscope effect can be obtained by adding a stobe=x parameter, where
         x is the number of frames that will be ignored.
@@ -218,25 +218,23 @@ mlt_producer producer_framebuffer_init( mlt_profile profile, mlt_service_type ty
 
        **/
 
-       double speed;
-
-       int count;
+       double speed = 0.0;
        char *props = strdup( arg );
-       char *ptr = props;
-       count = strcspn( ptr, ":" );
-       ptr[count] = '\0';
-
+       char *ptr = strrchr( props, '?' );
+       
+       if ( ptr )
+       {
+               speed = atof( ptr + 1 );
+               if ( speed != 0.0 )
+                       // If speed was valid, then strip it and the delimiter.
+                       // Otherwise, an invalid speed probably means this '?' was not a delimiter.
+                       *ptr = '\0';
+       }
+               
        real_producer = mlt_factory_producer( profile, "fezzik", props );
-
-       ptr += count + 1;
-       ptr += strspn( ptr, ":" );
-       count = strcspn( ptr, ":" );
-       ptr[count] = '\0';
-       speed = atof(ptr);
        free( props );
-       
-       if (speed == 0.0) speed = 1.0;
 
+       if (speed == 0.0) speed = 1.0;
 
        if ( this != NULL && real_producer != NULL)
        {
@@ -245,19 +243,26 @@ mlt_producer producer_framebuffer_init( mlt_profile profile, mlt_service_type ty
 
                // Fezzik normalised it for us already
                mlt_properties_set_int( properties, "fezzik_normalised", 1);
+               mlt_properties_set( properties, "resource", arg);
 
                // Store the producer and fitler
                mlt_properties_set_data( properties, "producer", real_producer, 0, ( mlt_destructor )mlt_producer_close, NULL );
 
                // Grab some stuff from the real_producer
-               mlt_properties_pass_list( properties, MLT_PRODUCER_PROPERTIES( real_producer ), "length,resource,width,height" );
+               mlt_properties_pass_list( properties, MLT_PRODUCER_PROPERTIES( real_producer ), "length, width,height" );
 
+               if ( speed < 0 )
+               {
+                       speed = -speed;
+                       mlt_properties_set_int( properties, "reverse", 1 );
+               }
 
                if ( speed != 1.0 )
                {
-                       double real_length = (double)  mlt_producer_get_length( real_producer );
-                       mlt_properties_set_position( properties, "length", real_length / speed );
+                       double real_length = ( (double)  mlt_producer_get_length( real_producer ) ) / speed;
+                       mlt_properties_set_position( properties, "length", real_length );
                }
+               mlt_properties_set_position( properties, "out", mlt_producer_get_length( this ) - 1 );
 
                // Since we control the seeking, prevent it from seeking on its own
                mlt_producer_set_speed( real_producer, 0 );