producer_ppm.o \
filter_deinterlace.o \
filter_greyscale.o \
+ filter_gamma.o \
filter_resize.o \
transition_composite.o
cat << EOF >> ../filters.dat
deinterlace libmltcore.so
+gamma libmltcore.so
greyscale libmltcore.so
resize libmltcore.so
EOF
#include "filter_deinterlace.h"
#include "filter_greyscale.h"
#include "filter_resize.h"
+#include "filter_gamma.h"
#include "producer_ppm.h"
#include "transition_composite.h"
{
if ( !strcmp( id, "deinterlace" ) )
return filter_deinterlace_init( arg );
+ if ( !strcmp( id, "gamma" ) )
+ return filter_gamma_init( arg );
if ( !strcmp( id, "greyscale" ) )
return filter_greyscale_init( arg );
if ( !strcmp( id, "resize" ) )
--- /dev/null
+/*
+ * filter_gamma.c -- gamma filter
+ * 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 program 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.
+ *
+ * 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.
+ */
+
+#include "filter_gamma.h"
+
+#include <framework/mlt_frame.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+
+/** 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;
+
+ // 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;
+
+ 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;
+}
+
+/** Filter processing.
+*/
+
+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;
+ mlt_frame_push_get_image( frame, filter_get_image );
+ mlt_properties_set_double( mlt_frame_properties( frame ), "gamma", gamma );
+ return frame;
+}
+
+/** Constructor for the filter.
+*/
+
+mlt_filter filter_gamma_init( char *arg )
+{
+ mlt_filter this = calloc( sizeof( struct mlt_filter_s ), 1 );
+ 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 ) );
+ }
+ return this;
+}
+
--- /dev/null
+/*
+ * filter_gamma.h -- gamma filter
+ * 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 program 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.
+ *
+ * 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.
+ */
+
+#ifndef _FILTER_GAMMA_H_
+#define _FILTER_GAMMA_H_
+
+#include <framework/mlt_filter.h>
+
+extern mlt_filter filter_gamma_init( char *arg );
+
+#endif
#include <framework/mlt_filter.h>
-extern mlt_filter filter_deinterlace_init( void *arg );
+extern mlt_filter filter_resize_init( void *arg );
#endif
FD_ZERO( &rfds );
FD_SET( 0, &rfds );
- tv.tv_sec = 1;
- tv.tv_usec = 0;
+ tv.tv_sec = 0;
+ tv.tv_usec = 250;
n = select( 1, &rfds, NULL, NULL, &tv );
if (n > 0)
{
producer_ppm.o \
filter_deinterlace.o \
filter_greyscale.o \
+ filter_gamma.o \
filter_resize.o \
transition_composite.o
cat << EOF >> ../filters.dat
deinterlace libmltcore.so
+gamma libmltcore.so
greyscale libmltcore.so
resize libmltcore.so
EOF
#include "filter_deinterlace.h"
#include "filter_greyscale.h"
#include "filter_resize.h"
+#include "filter_gamma.h"
#include "producer_ppm.h"
#include "transition_composite.h"
{
if ( !strcmp( id, "deinterlace" ) )
return filter_deinterlace_init( arg );
+ if ( !strcmp( id, "gamma" ) )
+ return filter_gamma_init( arg );
if ( !strcmp( id, "greyscale" ) )
return filter_greyscale_init( arg );
if ( !strcmp( id, "resize" ) )
--- /dev/null
+/*
+ * filter_gamma.c -- gamma filter
+ * 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 program 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.
+ *
+ * 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.
+ */
+
+#include "filter_gamma.h"
+
+#include <framework/mlt_frame.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+
+/** 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;
+
+ // 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;
+
+ 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;
+}
+
+/** Filter processing.
+*/
+
+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;
+ mlt_frame_push_get_image( frame, filter_get_image );
+ mlt_properties_set_double( mlt_frame_properties( frame ), "gamma", gamma );
+ return frame;
+}
+
+/** Constructor for the filter.
+*/
+
+mlt_filter filter_gamma_init( char *arg )
+{
+ mlt_filter this = calloc( sizeof( struct mlt_filter_s ), 1 );
+ 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 ) );
+ }
+ return this;
+}
+
--- /dev/null
+/*
+ * filter_gamma.h -- gamma filter
+ * 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 program 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.
+ *
+ * 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.
+ */
+
+#ifndef _FILTER_GAMMA_H_
+#define _FILTER_GAMMA_H_
+
+#include <framework/mlt_filter.h>
+
+extern mlt_filter filter_gamma_init( char *arg );
+
+#endif
#include <framework/mlt_filter.h>
-extern mlt_filter filter_deinterlace_init( void *arg );
+extern mlt_filter filter_resize_init( void *arg );
#endif
FD_ZERO( &rfds );
FD_SET( 0, &rfds );
- tv.tv_sec = 1;
- tv.tv_usec = 0;
+ tv.tv_sec = 0;
+ tv.tv_usec = 250;
n = select( 1, &rfds, NULL, NULL, &tv );
if (n > 0)
{
projects / mlt / commitdiff