X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ffilter_greyscale.c;h=fd618c09aa02140c0e42dfbebde81b196f4fc466;hb=4112170ce8053261b9c67f58df87c2a3573b6602;hp=170ff4f543c82530d9fc85f0f6357839e1eb7ce0;hpb=15934f863eff9ee542f8b65fb7335ad944508f2f;p=melted

diff --git a/src/modules/core/filter_greyscale.c b/src/modules/core/filter_greyscale.c
index 170ff4f..fd618c0 100644
--- a/src/modules/core/filter_greyscale.c
+++ b/src/modules/core/filter_greyscale.c
@@ -3,48 +3,41 @@
  * 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_greyscale.h"
-
+#include <framework/mlt_filter.h>
 #include <framework/mlt_frame.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 
-/** Greyscale class.
-*/
-
-typedef struct 
-{
-	struct mlt_filter_s parent;
-}
-filter_greyscale;
-
 /** Do it :-).
 */
 
 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;
-	while ( p ++ != q )
-		*p ++ = 128;
-	return 0;
+	int error = mlt_frame_get_image( this, image, format, width, height, 1 );
+	if ( error == 0 && *format == mlt_image_yuv422 )
+	{
+		uint8_t *p = *image;
+		uint8_t *q = *image + *width * *height * 2;
+		while ( p ++ != q )
+			*p ++ = 128;
+	}
+	return error;
 }
 
 /** Filter processing.
@@ -59,15 +52,11 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 /** Constructor for the filter.
 */
 
-mlt_filter filter_greyscale_init( void *arg )
+mlt_filter filter_greyscale_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg )
 {
-	filter_greyscale *this = calloc( sizeof( filter_greyscale ), 1 );
+	mlt_filter this = mlt_filter_new( );
 	if ( this != NULL )
-	{
-		mlt_filter filter = &this->parent;
-		mlt_filter_init( filter, this );
-		filter->process = filter_process;
-	}
-	return ( mlt_filter )this;
+		this->process = filter_process;
+	return this;
 }