X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fresample%2Ffilter_resample.c;h=e2e52e85fa87f717c95c5a2f871341ae115a32b8;hb=dc57bd7b4020663b49149f44f1607c4d78c4d2d5;hp=d4a87e185b5c5fe93964089a306183ba03e37207;hpb=42bd0aedb6d3d65bedb98479adcdbaeb326dfee9;p=melted diff --git a/src/modules/resample/filter_resample.c b/src/modules/resample/filter_resample.c index d4a87e1..e2e52e8 100644 --- a/src/modules/resample/filter_resample.c +++ b/src/modules/resample/filter_resample.c @@ -45,12 +45,20 @@ static int resample_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form float *output_buffer = mlt_properties_get_data( properties, "resample.output_buffer", NULL ); int i; + if ( output_rate == 0 ) + output_rate = *frequency; + // Restore the original get_audio frame->get_audio = mlt_properties_get_data( properties, "resample.get_audio", NULL ); // Get the producer's audio mlt_frame_get_audio( frame, buffer, format, frequency, channels, samples ); + //fprintf( stderr, "resample_get_audio: output_rate %d\n", output_rate, *frequency ); + // Return now if now work to do + if ( output_rate == *frequency ) + return 0; + // Convert to floating point for ( i = 0; i < *samples * *channels; ++i ) input_buffer[ i ] = ( float )( (*buffer)[ i ] ) / 32768; @@ -87,8 +95,8 @@ static int resample_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form (*buffer)[ i ] = lrint( 32768.0 * sample ); } } - //else - //fprintf( stderr, "resample_get_audio: %s\n", src_strerror( i ) ); + else + fprintf( stderr, "resample_get_audio: %s %d,%d,%d\n", src_strerror( i ), *frequency, *samples, output_rate ); return 0; } @@ -144,7 +152,7 @@ mlt_filter filter_resample_init( char *arg ) } else { - //fprintf( stderr, "filter_resample_init: %s\n", src_strerror( error ) ); + fprintf( stderr, "filter_resample_init: %s\n", src_strerror( error ) ); } } return this;