[Mlt-devel] mlt/src/modules/avformat configure,1.18,1.19 producer_avformat.c,1.54,1.55

[Charles Y. <lil...@us...>]

Update of /cvsroot/mlt/mlt/src/modules/avformat
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8356/src/modules/avformat

Modified Files:
	configure producer_avformat.c 
Log Message:
src/framework/mlt_frame.c
+ Removed unecessary even pixel position and width dependency
+ Rewrote resize methods to accomodate uneven widths

src/framework/mlt_frame.h
+ Correct RGB2YUV - now 2^10 based and range checks removed (not needed)

src/framework/mlt_producer.c
+ Check for unspecified eof property

src/modules/avformat/producer_avformat.c
+ Provide forced aspect ratio property

src/modules/core/filter_mirror.c
+ Correction for uneven width

src/modules/core/producer_colour.c
+ Corrections for aspect ratio (default to 0) and allow override
+ Corrections for uneven width

src/modules/core/transition_composite.c
+ Corrections for uneven pixel position and width
+ Removed deprecated operator code

src/modules/plus/filter_sepia.c
+ Corrections for uneven width

src/modules/plus/transition_affine.c
+ Corrections for uneven width
 
src/modules/sdl/consumer_sdl.c
+ Corrections for uneven width



Index: producer_avformat.c
===================================================================
RCS file: /cvsroot/mlt/mlt/src/modules/avformat/producer_avformat.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- producer_avformat.c	21 Jul 2005 22:07:41 -0000	1.54
+++ producer_avformat.c	15 Sep 2005 20:34:47 -0000	1.55
@@ -679,18 +679,24 @@
 		{
 			double source_fps = 0;
 			int norm_aspect_ratio = mlt_properties_get_int( properties, "norm_aspect_ratio" );
+			double force_aspect_ratio = mlt_properties_get_double( properties, "force_aspect_ratio" );
+			double aspect_ratio;
 
 			// XXX: We won't know the real aspect ratio until an image is decoded
 			// but we do need it now (to satisfy filter_resize) - take a guess based
 			// on pal/ntsc
-			if ( !norm_aspect_ratio && codec_context->sample_aspect_ratio.num > 0 )
+			if ( force_aspect_ratio > 0.0 )
 			{
-				mlt_properties_set_double( properties, "aspect_ratio", av_q2d( codec_context->sample_aspect_ratio ) );
+				aspect_ratio = force_aspect_ratio;
+			}
+			else if ( !norm_aspect_ratio && codec_context->sample_aspect_ratio.num > 0 )
+			{
+				aspect_ratio = av_q2d( codec_context->sample_aspect_ratio );
 			}
 			else
 			{
 				int is_pal = mlt_properties_get_double( properties, "fps" ) == 25.0;
-				mlt_properties_set_double( properties, "aspect_ratio", is_pal ? 59.0/54.0 : 10.0/11.0 );
+				aspect_ratio = is_pal ? 59.0/54.0 : 10.0/11.0;
 			}
 
 			// Determine the fps
@@ -699,10 +705,12 @@
 			// We'll use fps if it's available
 			if ( source_fps > 0 && source_fps < 30 )
 				mlt_properties_set_double( properties, "source_fps", source_fps );
+			mlt_properties_set_double( properties, "aspect_ratio", aspect_ratio );
 			
 			// Set the width and height
 			mlt_properties_set_int( frame_properties, "width", codec_context->width );
 			mlt_properties_set_int( frame_properties, "height", codec_context->height );
+			mlt_properties_set_double( frame_properties, "aspect_ratio", aspect_ratio );
 
 			mlt_frame_push_get_image( frame, producer_get_image );
 			mlt_properties_set_data( frame_properties, "avformat_producer", this, 0, NULL, NULL );

Index: configure
===================================================================
RCS file: /cvsroot/mlt/mlt/src/modules/avformat/configure,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- configure	29 Aug 2005 08:24:08 -0000	1.18
+++ configure	15 Sep 2005 20:34:47 -0000	1.19
@@ -15,7 +15,7 @@
 EOF
 
 else
-        targetos=$(uname -s)
+	targetos=$(uname -s)
 	case $targetos in
 	Darwin)
 		export LIBSUF=.dylib