Tcolor pros to anim framework and cleanup

src/modules/oldfilm/filter_tcolor.c

@@ -27,60 +27,57 @@
 #define MIN(a,b) (a<b?a:b)
 #define MAX(a,b) (a<b?b:a)
 
-static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
+static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
 {
+	mlt_filter filter = (mlt_filter) mlt_frame_pop_service( frame );
+	mlt_properties properties = MLT_FILTER_PROPERTIES( filter );
+	mlt_position pos = mlt_filter_get_position( filter, frame );
+	mlt_position len = mlt_filter_get_length2( filter, frame );
 
-	mlt_filter filter = mlt_frame_pop_service( this );
 	*format = mlt_image_yuv422;
-	int error = mlt_frame_get_image( this, image, format, width, height, 1 );
+	int error = mlt_frame_get_image( frame, image, format, width, height, 1 );
 
 	if ( error == 0 && *image )
 	{
+		double over_cr = mlt_properties_anim_get_double( properties, "oversaturate_cr", pos, len )/100.0;
+		double over_cb = mlt_properties_anim_get_double( properties, "oversaturate_cb", pos, len )/100.0;
 
-		double over_cr = mlt_properties_get_double( MLT_FILTER_PROPERTIES( filter ), "oversaturate_cr" )/100.0;
-		double over_cb = mlt_properties_get_double( MLT_FILTER_PROPERTIES( filter ), "oversaturate_cb" )/100.0;
-
 		int video_width = *width;
 		int video_height = *height;
 
 		int x,y;
 
-		for (y=0;y<video_height;y++){
-			for (x=0;x<video_width;x+=2){
-				uint8_t *pix=(*image+y*video_width*2+x*2+1);
-				uint8_t *pix1=(*image+y*video_width*2+x*2+3);
-				*pix=MIN(MAX( ((double)*pix-127.0)*over_cb+127.0,0),255);
-				*pix1=MIN(MAX( ((double)*pix1-127.0)*over_cr+127.0,0),255);
+		for ( y = 0; y < video_height; y++)
+		{
+			for ( x = 0; x < video_width; x += 2)
+			{
+				uint8_t *pix = (*image + y * video_width * 2 + x * 2 + 1);
+				uint8_t *pix1 = (*image + y * video_width * 2 + x * 2 + 3);
+				*pix = MIN(MAX( ((double) * pix - 127.0) * over_cb + 127.0,0), 255);
+				*pix1 = MIN(MAX( ((double) * pix1 - 127.0) * over_cr + 127.0,0), 255);
 			}
 		}
-		// short a, short b, short c, short d
-		// a= gray val pix 1
-		// b: +=blue, -=yellow
-		// c: =gray pix 2
-		// d: +=red,-=green
 	}
 
 	return error;
 }
 
-static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
+static mlt_frame filter_process( mlt_filter filter, mlt_frame frame )
 {
-	mlt_frame_push_service( frame, this );
+	mlt_frame_push_service( frame, filter );
 	mlt_frame_push_get_image( frame, filter_get_image );
 	return frame;
 }
 
-
 mlt_filter filter_tcolor_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg )
 {
-	mlt_filter this = mlt_filter_new( );
-	if ( this != NULL )
+	mlt_filter filter = mlt_filter_new( );
+	if ( filter != NULL )
 	{
-		this->process = filter_process;
-		mlt_properties_set( MLT_FILTER_PROPERTIES( this ), "oversaturate_cr", "190" );
-		mlt_properties_set( MLT_FILTER_PROPERTIES( this ), "oversaturate_cb", "190" );
+		filter->process = filter_process;
+		mlt_properties_set( MLT_FILTER_PROPERTIES( filter ), "oversaturate_cr", "190" );
+		mlt_properties_set( MLT_FILTER_PROPERTIES( filter ), "oversaturate_cb", "190" );
 	}
-	return this;
+	return filter;
 }
 
-