* 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 <framework/mlt_tokeniser.h>
#include <string.h>
#include <math.h>
-#include <st.h>
+// TODO: does not support multiple effects with SoX v14.1.0+
+
+#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_LIB_VERSION_CODE SOX_LIB_VERSION_CODE
+# define ST_LIB_VERSION SOX_LIB_VERSION
+# if (ST_LIB_VERSION_CODE >= ST_LIB_VERSION(14,2,0))
+# define st_size_t size_t
+# else
+# define st_size_t sox_size_t
+# endif
+# define ST_SIGNED_WORD_TO_SAMPLE(d,clips) SOX_SIGNED_16BIT_TO_SAMPLE(d,clips)
+# if (ST_LIB_VERSION_CODE >= ST_LIB_VERSION(14,1,0))
+# define ST_SSIZE_MIN SOX_SAMPLE_MIN
+# else
+# define ST_SSIZE_MIN SOX_SSIZE_MIN
+# endif
+# 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 */
return mean;
}
+#if (ST_LIB_VERSION_CODE >= ST_LIB_VERSION(14,1,0))
+static void delete_effect( eff_t effp )
+{
+ free( effp->priv );
+ free( (void*)effp->in_encoding );
+ free( effp );
+}
+#endif
+
/** Create an effect state instance for a channels
*/
static int create_effect( mlt_filter this, char *value, int count, int channel, int frequency )
{
mlt_tokeniser tokeniser = mlt_tokeniser_init();
- eff_t eff = mlt_pool_alloc( sizeof( struct st_effect ) );
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
+ mlt_destructor effect_destructor = mlt_pool_release;
+#ifdef SOX14
+ //fprintf(stderr, "%s: effect %s count %d\n", __FUNCTION__, tokeniser->tokens[0], tokeniser->count );
+#if (ST_LIB_VERSION_CODE >= ST_LIB_VERSION(14,1,0))
+ eff_t eff = sox_create_effect( sox_find_effect( tokeniser->tokens[0] ) );
+ effect_destructor = ( mlt_destructor ) delete_effect;
+ sox_encodinginfo_t *enc = calloc( 1, sizeof( sox_encodinginfo_t ) );
+ enc->encoding = SOX_ENCODING_SIGN2;
+ enc->bits_per_sample = 16;
+ eff->in_encoding = eff->out_encoding = enc;
+#else
+ eff_t eff = mlt_pool_alloc( sizeof( sox_effect_t ) );
+ sox_create_effect( eff, sox_find_effect( tokeniser->tokens[0] ) );
+#endif
+ int opt_count = tokeniser->count - 1;
+#else
+ eff_t eff = mlt_pool_alloc( sizeof( struct st_effect ) );
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
+#if (ST_LIB_VERSION_CODE >= ST_LIB_VERSION(14,1,0))
+ eff->in_signal.rate = frequency;
+ eff->out_signal.rate = frequency;
+ eff->in_signal.channels = 1;
+ eff->out_signal.channels = 1;
+ eff->in_signal.precision = 16;
+ eff->out_signal.precision = 16;
+ eff->in_signal.length = 0;
+ eff->out_signal.length = 0;
+#else
eff->ininfo.rate = frequency;
eff->outinfo.rate = frequency;
eff->ininfo.channels = 1;
eff->outinfo.channels = 1;
+#endif
// 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, effect_destructor, NULL );
error = 0;
}
}
}
// Some error occurred so delete the temp effect state
if ( error == 1 )
- mlt_pool_release( eff );
+ effect_destructor( eff );
mlt_tokeniser_close( tokeniser );
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" );
+ 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 );
eff_t e = mlt_properties_get_data( filter_properties, id, NULL );
// Validate the existing effect state
+#if (ST_LIB_VERSION_CODE >= ST_LIB_VERSION(14,1,0))
+ if ( e != NULL && ( e->in_signal.rate != *frequency ||
+ e->out_signal.rate != *frequency ) )
+#else
if ( e != NULL && ( e->ininfo.rate != *frequency ||
e->outinfo.rate != *frequency ) )
+#endif
e = NULL;
// (Re)Create the effect state
}
// 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;
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;
}
// 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;
}
// 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;
}
}
/** 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 )