From: Dan Dennedy <dan@dennedy.org>
Date: Wed, 4 May 2011 06:23:59 +0000 (-0700)
Subject: Ensure transition B frames get some consumer properties.
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=6c1530529b06c36dc74aac6c32067c71c7133105;p=mlt

Ensure transition B frames get some consumer properties.

Also, ensure both A and B frames have sane scaling and aspect ratio
values.
This addresses an issue where composite and region were not getting the
correct deinterlace method impacting performance. In addition, it
factors out some common code (best practice) from various transitions
moving it into the framework.
---

diff --git a/configure b/configure
index 515b4c75..51332ecf 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-export version=0.7.2
+export version=0.7.3
 export soversion=4
 
 show_help()
diff --git a/src/framework/mlt_transition.c b/src/framework/mlt_transition.c
index 1e70a0c9..9be9e765 100644
--- a/src/framework/mlt_transition.c
+++ b/src/framework/mlt_transition.c
@@ -309,6 +309,47 @@ mlt_frame mlt_transition_process( mlt_transition self, mlt_frame a_frame, mlt_fr
 		return self->process( self, a_frame, b_frame );
 }
 
+static int get_image_a( mlt_frame a_frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
+{
+	mlt_properties a_props = MLT_FRAME_PROPERTIES( a_frame );
+
+	// All transitions get scaling
+	const char *rescale = mlt_properties_get( a_props, "rescale.interp" );
+	if ( !rescale || !strcmp( rescale, "none" ) )
+		mlt_properties_set( a_props, "rescale.interp", "nearest" );
+
+	// Ensure sane aspect ratio
+	if ( mlt_properties_get_double( a_props, "aspect_ratio" ) == 0.0 )
+		mlt_properties_set_double( a_props, "aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) );
+
+	return mlt_frame_get_image( a_frame, image, format, width, height, writable );
+}
+
+static int get_image_b( mlt_frame b_frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
+{
+	mlt_frame a_frame = mlt_frame_pop_frame( b_frame );
+	mlt_properties a_props = MLT_FRAME_PROPERTIES( a_frame );
+	mlt_properties b_props = MLT_FRAME_PROPERTIES( b_frame );
+
+	// Set scaling from A frame if not already provided.
+	if ( !mlt_properties_get( b_props, "rescale.interp" ) )
+	{
+		const char *rescale = mlt_properties_get( a_props, "rescale.interp" );
+		if ( !rescale || !strcmp( rescale, "none" ) )
+			rescale = "nearest";
+		mlt_properties_set( b_props, "rescale.interp", rescale );
+	}
+
+	// Ensure sane aspect ratio
+	if ( mlt_properties_get_double( b_props, "aspect_ratio" ) == 0.0 )
+		mlt_properties_set_double( b_props, "aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) );
+
+	mlt_properties_pass_list( b_props, a_props,
+		"consumer_deinterlace, deinterlace_method, consumer_aspect_ratio" );
+
+	return mlt_frame_get_image( b_frame, image, format, width, height, writable );
+}
+
 /** Get a frame from a transition.
 
 	The logic is complex here. A transition is typically applied to frames on the a and
@@ -436,6 +477,11 @@ static int transition_get_frame( mlt_service service, mlt_frame_ptr frame, int i
 			int b_hide = mlt_properties_get_int( MLT_FRAME_PROPERTIES( b_frame_ptr ), "hide" );
 			if ( !( a_hide & type ) && !( b_hide & type ) )
 			{
+				// Add hooks for pre-processing frames
+				mlt_frame_push_get_image( a_frame_ptr, get_image_a );
+				mlt_frame_push_frame( b_frame_ptr, a_frame_ptr );
+				mlt_frame_push_get_image( b_frame_ptr, get_image_b );
+
 				// Process the transition
 				*frame = mlt_transition_process( self, a_frame_ptr, b_frame_ptr );