X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ffilter_gamma.c;h=710cbaa06eb6709830eec1e78ec979593dce38ec;hb=bf3264b9e340ba5c11cbf59835a8af3db94e0cc2;hp=338756161eb9b46c3522238f091bd7c893630558;hpb=885cb897cfb90465e61c39c1c266891b7e499055;p=melted

diff --git a/src/modules/core/filter_gamma.c b/src/modules/core/filter_gamma.c
index 3387561..710cbaa 100644
--- a/src/modules/core/filter_gamma.c
+++ b/src/modules/core/filter_gamma.c
@@ -3,19 +3,19 @@
  * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
  * Author: Charles Yates <charles.yates@pandora.be>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "filter_gamma.h"
@@ -31,25 +31,32 @@
 
 static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
 {
-	mlt_frame_get_image( this, image, format, width, height, 1 );
-	uint8_t *p = *image;
-	uint8_t *q = *image + *width * *height * 2;
+	int error = mlt_frame_get_image( this, image, format, width, height, 1 );
 
-	// Get the gamma value
-	double gamma = mlt_properties_get_double( mlt_frame_properties( this ), "gamma" );
+	if ( error == 0 && *format == mlt_image_yuv422 )
+	{
+		// Get the gamma value
+		double gamma = mlt_properties_get_double( MLT_FRAME_PROPERTIES( this ), "gamma" );
 
-	// Calculate the look up table
-	double exp = 1 / gamma;
-	uint8_t lookup[ 256 ];
-	int i;
+		if ( gamma != 1.0 )
+		{
+			uint8_t *p = *image;
+			uint8_t *q = *image + *width * *height * 2;
 
-	for( i = 0; i < 256; i ++ )
-		lookup[ i ] = ( uint8_t )( pow( ( double )i / 255.0, exp ) * 255 );
+			// Calculate the look up table
+			double exp = 1 / gamma;
+			uint8_t lookup[ 256 ];
+			int i;
 
-	while ( p != q )
-	{
-		*p = lookup[ *p ];
-		p += 2;
+			for( i = 0; i < 256; i ++ )
+				lookup[ i ] = ( uint8_t )( pow( ( double )i / 255.0, exp ) * 255 );
+
+			while ( p != q )
+			{
+				*p = lookup[ *p ];
+				p += 2;
+			}
+		}
 	}
 
 	return 0;
@@ -60,10 +67,10 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
 
 static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 {
-	double gamma = mlt_properties_get_double( mlt_filter_properties( this ), "gamma" );
-	gamma = gamma <= 0 ? 2 : gamma;
+	double gamma = mlt_properties_get_double( MLT_FILTER_PROPERTIES( this ), "gamma" );
+	gamma = gamma <= 0 ? 1 : gamma;
+	mlt_properties_set_double( MLT_FRAME_PROPERTIES( frame ), "gamma", gamma );
 	mlt_frame_push_get_image( frame, filter_get_image );
-	mlt_properties_set_double( mlt_frame_properties( frame ), "gamma", gamma );
 	return frame;
 }
 
@@ -72,14 +79,11 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 
 mlt_filter filter_gamma_init( char *arg )
 {
-	mlt_filter this = calloc( sizeof( struct mlt_filter_s ), 1 );
+	mlt_filter this = mlt_filter_new( );
 	if ( this != NULL )
 	{
-		mlt_filter_init( this, NULL );
 		this->process = filter_process;
-		if ( arg != NULL )
-			mlt_properties_set_double( mlt_filter_properties( this ), "gamma", atof( arg ) );
+		mlt_properties_set( MLT_FILTER_PROPERTIES( this ), "gamma", arg == NULL ? "1" : arg );
 	}
 	return this;
 }
-