X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_producer.c;h=79038fb9015ad9e2dd721ffa054c28b0901fe2ad;hb=091e9065c24ede24d42c2a473a9c6f1e6d837f47;hp=21f527746692595142b6e5757227511b021da17d;hpb=ebe424a8561adf11509de6a1ed504ce07a8abdaf;p=melted diff --git a/src/framework/mlt_producer.c b/src/framework/mlt_producer.c index 21f5277..79038fb 100644 --- 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 #include @@ -30,45 +31,103 @@ */ static int producer_get_frame( mlt_service this, mlt_frame_ptr frame, int index ); +static void mlt_producer_property_changed( mlt_service owner, mlt_producer this, char *name ); +static void mlt_producer_service_changed( mlt_service owner, mlt_producer this ); /** Constructor */ 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 ); - 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", "" ); - - // 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 ) + { + // Get the normalisation preference + char *normalisation = mlt_environment( "MLT_NORMALISATION" ); + + // The parent is the service + mlt_service parent = &this->parent; + + // Define the parent close + parent->close = ( mlt_destructor )mlt_producer_close; + parent->close_object = this; + + // For convenience, we'll assume the close_object is this + this->close_object = this; + + // 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 ); + if ( normalisation == NULL || strcmp( normalisation, "NTSC" ) ) + { + mlt_properties_set_double( properties, "fps", 25.0 ); + mlt_properties_set_double( properties, "aspect_ratio", 72.0 / 79.0 ); + } + else + { + mlt_properties_set_double( properties, "fps", 30000.0 / 1001.0 ); + mlt_properties_set_double( properties, "aspect_ratio", 128.0 / 117.0 ); + } + mlt_properties_set_double( properties, "_speed", 1.0 ); + mlt_properties_set_position( properties, "in", 0 ); + mlt_properties_set_position( properties, "out", 14999 ); + mlt_properties_set_position( properties, "length", 15000 ); + mlt_properties_set( properties, "eof", "pause" ); + mlt_properties_set( properties, "resource", "" ); + + // Override service get_frame + parent->get_frame = producer_get_frame; + + mlt_events_listen( properties, this, "service-changed", ( mlt_listener )mlt_producer_service_changed ); + mlt_events_listen( properties, this, "property-changed", ( mlt_listener )mlt_producer_property_changed ); + mlt_events_register( properties, "producer-changed", NULL ); + } } - return 0; + return error; +} + +/** Listener for property changes. +*/ + +static void mlt_producer_property_changed( mlt_service owner, mlt_producer this, char *name ) +{ + if ( !strcmp( name, "in" ) || !strcmp( name, "out" ) || !strcmp( name, "length" ) ) + mlt_events_fire( mlt_producer_properties( this ), "producer-changed", NULL ); +} + +/** Listener for service changes. +*/ + +static void mlt_producer_service_changed( mlt_service owner, mlt_producer this ) +{ + mlt_events_fire( mlt_producer_properties( this ), "producer-changed", NULL ); +} + +/** Create a new producer. +*/ + +mlt_producer mlt_producer_new( ) +{ + mlt_producer this = malloc( sizeof( struct mlt_producer_s ) ); + mlt_producer_init( this, NULL ); + return this; } /** Get the parent service object. @@ -76,7 +135,7 @@ int mlt_producer_init( mlt_producer this, void *child ) mlt_service mlt_producer_service( mlt_producer this ) { - return &this->parent; + return this != NULL ? &this->parent : NULL; } /** Get the producer properties. @@ -94,18 +153,28 @@ int mlt_producer_seek( mlt_producer this, mlt_position position ) { // Determine eof handling char *eof = mlt_properties_get( mlt_producer_properties( this ), "eof" ); + int use_points = 1 - mlt_properties_get_int( mlt_producer_properties( this ), "ignore_points" ); // Check bounds if ( position < 0 ) + { position = 0; - else if ( !strcmp( eof, "pause" ) && position >= mlt_producer_get_playtime( this ) ) + } + else if ( use_points && !strcmp( eof, "pause" ) && position >= mlt_producer_get_playtime( this ) ) + { + mlt_producer_set_speed( this, 0 ); position = mlt_producer_get_playtime( this ) - 1; + } + else if ( use_points && !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", use_points * mlt_producer_get_in( this ) + position ); return 0; } @@ -115,7 +184,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). @@ -123,7 +192,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. @@ -131,7 +200,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. @@ -139,7 +208,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. @@ -155,6 +224,8 @@ double mlt_producer_get_fps( mlt_producer this ) int mlt_producer_set_in_and_out( mlt_producer this, mlt_position in, mlt_position out ) { + mlt_properties properties = mlt_producer_properties( this ); + // Correct ins and outs if necessary if ( in < 0 ) in = 0; @@ -175,8 +246,11 @@ int mlt_producer_set_in_and_out( mlt_producer this, mlt_position in, mlt_positio } // Set the values - mlt_properties_set_position( mlt_producer_properties( this ), "in", in ); - mlt_properties_set_position( mlt_producer_properties( this ), "out", out ); + mlt_events_block( properties, properties ); + mlt_properties_set_position( properties, "in", in ); + mlt_properties_set_position( properties, "out", out ); + mlt_events_unblock( properties, properties ); + mlt_events_fire( properties, "producer-changed", NULL ); return 0; } @@ -241,6 +315,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 ); } @@ -254,18 +332,49 @@ 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 ); + mlt_properties_set_int( properties, "test_audio", mlt_frame_is_test_audio( *frame ) ); + mlt_properties_set_int( properties, "test_image", mlt_frame_is_test_card( *frame ) ); return 0; } +/** Attach a filter. +*/ + +int mlt_producer_attach( mlt_producer this, mlt_filter filter ) +{ + return mlt_service_attach( mlt_producer_service( this ), filter ); +} + +/** Detach a filter. +*/ + +int mlt_producer_detach( mlt_producer this, mlt_filter filter ) +{ + return mlt_service_detach( mlt_producer_service( this ), filter ); +} + +/** Retrieve a filter. +*/ + +mlt_filter mlt_producer_filter( mlt_producer this, int index ) +{ + return mlt_service_filter( mlt_producer_service( this ), index ); +} + /** Close the producer. */ void mlt_producer_close( mlt_producer this ) { - if ( this->close != NULL ) - this->close( this ); - else - mlt_service_close( &this->parent ); + if ( this != NULL && mlt_properties_dec_ref( mlt_producer_properties( this ) ) <= 0 ) + { + this->parent.close = NULL; + + if ( this->close != NULL ) + this->close( this->close_object ); + else + mlt_service_close( &this->parent ); + } }