sdl hacks

[melted] / src / framework / mlt_producer.c

diff --git a/src/framework/mlt_producer.c b/src/framework/mlt_producer.c
index 2a5b60e..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;
        
@@ -59,13 +63,16 @@ int mlt_producer_init( mlt_producer this, void *child )
        
                        // Set the default properties
                        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 );
-                       mlt_properties_set_double( properties, "speed", 1.0 );
+                       mlt_properties_set_position( properties, "_position", 0.0 );
+                       mlt_properties_set_double( properties, "_frame", 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,15 +111,24 @@ 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 );
+       mlt_properties_set_position( mlt_producer_properties( this ), "_position", position );
 
        // Calculate the absolute frame
-       mlt_properties_set_position( mlt_producer_properties( this ), "frame", mlt_producer_get_in( this ) + position );
+       mlt_properties_set_position( mlt_producer_properties( this ), "_frame", mlt_producer_get_in( this ) + position );
 
        return 0;
 }
@@ -122,7 +138,7 @@ int mlt_producer_seek( mlt_producer this, mlt_position position )
 
 mlt_position mlt_producer_position( mlt_producer this )
 {
-       return mlt_properties_get_position( mlt_producer_properties( this ), "position" );
+       return mlt_properties_get_position( mlt_producer_properties( this ), "_position" );
 }
 
 /** Get the current position (relative to start of producer).
@@ -130,7 +146,7 @@ mlt_position mlt_producer_position( mlt_producer this )
 
 mlt_position mlt_producer_frame( mlt_producer this )
 {
-       return mlt_properties_get_position( mlt_producer_properties( this ), "frame" );
+       return mlt_properties_get_position( mlt_producer_properties( this ), "_frame" );
 }
 
 /** Set the playing speed.
@@ -138,7 +154,7 @@ mlt_position mlt_producer_frame( mlt_producer this )
 
 int mlt_producer_set_speed( mlt_producer this, double speed )
 {
-       return mlt_properties_set_double( mlt_producer_properties( this ), "speed", speed );
+       return mlt_properties_set_double( mlt_producer_properties( this ), "_speed", speed );
 }
 
 /** Get the playing speed.
@@ -146,7 +162,7 @@ int mlt_producer_set_speed( mlt_producer this, double speed )
 
 double mlt_producer_get_speed( mlt_producer this )
 {
-       return mlt_properties_get_double( mlt_producer_properties( this ), "speed" );
+       return mlt_properties_get_double( mlt_producer_properties( this ), "_speed" );
 }
 
 /** Get the frames per second.
@@ -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 );
        }
@@ -261,7 +281,7 @@ static int producer_get_frame( mlt_service service, mlt_frame_ptr frame, int ind
        mlt_properties properties = mlt_frame_properties( *frame );
        mlt_properties_set_double( properties, "fps", mlt_producer_get_fps( this ) );
        double speed = mlt_producer_get_speed( this );
-       mlt_properties_set_double( properties, "speed", speed );
+       mlt_properties_set_double( properties, "_speed", speed );
 
        return 0;
 }