From b99b5ee7f1f91538cfbd9ab50f3028b0340a0bd0 Mon Sep 17 00:00:00 2001 From: ddennedy Date: Sat, 31 Mar 2007 00:29:56 +0000 Subject: [PATCH] add sox 13.0.0 support git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@962 d19143bc-622f-0410-bfdd-b5b2a6649095 --- ChangeLog | 3 +++ src/modules/sox/filter_sox.c | 12 +++++++++++- 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index cc9bcf8..5699265 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ $Id$ +2007-03-30 Dan Dennedy + Add support for sox 13.0.0. + 2007-03-30 Jean-Baptiste Mardelle Fix boxblur and wave filters license. diff --git a/src/modules/sox/filter_sox.c b/src/modules/sox/filter_sox.c index d459360..7c0928b 100644 --- a/src/modules/sox/filter_sox.c +++ b/src/modules/sox/filter_sox.c @@ -225,12 +225,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; @@ -320,7 +326,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; } } -- 1.7.4.4