Thread: [Mlt-devel] mlt/src/modules/core filter_mono.c,NONE,1.1 filter_mono.h,NONE,1.1 Makefile,1.31,1.32 co
Brought to you by:
ddennedy,
lilo_booter
From: Dan D. <dde...@us...> - 2006-03-02 07:26:02
|
Update of /cvsroot/mlt/mlt/src/modules/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22179/src/modules/core Modified Files: Makefile configure factory.c Added Files: filter_mono.c filter_mono.h Log Message: added mono audio filter Index: Makefile =================================================================== RCS file: /cvsroot/mlt/mlt/src/modules/core/Makefile,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- Makefile 5 Dec 2005 11:35:53 -0000 1.31 +++ Makefile 2 Mar 2006 07:25:57 -0000 1.32 @@ -14,6 +14,7 @@ filter_greyscale.o \ filter_luma.o \ filter_mirror.o \ + filter_mono.o \ filter_obscure.o \ filter_region.o \ filter_rescale.o \ Index: factory.c =================================================================== RCS file: /cvsroot/mlt/mlt/src/modules/core/factory.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- factory.c 7 Sep 2005 09:23:37 -0000 1.22 +++ factory.c 2 Mar 2006 07:25:57 -0000 1.23 @@ -30,6 +30,7 @@ #include "filter_greyscale.h" #include "filter_luma.h" #include "filter_mirror.h" +#include "filter_mono.h" #include "filter_obscure.h" #include "filter_rescale.h" #include "filter_resize.h" @@ -73,6 +74,8 @@ return filter_luma_init( arg ); if ( !strcmp( id, "mirror" ) ) return filter_mirror_init( arg ); + if ( !strcmp( id, "mono" ) ) + return filter_mono_init( arg ); if ( !strcmp( id, "obscure" ) ) return filter_obscure_init( arg ); if ( !strcmp( id, "region" ) ) --- NEW FILE: filter_mono.c --- /* * filter_mono.c -- mix all channels to a mono signal across n channels * Copyright (C) 2003-2006 Ushodaya Enterprises Limited * Author: Dan Dennedy <da...@de...> * * 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_mono.h" #include <framework/mlt_frame.h> #include <stdio.h> #include <stdlib.h> /** Get the audio. */ static int filter_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples ) { // Get the properties of the a frame mlt_properties properties = MLT_FRAME_PROPERTIES( frame ); int channels_out = mlt_properties_get_int( properties, "mono.channels" ); int i, j, size; int16_t *new_buffer; // Get the producer's audio mlt_frame_get_audio( frame, buffer, format, frequency, channels, samples ); size = *samples * channels_out * sizeof( int16_t ); new_buffer = mlt_pool_alloc( size ); mlt_properties_set_data( properties, "audio", new_buffer, size, ( mlt_destructor )mlt_pool_release, NULL ); // Mix for ( i = 0; i < *samples; i++ ) { int16_t mixdown = 0; for ( j = 0; j < *channels; j++ ) mixdown += (*buffer)[ ( i * *channels ) + j ] / *channels; for ( j = 0; j < channels_out; j++ ) new_buffer[ ( i * channels_out ) + j ] = mixdown; } // Apply results *buffer = new_buffer; *channels = channels_out; return 0; } /** Filter processing. */ static mlt_frame filter_process( mlt_filter this, mlt_frame frame ) { mlt_properties properties = MLT_FILTER_PROPERTIES( this ); mlt_properties frame_props = MLT_FRAME_PROPERTIES( frame ); // Propogate the parameters mlt_properties_set_int( frame_props, "mono.channels", mlt_properties_get_int( properties, "channels" ) ); // Override the get_audio method mlt_frame_push_audio( frame, filter_get_audio ); return frame; } /** Constructor for the filter. */ mlt_filter filter_mono_init( char *arg ) { mlt_filter this = mlt_filter_new( ); if ( this != NULL ) { this->process = filter_process; if ( arg != NULL ) mlt_properties_set_int( MLT_FILTER_PROPERTIES( this ), "channels", atoi( arg ) ); else mlt_properties_set_int( MLT_FILTER_PROPERTIES( this ), "channels", 2 ); } return this; } Index: configure =================================================================== RCS file: /cvsroot/mlt/mlt/src/modules/core/configure,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- configure 7 Sep 2005 09:23:37 -0000 1.23 +++ configure 2 Mar 2006 07:25:57 -0000 1.24 @@ -19,6 +19,7 @@ greyscale libmltcore$LIBSUF luma libmltcore$LIBSUF mirror libmltcore$LIBSUF +mono libmltcore$LIBSUF obscure libmltcore$LIBSUF region libmltcore$LIBSUF rescale libmltcore$LIBSUF --- NEW FILE: filter_mono.h --- /* * filter_mono.h -- mix all channels to a mono signal across n channels * Copyright (C) 2003-2006 Ushodaya Enterprises Limited * Author: Dan Dennedy <da...@de...> * * 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_MONO_H_ #define _FILTER_MONO_H_ #include <framework/mlt_filter.h> extern mlt_filter filter_mono_init( char *arg ); #endif |