X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_producer.c;h=c07b2b2f8c30c51b026cc738f057719cbd3f7757;hb=80761e7906f1694821044eefb3164b7f07c776e2;hp=430aab302ffb8bb05ffcf9690fa86d5323bdd346;hpb=5b59ce704d4f317e845afa30c5ade12c0fd22d43;p=melted diff --git a/src/framework/mlt_producer.c b/src/framework/mlt_producer.c index 430aab3..c07b2b2 100644 --- a/src/framework/mlt_producer.c +++ b/src/framework/mlt_producer.c @@ -58,6 +58,13 @@ int mlt_producer_init( mlt_producer this, void *child ) // 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 ); @@ -105,7 +112,7 @@ mlt_producer mlt_producer_new( ) mlt_service mlt_producer_service( mlt_producer this ) { - return &this->parent; + return this != NULL ? &this->parent : NULL; } /** Get the producer properties. @@ -123,18 +130,19 @@ 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 ( !strcmp( eof, "loop" ) && position >= mlt_producer_get_playtime( this ) ) + else if ( use_points && !strcmp( eof, "loop" ) && position >= mlt_producer_get_playtime( this ) ) { position = position % mlt_producer_get_playtime( this ); } @@ -143,7 +151,7 @@ int mlt_producer_seek( mlt_producer this, mlt_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; } @@ -288,8 +296,18 @@ static int producer_get_frame( mlt_service service, mlt_frame_ptr frame, int ind } else { + mlt_properties properties = mlt_producer_properties( this ); + mlt_filter *filters = mlt_properties_get_data( properties, "_filters", NULL ); + int count = mlt_properties_get_int( properties, "_filter_count" ); + int i; + // Get the frame from the implementation result = this->get_frame( this, frame, index ); + + // Process the frame with the attached filters + for ( i = 0; i < count; i ++ ) + if ( filters[ i ] != NULL ) + mlt_filter_process( filters[ i ], *frame ); } // Copy the fps and speed of the producer onto the frame @@ -297,17 +315,121 @@ static int producer_get_frame( mlt_service service, mlt_frame_ptr frame, int ind 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_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 ) +{ + int error = this == NULL || filter == NULL; + if ( error == 0 ) + { + int i = 0; + int size = 0; + mlt_properties properties = mlt_producer_properties( this ); + mlt_filter *filters = mlt_properties_get_data( properties, "_filters", &size ); + int count = mlt_properties_get_int( properties, "_filter_count" ); + + for ( i = 0; error == 0 && i < count; i ++ ) + if ( filters[ i ] == filter ) + error = 1; + + if ( error == 0 ) + { + if ( count == size ) + { + size += 10; + filters = realloc( filters, size * sizeof( mlt_filter ) ); + mlt_properties_set_data( properties, "_filters", filters, size, NULL, NULL ); + } + + if ( filters != NULL ) + { + mlt_properties_inc_ref( mlt_filter_properties( filter ) ); + filters[ count ++ ] = filter; + mlt_properties_set_int( properties, "_filter_count", count ); + } + else + { + error = 2; + } + } + } + return error; +} + +/** Detach a filter. +*/ + +int mlt_producer_detach( mlt_producer this, mlt_filter filter ) +{ + int error = this == NULL || filter == NULL; + if ( error == 0 ) + { + int i = 0; + int size = 0; + mlt_properties properties = mlt_producer_properties( this ); + mlt_filter *filters = mlt_properties_get_data( properties, "_filters", &size ); + int count = mlt_properties_get_int( properties, "_filter_count" ); + + for ( i = 0; i < count; i ++ ) + if ( filters[ i ] == filter ) + break; + + if ( i < count ) + { + mlt_filter filter = filters[ i ]; + filters[ i ] = NULL; + for ( i ++ ; i < count; i ++ ) + filters[ i - 1 ] = filters[ i ]; + mlt_properties_set_int( properties, "_filter_count", -- count ); + mlt_filter_close( filter ); + } + } + return error; +} + +/** Retrieve a filter. +*/ + +mlt_filter mlt_producer_filter( mlt_producer this, int index ) +{ + mlt_filter filter = NULL; + if ( this != NULL ) + { + mlt_properties properties = mlt_producer_properties( this ); + mlt_filter *filters = mlt_properties_get_data( properties, "_filters", NULL ); + int count = mlt_properties_get_int( properties, "_filter_count" ); + if ( index >= 0 && index < count ) + filter = filters[ index ]; + } + return filter; +} + /** 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 ) + { + mlt_properties properties = mlt_producer_properties( this ); + mlt_filter *filters = mlt_properties_get_data( properties, "_filters", NULL ); + int count = mlt_properties_get_int( properties, "_filter_count" ); + + while( count -- ) + mlt_producer_detach( this, filters[ 0 ] ); + + this->parent.close = NULL; + + if ( this->close != NULL ) + this->close( this->close_object ); + else + mlt_service_close( &this->parent ); + } }