Commit 6e176c0e authored by Manuel Jander's avatar Manuel Jander
Browse files

Remover inactive FIX_867_CLDFB_NRG_SCALE_CLDFB_MASK switch and code

parent 739f1958

lib_dec/ivas_dirac_dec_fx.c

+0 −51
Original line number Diff line number Diff line
@@ -2789,48 +2789,6 @@ void ivas_dirac_dec_render_sf_fx( 
                                  q_input );

            }

            q_input = add( Q11, q_input );

#endif

#ifdef FIX_867_CLDFB_NRG_SCALE_CLDFB_MASK

            Word16 cldfb_last_band = 0;

            move16();

            {

                Word32 sr;

                Word16 el;

                FOR( el = 0; el < st_ivas->nSCE; el++ )

                {

                    test();

                    test();

                    IF( st_ivas->hSCE[el]->hCoreCoder[0]->hIGFDec != NULL && st_ivas->hSCE[el]->hCoreCoder[0]->hIGFDec->isIGFActive )

                    {

                        cldfb_last_band = s_max( cldfb_last_band, st_ivas->hSCE[el]->hCoreCoder[0]->hIGFDec->infoIGFStopFreq );

                        sr = st_ivas->hSCE[el]->hCoreCoder[0]->output_Fs;

                    }

                }

                FOR( el = 0; el < st_ivas->nCPE; el++ )

                {

                    test();

                    test();

                    IF( st_ivas->hCPE[el]->hCoreCoder[0]->hIGFDec != NULL && st_ivas->hCPE[el]->hCoreCoder[0]->hIGFDec->isIGFActive )

                    {

                        cldfb_last_band = s_max( cldfb_last_band, st_ivas->hCPE[el]->hCoreCoder[0]->hIGFDec->infoIGFStopFreq );

                        sr = st_ivas->hCPE[el]->hCoreCoder[0]->output_Fs;

                    }

                    test();

                    test();

                    IF( st_ivas->hCPE[el]->hCoreCoder[1]->hIGFDec != NULL && st_ivas->hCPE[el]->hCoreCoder[1]->hIGFDec->isIGFActive )

                    {

                        cldfb_last_band = s_max( cldfb_last_band, st_ivas->hCPE[el]->hCoreCoder[1]->hIGFDec->infoIGFStopFreq );

                    }

                }

                IF( EQ_16( cldfb_last_band, 0 ) )

                {

                    cldfb_last_band = hSpatParamRendCom->num_freq_bands;

                }

                ELSE

                {

                    cldfb_last_band = mult_r( div_s( shr( cldfb_last_band, 2 ), extract_l( L_shr( sr, 3 ) ) ), hSpatParamRendCom->num_freq_bands );

                }

            }

#endif

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

            {
@@ -2850,15 +2808,6 @@ void ivas_dirac_dec_render_sf_fx( 
                                           Cldfb_ImagBuffer_fx[ch][0],

                                           hSpatParamRendCom->num_freq_bands,

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

#endif

#ifdef FIX_867_CLDFB_NRG_SCALE_CLDFB_MASK

                FOR( i = cldfb_last_band; i < hSpatParamRendCom->num_freq_bands; i++ )

                {

                    Cldfb_RealBuffer_fx[ch][0][i] = 0;

                    Cldfb_ImagBuffer_fx[ch][0][i] = 0;

                    move32();

                    move32();

                }

#endif

            }

            q_cldfb = q_temp_cldfb;