transition region

[melted] / src / framework / mlt_consumer.c

diff --git a/src/framework/mlt_consumer.c b/src/framework/mlt_consumer.c
index 6c751aa..51298bd 100644 (file)
--- a/src/framework/mlt_consumer.c
+++ b/src/framework/mlt_consumer.c
@@ -20,6 +20,9 @@
 
 #include "config.h"
 #include "mlt_consumer.h"
+#include "mlt_factory.h"
+#include "mlt_producer.h"
+#include "mlt_frame.h"
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -29,9 +32,41 @@
 
 int mlt_consumer_init( mlt_consumer this, void *child )
 {
+       int error = 0;
        memset( this, 0, sizeof( struct mlt_consumer_s ) );
        this->child = child;
-       return mlt_service_init( &this->parent, this );
+       error = mlt_service_init( &this->parent, this );
+       if ( error == 0 )
+       {
+               // Get the properties from the service
+               mlt_properties properties = mlt_service_properties( &this->parent );
+
+               // Get the normalisation preference
+               char *normalisation = mlt_environment( "MLT_NORMALISATION" );
+
+               // Deal with normalisation
+               if ( normalisation == NULL || strcmp( normalisation, "NTSC" ) )
+               {
+                       mlt_properties_set( properties, "normalisation", "PAL" );
+                       mlt_properties_set_double( properties, "fps", 25.0 );
+                       mlt_properties_set_int( properties, "width", 720 );
+                       mlt_properties_set_int( properties, "height", 576 );
+                       mlt_properties_set_int( properties, "progressive", 0 );
+               }
+               else
+               {
+                       mlt_properties_set( properties, "normalisation", "NTSC" );
+                       mlt_properties_set_double( properties, "fps", 30000.0 / 1001.0 );
+                       mlt_properties_set_int( properties, "width", 720 );
+                       mlt_properties_set_int( properties, "height", 480 );
+                       mlt_properties_set_int( properties, "progressive", 0 );
+               }
+               mlt_properties_set_double( properties, "aspect_ratio", 4.0 / 3.0 );
+
+               // Default rescaler for all consumers
+               mlt_properties_set( properties, "rescale", "bilinear" );
+       }
+       return error;
 }
 
 /** Get the parent service object.
@@ -63,18 +98,108 @@ int mlt_consumer_connect( mlt_consumer this, mlt_service producer )
 
 int mlt_consumer_start( mlt_consumer this )
 {
+       // Get the properies
+       mlt_properties properties = mlt_consumer_properties( this );
+
+       // Determine if there's a test card producer
+       char *test_card = mlt_properties_get( properties, "test_card" );
+
+       // Deal with it now.
+       if ( test_card != NULL )
+       {
+               if ( mlt_properties_get_data( properties, "test_card_producer", NULL ) == NULL )
+               {
+                       // Create a test card producer
+                       // TODO: do we want to use fezzik here?
+                       mlt_producer producer = mlt_factory_producer( "fezzik", test_card );
+
+                       // Do we have a producer
+                       if ( producer != NULL )
+                       {
+                               // Test card should loop I guess...
+                               mlt_properties_set( mlt_producer_properties( producer ), "eof", "loop" );
+
+                               // Set the test card on the consumer
+                               mlt_properties_set_data( properties, "test_card_producer", producer, 0, ( mlt_destructor )mlt_producer_close, NULL );
+                       }
+
+                       // Check and run an ante command
+                       if ( mlt_properties_get( properties, "ante" ) )
+                               system( mlt_properties_get( properties, "ante" ) );
+               }
+       }
+       else
+       {
+               // Allow the hash table to speed things up
+               mlt_properties_set_data( properties, "test_card_producer", NULL, 0, NULL, NULL );
+       }
+
+       // Start the service
        if ( this->start != NULL )
                return this->start( this );
+
        return 0;
 }
 
+/** Protected method :-/ for consumer to get frames from connected service
+*/
+
+mlt_frame mlt_consumer_get_frame( mlt_consumer this )
+{
+       // Frame to return
+       mlt_frame frame = NULL;
+
+       // Get the service assoicated to the consumer
+       mlt_service service = mlt_consumer_service( this );
+
+       // Get the frame
+       if ( mlt_service_get_frame( service, &frame, 0 ) == 0 )
+       {
+               // Get the consumer properties
+               mlt_properties properties = mlt_consumer_properties( this );
+
+               // Get the frame properties
+               mlt_properties frame_properties = mlt_frame_properties( frame );
+
+               // Get the test card producer
+               mlt_producer test_card = mlt_properties_get_data( properties, "test_card_producer", NULL );
+
+               // Attach the test frame producer to it.
+               if ( test_card != NULL )
+                       mlt_properties_set_data( frame_properties, "test_card_producer", test_card, 0, NULL, NULL );
+
+               // Attach the rescale property
+               mlt_properties_set( frame_properties, "rescale.interp", mlt_properties_get( properties, "rescale" ) );
+
+               // Aspect ratio and other jiggery pokery
+               mlt_properties_set_double( frame_properties, "consumer_aspect_ratio", mlt_properties_get_double( properties, "aspect_ratio" ) );
+               mlt_properties_set_int( frame_properties, "consumer_progressive", mlt_properties_get_int( properties, "progressive" ) );
+               mlt_properties_set_int( frame_properties, "consumer_deinterlace", mlt_properties_get_int( properties, "deinterlace" ) );
+       }
+
+       // Return the frame
+       return frame;
+}
+
 /** Stop the consumer.
 */
 
 int mlt_consumer_stop( mlt_consumer this )
 {
+       // Get the properies
+       mlt_properties properties = mlt_consumer_properties( this );
+
+       // Stop the consumer
        if ( this->stop != NULL )
-               return this->stop( this );
+               this->stop( this );
+
+       // Kill the test card
+       mlt_properties_set_data( properties, "test_card_producer", NULL, 0, NULL, NULL );
+
+       // Check and run a post command
+       if ( mlt_properties_get( properties, "post" ) )
+               system( mlt_properties_get( properties, "post" ) );
+
        return 0;
 }
 
@@ -83,8 +208,10 @@ int mlt_consumer_stop( mlt_consumer this )
 
 int mlt_consumer_is_stopped( mlt_consumer this )
 {
+       // Check if the consumer is stopped
        if ( this->is_stopped != NULL )
                return this->is_stopped( this );
+
        return 0;
 }