X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_transition.c;h=1d2d3c3a84c6c90acaf37630b6579084c5f59f58;hb=4a39b72c5ac8fd2dd6db81a95eab08adde0491b9;hp=b4024fbaa0a6f4132cdae883b571746f3835fb59;hpb=c28f352daacca421f977bca75eefd36a73189dac;p=melted

diff --git a/src/framework/mlt_transition.c b/src/framework/mlt_transition.c
index b4024fb..1d2d3c3 100644
--- a/src/framework/mlt_transition.c
+++ b/src/framework/mlt_transition.c
@@ -45,6 +45,8 @@ int mlt_transition_init( mlt_transition this, void *child )
 		mlt_properties properties = mlt_transition_properties( this );
 
 		service->get_frame = transition_get_frame;
+		service->close = ( mlt_destructor )mlt_transition_close;
+		service->close_object = this;
 
 		mlt_properties_set_position( properties, "in", 0 );
 		mlt_properties_set_position( properties, "out", 0 );
@@ -56,12 +58,23 @@ int mlt_transition_init( mlt_transition this, void *child )
 	return 1;
 }
 
+/** Create a new transition.
+*/
+
+mlt_transition mlt_transition_new( )
+{
+	mlt_transition this = calloc( 1, sizeof( struct mlt_transition_s ) );
+	if ( this != NULL )
+		mlt_transition_init( this, NULL );
+	return this;
+}
+
 /** Get the service associated to the transition.
 */
 
 mlt_service mlt_transition_service( mlt_transition this )
 {
-	return &this->parent;
+	return this != NULL ? &this->parent : NULL;
 }
 
 /** Get the properties interface.
@@ -135,7 +148,7 @@ mlt_position mlt_transition_get_out( mlt_transition this )
   	If we have no process method (unlikely), we simply return the a_frame unmolested.
 */
 
-static mlt_frame transition_process( mlt_transition this, mlt_frame a_frame, mlt_frame b_frame )
+mlt_frame mlt_transition_process( mlt_transition this, mlt_frame a_frame, mlt_frame b_frame )
 {
 	if ( this->process == NULL )
 		return a_frame;
@@ -164,12 +177,12 @@ static int transition_get_frame( mlt_service service, mlt_frame_ptr frame, int i
 
 	mlt_properties properties = mlt_transition_properties( this );
 
+	int accepts_blanks = mlt_properties_get_int( properties, "_accepts_blanks" );
 	int a_track = mlt_properties_get_int( properties, "a_track" );
 	int b_track = mlt_properties_get_int( properties, "b_track" );
 	mlt_position in = mlt_properties_get_position( properties, "in" );
 	mlt_position out = mlt_properties_get_position( properties, "out" );
 
-	// Fetch a and b frames together...
 	if ( ( index == a_track || index == b_track ) && !( this->a_held || this->b_held ) )
 	{
 		mlt_service_get_frame( this->producer, &this->a_frame, a_track );
@@ -185,8 +198,27 @@ static int transition_get_frame( mlt_service service, mlt_frame_ptr frame, int i
 		mlt_position position = mlt_frame_get_position( this->a_frame );
 		if ( position >= in && position <= out )
 		{
-			// Process the transition
-			*frame = transition_process( this, this->a_frame, this->b_frame );
+			if ( !accepts_blanks && ( this->b_frame == NULL || ( mlt_frame_is_test_card( this->b_frame ) && mlt_frame_is_test_audio( this->b_frame ) ) ) )
+			{
+				*frame = this->a_frame;
+			}
+			else if ( !accepts_blanks && ( this->a_frame == NULL || ( mlt_frame_is_test_card( this->a_frame ) && mlt_frame_is_test_audio( this->a_frame ) ) ) )
+			{
+				mlt_frame t = this->a_frame;
+				this->a_frame = this->b_frame;
+				this->b_frame = t;
+				*frame = this->a_frame;
+			}
+			else
+			{
+				int hide = 0;
+				*frame = mlt_transition_process( this, this->a_frame, this->b_frame );
+				if ( !mlt_properties_get_int( mlt_frame_properties( this->a_frame ), "test_image" ) )
+					hide = 1;
+				if ( !mlt_properties_get_int( mlt_frame_properties( this->a_frame ), "test_audio" ) )
+					hide |= 2;
+				mlt_properties_set_int( mlt_frame_properties( this->b_frame ), "hide", hide );
+			}
 			this->a_held = 0;
 		}
 		else
@@ -216,8 +248,12 @@ static int transition_get_frame( mlt_service service, mlt_frame_ptr frame, int i
 
 void mlt_transition_close( mlt_transition this )
 {
-	if ( this->close != NULL )
-		this->close( this );
-	else
-		mlt_service_close( &this->parent );
+	if ( this != NULL && mlt_properties_dec_ref( mlt_transition_properties( this ) ) <= 0 )
+	{
+		this->parent.close = NULL;
+		if ( this->close != NULL )
+			this->close( this );
+		else
+			mlt_service_close( &this->parent );
+	}
 }