Added avformat

[melted] / src / framework / mlt_producer.c

diff --git a/src/framework/mlt_producer.c b/src/framework/mlt_producer.c
index c874243..2a5b60e 100644 (file)
--- a/src/framework/mlt_producer.c
+++ b/src/framework/mlt_producer.c
@@ -36,38 +36,46 @@ static int producer_get_frame( mlt_service this, mlt_frame_ptr frame, int index
 
 int mlt_producer_init( mlt_producer this, void *child )
 {
-       // Initialise the producer
-       memset( this, 0, sizeof( struct mlt_producer_s ) );
-       
-       // Associate with the child
-       this->child = child;
+       // Check that we haven't received NULL
+       int error = this == NULL;
 
-       // Initialise the service
-       if ( mlt_service_init( &this->parent, this ) == 0 )
+       // Continue if no error
+       if ( error == 0 )
        {
-               // The parent is the service
-               mlt_service parent = &this->parent;
-
-               // Get the properties of the parent
-               mlt_properties properties = mlt_service_properties( parent );
-
-               // 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, "in", 0.0 );
-               mlt_properties_set_position( properties, "out", 179999 );
-               mlt_properties_set_position( properties, "length", 180000 );
-               mlt_properties_set_double( properties, "aspect_ratio", 4.0 / 3.0 );
-               mlt_properties_set( properties, "log_id", "multitrack" );
-
-               // Override service get_frame
-               parent->get_frame = producer_get_frame;
+               // Initialise the producer
+               memset( this, 0, sizeof( struct mlt_producer_s ) );
+       
+               // Associate with the child
+               this->child = child;
+
+               // Initialise the service
+               if ( mlt_service_init( &this->parent, this ) == 0 )
+               {
+                       // The parent is the service
+                       mlt_service parent = &this->parent;
+       
+                       // Get the properties of the parent
+                       mlt_properties properties = mlt_service_properties( parent );
+       
+                       // 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, "in", 0 );
+                       mlt_properties_set_position( properties, "out", 1799999 );
+                       mlt_properties_set_position( properties, "length", 1800000 );
+                       mlt_properties_set_double( properties, "aspect_ratio", 4.0 / 3.0 );
+                       mlt_properties_set( properties, "eof", "pause" );
+                       mlt_properties_set( properties, "resource", "<producer>" );
+
+                       // Override service get_frame
+                       parent->get_frame = producer_get_frame;
+               }
        }
 
-       return 0;
+       return error;
 }
 
 /** Get the parent service object.
@@ -86,41 +94,18 @@ mlt_properties mlt_producer_properties( mlt_producer this )
        return mlt_service_properties( &this->parent );
 }
 
-/** Convert frame position to position.
-*/
-
-/*
-mlt_position mlt_producer_time( mlt_producer this, int64_t frame )
-{
-       if ( frame < 0 )
-               return -1;
-       else
-               return ( mlt_position )frame / mlt_producer_get_fps( this );
-}
-*/
-
-/** Convert position to frame position.
-*/
-
-/*
-int64_t mlt_producer_frame_position( mlt_producer this, mlt_position position )
-{
-       if ( position < 0 )
-               return -1;
-       else
-               return ( int64_t )( floor( position * mlt_producer_get_fps( this ) + 0.5 ) );
-}
-*/
-
 /** Seek to a specified position.
 */
 
 int mlt_producer_seek( mlt_producer this, mlt_position position )
 {
+       // Determine eof handling
+       char *eof = mlt_properties_get( mlt_producer_properties( this ), "eof" );
+
        // Check bounds
        if ( position < 0 )
                position = 0;
-       else if ( position > mlt_producer_get_playtime( this ) )
+       else if ( !strcmp( eof, "pause" ) && position >= mlt_producer_get_playtime( this ) )
                position = mlt_producer_get_playtime( this ) - 1;
 
        // Set the position
@@ -145,7 +130,7 @@ mlt_position mlt_producer_position( mlt_producer this )
 
 mlt_position mlt_producer_frame( mlt_producer this )
 {
-       return mlt_properties_get_double( mlt_producer_properties( this ), "frame" );
+       return mlt_properties_get_position( mlt_producer_properties( this ), "frame" );
 }
 
 /** Set the playing speed.
@@ -240,7 +225,7 @@ mlt_position mlt_producer_get_length( mlt_producer this )
 
 void mlt_producer_prepare_next( mlt_producer this )
 {
-       mlt_producer_seek( this, mlt_producer_frame( this ) + mlt_producer_get_speed( this ) );
+       mlt_producer_seek( this, mlt_producer_position( this ) + mlt_producer_get_speed( this ) );
 }
 
 /** Get a frame.
@@ -251,13 +236,11 @@ static int producer_get_frame( mlt_service service, mlt_frame_ptr frame, int ind
        int result = 1;
        mlt_producer this = service->child;
 
+       // Determine eof handling
+       char *eof = mlt_properties_get( mlt_producer_properties( this ), "eof" );
+
        // A properly instatiated producer will have a get_frame method...
-       if ( this->get_frame != NULL )
-       {
-               // Get the frame from the implementation
-               result = this->get_frame( this, frame, index );
-       }
-       else
+       if ( this->get_frame == NULL || ( !strcmp( eof, "continue" ) && mlt_producer_position( this ) > mlt_producer_get_out( this ) ) )
        {
                // Generate a test frame
                *frame = mlt_frame_init( );
@@ -268,6 +251,11 @@ static int producer_get_frame( mlt_service service, mlt_frame_ptr frame, int ind
                // Calculate the next position
                mlt_producer_prepare_next( this );
        }
+       else
+       {
+               // Get the frame from the implementation
+               result = this->get_frame( this, frame, index );
+       }
 
        // Copy the fps and speed of the producer onto the frame
        mlt_properties properties = mlt_frame_properties( *frame );