Commit ee8a9aef authored by Fabian Bauer's avatar Fabian Bauer
Browse files

erase FIX_2436_RENDERER_CLDFBSTATES_EACH_ISM_INPUT code completely : not... 

erase FIX_2436_RENDERER_CLDFBSTATES_EACH_ISM_INPUT code completely : not straightforward - use approach from float mr 2540
parent 9bb96b7a

lib_com/cldfb_fx.c

+0 −20
Original line number Diff line number Diff line
@@ -1422,32 +1422,12 @@ ivas_error openCldfb_ivas_fx( 
    move16();

    set32_fx( hs->cldfb_state_fx, 0, buf_len );



#ifdef FIX_2436_RENDERER_CLDFBSTATES_EACH_ISM_INPUT

    hs->cldfb_state_multiStates = 0;

    move16();

#endif



    *h_cldfb = hs;

    move16();



    return IVAS_ERR_OK;

}



#ifdef FIX_2436_RENDERER_CLDFBSTATES_EACH_ISM_INPUT

ivas_error getCLDFBMultiStates( HANDLE_CLDFB_FILTER_BANK h_cldfb, /* i/o: filter bank handle                */

                                Word16 len )

{

    free( h_cldfb->cldfb_state_fx );

    IF( ( h_cldfb->cldfb_state_fx = (Word32 *) malloc( len * sizeof( Word32 ) ) ) == NULL )

    {

        return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate long states memory for CLDFB" );

    }

    set32_fx( h_cldfb->cldfb_state_fx, 0, len );

    return IVAS_ERR_OK;

}

#endif





/*-------------------------------------------------------------------*

 * resampleCldfb_ivas()

 *

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -106,7 +106,6 @@ 
#define NONBE_MR2809

#define FIX_2432_ISM_SPIKES_16KHZ                       /* VA: basop issue 2432: fix spikes in ISM decoding at 16kHz output sampling rate */



#define FIX_2436_RENDERER_CLDFBSTATES_EACH_ISM_INPUT    /*FhG: create and use more states per channel in cldfbhandle states to address multiple ISM inputs*/

#define FIX_2436_CLDFBANAHANDLE_ADRESS                  /*FhG: cldfb handle pointer were handed over in faulty manner*/



/* ##################### End NON-BE switches ########################### */

lib_com/prot_fx.h

+0 −4
Original line number Diff line number Diff line
@@ -8877,10 +8877,6 @@ ivas_error openCldfb_ivas_fx( 
    CLDFB_PROTOTYPE prototype,         /* i  : CLDFB version (1.25ms/5ms delay)  */

    const Word16 enc_dec );            /* i  : encoder/decoder flag            */



#ifdef FIX_2436_RENDERER_CLDFBSTATES_EACH_ISM_INPUT

ivas_error getCLDFBMultiStates( HANDLE_CLDFB_FILTER_BANK h_cldfb, Word16 len );

#endif



Word32 rand_gauss_fx(

    Word32 *x,

    Word16 *seed,

lib_dec/lib_dec_fx.c

+0 −5
Original line number Diff line number Diff line
@@ -6290,12 +6290,7 @@ static ivas_error ivas_dec_init_split_rend( 
        move16();

    }



#ifdef FIX_2436_RENDERER_CLDFBSTATES_EACH_ISM_INPUT

    /*call with a flag indicating no long ana states*/

    error = ISAR_PRE_REND_open( &st_ivas->hSplitBinRend->splitrend, &st_ivas->hRenderConfig->split_rend_config, st_ivas->hDecoderConfig->output_Fs, cldfb_in_flag, pcm_out_flag, st_ivas->hDecoderConfig->render_num_subframes, mixed_td_cldfb_flag, 0 );

#else

    error = ISAR_PRE_REND_open( &st_ivas->hSplitBinRend->splitrend, &st_ivas->hRenderConfig->split_rend_config, st_ivas->hDecoderConfig->output_Fs, cldfb_in_flag, pcm_out_flag, st_ivas->hDecoderConfig->render_num_subframes, mixed_td_cldfb_flag );

#endif

    move16();



    return error;

lib_isar/lib_isar_pre_rend.c

+0 −17
Original line number Diff line number Diff line
@@ -38,9 +38,6 @@ 
#include "isar_rom_post_rend.h"

#include "lib_isar_pre_rend.h"

#include "isar_prot.h"

#ifdef FIX_2436_RENDERER_CLDFBSTATES_EACH_ISM_INPUT

#include "lib_rend.h"

#endif



#ifdef DEBUGGING

#include "debug.h"
@@ -62,10 +59,6 @@ ivas_error ISAR_PRE_REND_open( 
    const Word16 pcm_out_flag,                        /* i  : Flag to indicate PCM output                     */

    const IVAS_RENDER_NUM_SUBFR render_num_subframes, /* i  : rendering number of subframes                   */

    const Word16 mixed_td_cldfb_flag                  /* i  : Flag to indicate combined TD and CLDFB input    */

#ifdef FIX_2436_RENDERER_CLDFBSTATES_EACH_ISM_INPUT

    ,

    const int createMultiStates

#endif

)

{

    ivas_error error, ch, num_ch;
@@ -129,16 +122,6 @@ ivas_error ISAR_PRE_REND_open( 
                                             CLDFB_ANALYSIS, OutSampleRate, CLDFB_PROTOTYPE_5_00MS, DEC ) ) != IVAS_ERR_OK ){

                return error;

    }

#ifdef FIX_2436_RENDERER_CLDFBSTATES_EACH_ISM_INPUT

    IF( createMultiStates )

    {

        HANDLE_CLDFB_FILTER_BANK pCldfbAna = hSplitRendWrapper->hCldfbHandles->cldfbAna[ch];

        pCldfbAna->cldfb_state_multiStates = 1;

        /*Re-allocate CLDFB Analysis states*/

        Word16 buf_len = buf_len = sub( pCldfbAna->p_filter_length, pCldfbAna->no_channels );

        getCLDFBMultiStates( pCldfbAna, buf_len * RENDERER_MAX_ISM_INPUTS );

    }

#endif

}



FOR( ch = 0; ch < BINAURAL_CHANNELS; ch++ )