X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsox%2Ffilter_sox.c;h=c1676bc377339686c673de48ec5080a63165e126;hb=d33f444d4ef4c7bc4074d07a49eca0ab7d108394;hp=355a8abad0eb407c5b18cad15c073618a546fd1c;hpb=f00476101550ec7d8e863f6516aa83bc1b524570;p=melted diff --git a/src/modules/sox/filter_sox.c b/src/modules/sox/filter_sox.c index 355a8ab..c1676bc 100644 --- a/src/modules/sox/filter_sox.c +++ b/src/modules/sox/filter_sox.c @@ -3,23 +3,22 @@ * Copyright (C) 2003-2004 Ushodaya Enterprises Limited * Author: Dan Dennedy * - * 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_sox.h" - +#include #include #include @@ -28,7 +27,21 @@ #include #include -#include +#ifdef SOX14 +# include +# define ST_EOF SOX_EOF +# define ST_SUCCESS SOX_SUCCESS +# define st_sample_t sox_sample_t +# define eff_t sox_effect_t* +# define st_size_t sox_size_t +# define ST_LIB_VERSION_CODE SOX_LIB_VERSION_CODE +# define ST_LIB_VERSION SOX_LIB_VERSION +# define ST_SIGNED_WORD_TO_SAMPLE(d,clips) SOX_SIGNED_16BIT_TO_SAMPLE(d,clips) +# define ST_SSIZE_MIN SOX_SSIZE_MIN +# define ST_SAMPLE_TO_SIGNED_WORD(d,clips) SOX_SAMPLE_TO_SIGNED_16BIT(d,clips) +#else +# include +#endif #define BUFFER_LEN 8192 #define AMPLITUDE_NORM 0.2511886431509580 /* -12dBFS */ @@ -61,21 +74,37 @@ static inline double mean( double *buf, int count ) static int create_effect( mlt_filter this, char *value, int count, int channel, int frequency ) { mlt_tokeniser tokeniser = mlt_tokeniser_init(); +#ifdef SOX14 + eff_t eff = mlt_pool_alloc( sizeof( sox_effect_t ) ); +#else eff_t eff = mlt_pool_alloc( sizeof( struct st_effect ) ); +#endif char id[ 256 ]; int error = 1; // Tokenise the effect specification mlt_tokeniser_parse_new( tokeniser, value, " " ); + if ( tokeniser->count < 1 ) + return error; // Locate the effect +#ifdef SOX14 + //fprintf(stderr, "%s: effect %s count %d\n", __FUNCTION__, tokeniser->tokens[0], tokeniser->count ); + sox_create_effect( eff, sox_find_effect( tokeniser->tokens[0] ) ); + int opt_count = tokeniser->count - 1; +#else int opt_count = st_geteffect_opt( eff, tokeniser->count, tokeniser->tokens ); +#endif // If valid effect if ( opt_count != ST_EOF ) { // Supply the effect parameters +#ifdef SOX14 + if ( ( * eff->handler.getopts )( eff, opt_count, &tokeniser->tokens[ tokeniser->count > 1 ? 1 : 0 ] ) == ST_SUCCESS ) +#else if ( ( * eff->h->getopts )( eff, opt_count, &tokeniser->tokens[ tokeniser->count - opt_count ] ) == ST_SUCCESS ) +#endif { // Set the sox signal parameters eff->ininfo.rate = frequency; @@ -84,7 +113,11 @@ static int create_effect( mlt_filter this, char *value, int count, int channel, eff->outinfo.channels = 1; // Start the effect +#ifdef SOX14 + if ( ( * eff->handler.start )( eff ) == ST_SUCCESS ) +#else if ( ( * eff->h->start )( eff ) == ST_SUCCESS ) +#endif { // Construct id sprintf( id, "_effect_%d_%d", count, channel ); @@ -123,10 +156,7 @@ static int filter_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_format st_sample_t *output_buffer = mlt_properties_get_data( filter_properties, "output_buffer", NULL ); int channels_avail = *channels; int i; // channel - int count = mlt_properties_get_int( filter_properties, "effect_count" ); - - // Restore the original get_audio - frame->get_audio = mlt_frame_pop_audio( frame ); + int count = mlt_properties_get_int( filter_properties, "_effect_count" ); // Get the producer's audio mlt_frame_get_audio( frame, buffer, format, frequency, &channels_avail, samples ); @@ -214,7 +244,7 @@ static int filter_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_format } // Save the number of filters - mlt_properties_set_int( filter_properties, "effect_count", count ); + mlt_properties_set_int( filter_properties, "_effect_count", count ); } if ( *samples > 0 && count > 0 ) @@ -228,12 +258,18 @@ static int filter_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_format int j; char *normalise = mlt_properties_get( filter_properties, "normalise" ); double normalised_gain = 1.0; +#if (ST_LIB_VERSION_CODE >= ST_LIB_VERSION(13,0,0)) + st_sample_t dummy_clipped_count = 0; +#endif // Convert to sox encoding while( p != end ) { +#if (ST_LIB_VERSION_CODE >= ST_LIB_VERSION(13,0,0)) + *p = ST_SIGNED_WORD_TO_SAMPLE( *q, dummy_clipped_count ); +#else *p = ST_SIGNED_WORD_TO_SAMPLE( *q ); - +#endif // Compute rms amplitude while we are accessing each sample rms += ( double )*p * ( double )*p; @@ -292,7 +328,11 @@ static int filter_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_format float saved_gain = 1.0; // XXX: hack to apply the normalised gain level to the vol effect +#ifdef SOX14 + if ( normalise && strcmp( e->handler.name, "vol" ) == 0 ) +#else if ( normalise && strcmp( e->name, "vol" ) == 0 ) +#endif { float *f = ( float * )( e->priv ); saved_gain = *f; @@ -300,7 +340,11 @@ static int filter_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_format } // Apply the effect +#ifdef SOX14 + if ( ( * e->handler.flow )( e, input_buffer, output_buffer, &isamp, &osamp ) == ST_SUCCESS ) +#else if ( ( * e->h->flow )( e, input_buffer, output_buffer, &isamp, &osamp ) == ST_SUCCESS ) +#endif { // Swap input and output buffer pointers for subsequent effects p = input_buffer; @@ -309,7 +353,11 @@ static int filter_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_format } // XXX: hack to restore the original vol gain to prevent accumulation +#ifdef SOX14 + if ( normalise && strcmp( e->handler.name, "vol" ) == 0 ) +#else if ( normalise && strcmp( e->name, "vol" ) == 0 ) +#endif { float *f = ( float * )( e->priv ); *f = saved_gain; @@ -323,7 +371,11 @@ static int filter_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_format end = p + *samples; while ( p != end ) { +#if (ST_LIB_VERSION_CODE >= ST_LIB_VERSION(13,0,0)) + *q = ST_SAMPLE_TO_SIGNED_WORD( *p ++, dummy_clipped_count ); +#else *q = ST_SAMPLE_TO_SIGNED_WORD( *p ++ ); +#endif q += *channels; } } @@ -337,12 +389,11 @@ static int filter_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_format static mlt_frame filter_process( mlt_filter this, mlt_frame frame ) { - if ( frame->get_audio != NULL ) + if ( mlt_frame_is_test_audio( frame ) == 0 ) { // Add the filter to the frame - mlt_frame_push_audio( frame, frame->get_audio ); mlt_frame_push_audio( frame, this ); - frame->get_audio = filter_get_audio; + mlt_frame_push_audio( frame, filter_get_audio ); // Parse the window property and allocate smoothing buffer if needed mlt_properties properties = MLT_FILTER_PROPERTIES( this ); @@ -364,7 +415,7 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame ) /** Constructor for the filter. */ -mlt_filter filter_sox_init( char *arg ) +mlt_filter filter_sox_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ) { mlt_filter this = mlt_filter_new( ); if ( this != NULL )