sdl hacks

[melted] / src / framework / mlt_producer.c

diff --git a/src/framework/mlt_producer.c b/src/framework/mlt_producer.c
index 1921783..e74724b 100644 (file)
--- a/src/framework/mlt_producer.c
+++ b/src/framework/mlt_producer.c
@@ -20,6 +20,7 @@
 
 #include "config.h"
 #include "mlt_producer.h"
+#include "mlt_factory.h"
 #include "mlt_frame.h"
 #include <stdio.h>
 #include <string.h>
@@ -51,6 +52,9 @@ int mlt_producer_init( mlt_producer this, void *child )
                // Initialise the service
                if ( mlt_service_init( &this->parent, this ) == 0 )
                {
+                       // Get the normalisation preference
+                       char *normalisation = mlt_environment( "MLT_NORMALISATION" );
+
                        // The parent is the service
                        mlt_service parent = &this->parent;
        
@@ -61,11 +65,14 @@ int mlt_producer_init( mlt_producer this, void *child )
                        mlt_properties_set( properties, "mlt_type", "mlt_producer" );
                        mlt_properties_set_position( properties, "_position", 0.0 );
                        mlt_properties_set_double( properties, "_frame", 0 );
-                       mlt_properties_set_double( properties, "fps", 25.0 );
+                       if ( normalisation == NULL || strcmp( normalisation, "NTSC" ) )
+                               mlt_properties_set_double( properties, "fps", 25.0 );
+                       else
+                               mlt_properties_set_double( properties, "fps", 30000.0 / 1001.0 );
                        mlt_properties_set_double( properties, "_speed", 1.0 );
                        mlt_properties_set_position( properties, "in", 0 );
-                       mlt_properties_set_position( properties, "out", 1799999 );
-                       mlt_properties_set_position( properties, "length", 1800000 );
+                       mlt_properties_set_position( properties, "out", 14999 );
+                       mlt_properties_set_position( properties, "length", 15000 );
                        mlt_properties_set_double( properties, "aspect_ratio", 4.0 / 3.0 );
                        mlt_properties_set( properties, "eof", "pause" );
                        mlt_properties_set( properties, "resource", "<producer>" );
@@ -104,9 +111,18 @@ int mlt_producer_seek( mlt_producer this, mlt_position position )
 
        // Check bounds
        if ( position < 0 )
+       {
                position = 0;
+       }
        else if ( !strcmp( eof, "pause" ) && position >= mlt_producer_get_playtime( this ) )
+       {
+               mlt_producer_set_speed( this, 0 );
                position = mlt_producer_get_playtime( this ) - 1;
+       }
+       else if ( !strcmp( eof, "loop" ) && position >= mlt_producer_get_playtime( this ) )
+       {
+               position = position % mlt_producer_get_playtime( this );
+       }
 
        // Set the position
        mlt_properties_set_position( mlt_producer_properties( this ), "_position", position );
@@ -248,6 +264,10 @@ static int producer_get_frame( mlt_service service, mlt_frame_ptr frame, int ind
                // Set the position
                result = mlt_frame_set_position( *frame, mlt_producer_position( this ) );
 
+               // Mark as a test card
+               mlt_properties_set_int( mlt_frame_properties( *frame ), "test_image", 1 );
+               mlt_properties_set_int( mlt_frame_properties( *frame ), "test_audio", 1 );
+
                // Calculate the next position
                mlt_producer_prepare_next( this );
        }