Commit bbb81c1c authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_483, FIX_483b

parent ba18ed9d

lib_com/bitstream.c

+0 −4
Original line number Diff line number Diff line
@@ -772,11 +772,7 @@ int16_t get_ivas_max_num_indices_metadata( /* o 
        }

        else if ( ivas_total_brate <= IVAS_256k )

        {

#ifdef FIX_483b

            return 1050;

#else

            return 1000;

#endif

        }

        else if ( ivas_total_brate <= IVAS_384k )

        {

lib_com/options.h

+0 −2
Original line number Diff line number Diff line
@@ -157,8 +157,6 @@ 






#define FIX_483                                         /* FhG: fix issue 483, division by zero in nois_est */

#define FIX_483b                                        /* FhG: fix issue 483, uninitialized values in ivas_mct_core_enc */

#define FIX_506_WARNINGS                                /* FhG/Eri/Dlb/VA: Issue 508, Warnings on MacOS */

#define FIX_170_DTX_MASA                                /* Nokia: Fix issue 170, relaxing the use of DTX in MASA format */

#define FIX_296_CFG_LFE_SCENE_DESC                       /* FhG: Fix issue 296 - add configurable LFE handling to the scene description file */

lib_enc/ivas_mct_core_enc.c

+0 −8
Original line number Diff line number Diff line
@@ -264,10 +264,8 @@ void ivas_mct_core_enc( 


            sp_aud_decision0[i] = hCPE[cpe_id]->hCoreCoder[0]->sp_aud_decision0;



#ifdef FIX_483b

            sts[i]->hTcxEnc->tns_ms_flag[0] = 0;

            sts[i]->hTcxEnc->tns_ms_flag[1] = 0;

#endif



            i++;

        }
@@ -343,11 +341,7 @@ void ivas_mct_core_enc( 


        for ( n = 0; n < nSubframes; n++ )

        {

#ifdef FIX_483b

            if ( sts[ch]->hTcxEnc->tns_ms_flag[n] )

#else

            if ( !sts[ch]->hTcxEnc->fUseTns[n] /*!sts[0]->fUseTns[n] && !sts[1]->fUseTns[n]*/ )

#endif

            {

                /* power spectrum: MDCT^2 + MDST^2 */

                for ( i = 0; i < L_subframeTCX; i++ )
@@ -358,9 +352,7 @@ void ivas_mct_core_enc( 
            }

            else

            {

#ifdef FIX_483b

                if ( hMCT->currBlockDataCnt > 0 )

#endif

                {

                    /* power spectrum: MDCT^2 + MDST^2 */

                    powerSpecMsInv[ch][n][0] = inv_spectrum[ch][n][0] * inv_spectrum[ch][n][0];

lib_enc/ivas_mct_enc_mct.c

+0 −2
Original line number Diff line number Diff line
@@ -700,9 +700,7 @@ void apply_MCT_enc( 
                    {

                        v_multc( sts[ch]->hTcxEnc->spectrum[k], qratio, sts[ch]->hTcxEnc->spectrum[k], L_subframeTCX );

                        v_multc( mdst_spectrum[ch][k], qratio, mdst_spectrum[ch][k], L_subframeTCX );

#ifdef FIX_483b

                        set_zero( inv_spectrum[ch][k], L_subframeTCX );

#endif

                    }

                    hMCT->mc_global_ild[ch] = 0;

                }

lib_enc/ivas_stereo_mdct_core_enc.c

+0 −8
Original line number Diff line number Diff line
@@ -223,10 +223,8 @@ void stereo_mdct_core_enc( 
        inv_spectrum[ch][1] = quantized_spectrum[ch][1];

        mdst_spectrum[ch][0] = mdst_spectrum_long[ch];

        mdst_spectrum[ch][1] = mdst_spectrum_long[ch] + N_TCX10_MAX;

#ifdef FIX_483b

        sts[ch]->hTcxEnc->tns_ms_flag[0] = 0;

        sts[ch]->hTcxEnc->tns_ms_flag[1] = 0;

#endif

    }
@@ -279,11 +277,7 @@ void stereo_mdct_core_enc( 


        for ( n = 0; n < nSubframes; n++ )

        {

#ifdef FIX_483b

            if ( sts[ch]->hTcxEnc->tns_ms_flag[n] )

#else

            if ( !sts[ch]->hTcxEnc->fUseTns[n] )

#endif

            {

                /* power spectrum: MDCT^2 + MDST^2 */

                for ( i = 0; i < L_subframeTCX; i++ )
@@ -294,9 +288,7 @@ void stereo_mdct_core_enc( 
            }

            else

            {

#ifdef FIX_483b

                if ( hStereoMdct->mdct_stereo_mode[n] != SMDCT_DUAL_MONO )

#endif

                {

                    /* power spectrum: MDCT^2 + MDST^2 */

                    powerSpecMsInv[ch][n][0] = inv_spectrum[ch][n][0] * inv_spectrum[ch][n][0];