* Copyright (C) 2003-2004 Ushodaya Enterprises Limited
* Author: Dan Dennedy <dan@dennedy.org>
*
- * 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 <framework/mlt_filter.h>
#include <framework/mlt_frame.h>
-#include "valerie/valerie_tokeniser.c"
+#include <framework/mlt_tokeniser.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <math.h>
-#include <st.h>
+#ifdef SOX14
+# include <sox.h>
+# 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 <st.h>
+#endif
#define BUFFER_LEN 8192
#define AMPLITUDE_NORM 0.2511886431509580 /* -12dBFS */
*/
static int create_effect( mlt_filter this, char *value, int count, int channel, int frequency )
{
- valerie_tokeniser tokeniser = valerie_tokeniser_init();
+ 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
- valerie_tokeniser_parse_new( tokeniser, value, " " );
+ 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;
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 );
// Save the effect state
- mlt_properties_set_data( mlt_filter_properties( this ), id, eff, 0, mlt_pool_release, NULL );
+ mlt_properties_set_data( MLT_FILTER_PROPERTIES( this ), id, eff, 0, mlt_pool_release, NULL );
error = 0;
}
}
if ( error == 1 )
mlt_pool_release( eff );
- valerie_tokeniser_close( tokeniser );
+ mlt_tokeniser_close( tokeniser );
return error;
}
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 frame
- mlt_properties properties = mlt_frame_properties( frame );
+ mlt_properties properties = MLT_FRAME_PROPERTIES( frame );
// Get the filter service
mlt_filter filter = mlt_frame_pop_audio( frame );
// Get the filter properties
- mlt_properties filter_properties = mlt_filter_properties( filter );
+ mlt_properties filter_properties = MLT_FILTER_PROPERTIES( filter );
// Get the properties
st_sample_t *input_buffer = mlt_properties_get_data( filter_properties, "input_buffer", NULL );
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 );
}
// 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 )
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;
double *smooth_buffer = mlt_properties_get_data( filter_properties, "smooth_buffer", NULL );
double max_gain = mlt_properties_get_double( filter_properties, "max_gain" );
+ // Default the maximum gain factor to 20dBFS
if ( max_gain == 0 )
max_gain = 10.0;
+ // The smoothing buffer prevents radical shifts in the gain level
if ( window > 0 && smooth_buffer != NULL )
{
int smooth_index = mlt_properties_get_int( filter_properties, "_smooth_index" );
smooth_buffer[ smooth_index ] = rms;
+
+ // Ignore very small values that adversely affect the mean
if ( rms > AMPLITUDE_MIN )
mlt_properties_set_int( filter_properties, "_smooth_index", ( smooth_index + 1 ) % window );
+
+ // Smoothing is really just a mean over the past N values
normalised_gain = AMPLITUDE_NORM / mean( smooth_buffer, window );
}
else if ( rms > 0 )
}
//printf("filter_sox: rms %.3f gain %.3f\n", rms, normalised_gain );
+
+ // Govern the maximum gain
if ( normalised_gain > max_gain )
normalised_gain = max_gain;
}
sprintf( id, "_effect_%d_%d", j, i );
e = mlt_properties_get_data( filter_properties, id, NULL );
- // Apply the effect
+ // We better have this guy
if ( e != NULL )
{
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;
*f = saved_gain * normalised_gain;
}
+ // 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;
input_buffer = output_buffer;
output_buffer = p;
}
+ // 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;
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;
}
}
static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
{
- if ( frame->get_audio != NULL )
+ if ( mlt_frame_is_test_audio( frame ) == 0 )
{
- mlt_frame_push_audio( frame, frame->get_audio );
+ // Add the filter to the frame
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 );
+ mlt_properties properties = MLT_FILTER_PROPERTIES( this );
int window = mlt_properties_get_int( properties, "window" );
if ( mlt_properties_get( properties, "smooth_buffer" ) == NULL && window > 1 )
{
/** 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 )
{
void *input_buffer = mlt_pool_alloc( BUFFER_LEN );
void *output_buffer = mlt_pool_alloc( BUFFER_LEN );
- mlt_properties properties = mlt_filter_properties( this );
+ mlt_properties properties = MLT_FILTER_PROPERTIES( this );
this->process = filter_process;
projects / mlt / blobdiff