X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fresample%2Ffilter_resample.c;h=ce07eb07b73a2ce37e824846641a42d8c9786f9c;hb=9671ab81bdb3a86155fbf8627e06f6de18e93fff;hp=d4a87e185b5c5fe93964089a306183ba03e37207;hpb=42bd0aedb6d3d65bedb98479adcdbaeb326dfee9;p=melted diff --git a/src/modules/resample/filter_resample.c b/src/modules/resample/filter_resample.c index d4a87e1..ce07eb0 100644 --- a/src/modules/resample/filter_resample.c +++ b/src/modules/resample/filter_resample.c @@ -45,12 +45,21 @@ 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 ); + + // 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; @@ -67,8 +76,10 @@ static int resample_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form { if ( data.output_frames_gen > *samples ) { - *buffer = (int16_t*) malloc( data.output_frames_gen * *channels * 2 ); - mlt_properties_set_data( properties, "audio", *buffer, *channels * data.output_frames_gen * 2, free, NULL ); + void *release = NULL; + *buffer = mlt_pool_allocate( data.output_frames_gen * *channels * sizeof( int16_t ), &release ); + mlt_properties_set_data( properties, "audio_release", release, 0, ( mlt_destructor )mlt_pool_release, NULL ); + mlt_properties_set_data( properties, "audio", *buffer, *channels * data.output_frames_gen * 2, NULL, NULL ); } *samples = data.output_frames_gen; *frequency = output_rate; @@ -87,8 +98,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; } @@ -132,19 +143,23 @@ mlt_filter filter_resample_init( char *arg ) SRC_STATE *state = src_new( RESAMPLE_TYPE, 2 /* channels */, &error ); if ( error == 0 ) { + void *input_release = NULL; + void *input_buffer = mlt_pool_allocate( BUFFER_LEN, &input_release ); + void *output_release = NULL; + void *output_buffer = mlt_pool_allocate( BUFFER_LEN, &output_release ); this->process = filter_process; if ( arg != NULL ) mlt_properties_set_int( mlt_filter_properties( this ), "frequency", atoi( arg ) ); mlt_properties_set_int( mlt_filter_properties( this ), "channels", 2 ); mlt_properties_set_data( mlt_filter_properties( this ), "state", state, 0, (mlt_destructor)src_delete, NULL ); - mlt_properties_set_data( mlt_filter_properties( this ), "input_buffer", - malloc( BUFFER_LEN ), BUFFER_LEN, free, NULL ); - mlt_properties_set_data( mlt_filter_properties( this ), "output_buffer", - malloc( BUFFER_LEN ), BUFFER_LEN, free, NULL ); + mlt_properties_set_data( mlt_filter_properties( this ), "input_release", input_release, 0, ( mlt_destructor )mlt_pool_release, NULL ); + mlt_properties_set_data( mlt_filter_properties( this ), "input_buffer", input_buffer, BUFFER_LEN, NULL, NULL ); + mlt_properties_set_data( mlt_filter_properties( this ), "output_release", output_release, 0, ( mlt_destructor )mlt_pool_release, NULL ); + mlt_properties_set_data( mlt_filter_properties( this ), "output_buffer", output_buffer, BUFFER_LEN, NULL, NULL ); } else { - //fprintf( stderr, "filter_resample_init: %s\n", src_strerror( error ) ); + fprintf( stderr, "filter_resample_init: %s\n", src_strerror( error ) ); } } return this;