Commit 3e444092 authored by sagnowski's avatar sagnowski
Browse files

Do not hardcode frame size in audio_buffer_td_to_cldfb

parent d6b5a1d4

lib_rend/lib_rend.c

+8 −6
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ static void audio_buffer_td_to_cldfb( 
    int16_t ch, slot_idx;

    float *td_read_ptr;

    float *cldfb_write_ptr;

    int16_t num_bands;

    int16_t num_bands, num_slots;



    assert( !td_buffer.config.is_cldfb );

    assert( cldfb_buffer.config.is_cldfb );
@@ -485,11 +485,13 @@ static void audio_buffer_td_to_cldfb( 


    td_read_ptr = td_buffer.data;

    cldfb_write_ptr = cldfb_buffer.data;

    num_bands = (int16_t) ( ( BINAURAL_MAXBANDS * fs ) / 48000 );

    num_bands = (int16_t) ( ( CLDFB_NO_CHANNELS_MAX * fs ) / 48000 );

    assert( td_buffer.config.numSamplesPerChannel % num_bands == 0 );

    num_slots = td_buffer.config.numSamplesPerChannel / num_bands;



    for ( ch = 0; ch < cldfb_buffer.config.numChannels; ++ch )

    {

        for ( slot_idx = 0; slot_idx < IVAS_CLDFB_NO_COL_MAX; ++slot_idx )

        for ( slot_idx = 0; slot_idx < num_slots; ++slot_idx )

        {

            float re[CLDFB_NO_CHANNELS_MAX];

            float im[CLDFB_NO_CHANNELS_MAX];
@@ -500,12 +502,12 @@ static void audio_buffer_td_to_cldfb( 
                              num_bands,

                              cldfbAna[ch] );



            td_read_ptr += CLDFB_NO_CHANNELS_MAX;

            td_read_ptr += num_bands;



            v_add( re, cldfb_write_ptr, cldfb_write_ptr, num_bands );

            cldfb_write_ptr += CLDFB_NO_CHANNELS_MAX;

            cldfb_write_ptr += num_bands;

            v_add( im, cldfb_write_ptr, cldfb_write_ptr, num_bands );

            cldfb_write_ptr += CLDFB_NO_CHANNELS_MAX;

            cldfb_write_ptr += num_bands;

        }

    }

}