Commit 101a3370 authored by multrus's avatar multrus Committed by Manuel Jander
Browse files

[cleanup] remove FIX_867_CLDFB_NRG_SCALE_CLDFB

parent 138b802d

lib_dec/ivas_dirac_dec_fx.c

+0 −29
Original line number Diff line number Diff line
@@ -2771,28 +2771,8 @@ void ivas_dirac_dec_render_sf_fx( 
        {

            /* CLDFB Analysis*/

            offset = i_mult( hSpatParamRendCom->num_freq_bands, index_slot );

#ifdef FIX_867_CLDFB_NRG_SCALE_CLDFB

            Word16 q_input;

            Word32 sigTemp[MAX_TRANSPORT_CHANNELS][CLDFB_NO_CHANNELS_MAX];

            q_input = 4;

            move16();

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

            {

                q_input = s_min( q_input, L_norm_arr( &st_ivas->hTcBuffer->tc_fx[hDirACRend->sba_map_tc[ch]][offset],

                                                      hSpatParamRendCom->num_freq_bands ) );

            }

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

            {

                Copy_Scale_sig32( &st_ivas->hTcBuffer->tc_fx[hDirACRend->sba_map_tc[ch]][offset],

                                  sigTemp[ch],

                                  hSpatParamRendCom->num_freq_bands,

                                  q_input );

            }

            q_input = add( Q11, q_input );

#endif

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

            {

#ifndef FIX_867_CLDFB_NRG_SCALE_CLDFB

                q_temp_cldfb = Q11;

                move16();

                cldfbAnalysis_ts_fx_fixed_q( &st_ivas->hTcBuffer->tc_fx[hDirACRend->sba_map_tc[ch]][offset],
@@ -2800,15 +2780,6 @@ void ivas_dirac_dec_render_sf_fx( 
                                             Cldfb_ImagBuffer_fx[ch][0],

                                             hSpatParamRendCom->num_freq_bands,

                                             st_ivas->cldfbAnaDec[ch], &q_temp_cldfb );

#else

                q_temp_cldfb = q_input;

                move16();

                cldfbAnalysis_ts_fx_var_q( sigTemp[ch],

                                           Cldfb_RealBuffer_fx[ch][0],

                                           Cldfb_ImagBuffer_fx[ch][0],

                                           hSpatParamRendCom->num_freq_bands,

                                           st_ivas->cldfbAnaDec[ch], &q_temp_cldfb );

#endif

            }

            q_cldfb = q_temp_cldfb;

            move16();