Commit 2bf4f1fd authored by fotopoulou's avatar fotopoulou
Browse files

fix for issue 723, set the correct InfoTCXNoise buffer for the IGF noise filling

parent 4010db07

lib_com/options.h

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


#define CR_2109_to_2112_cd0_ce0  /* This is related to the CRs include in the 26.444 package of 21-12. Concerns lead_deindexing and  */



#define FIX_ISSUE_723_INFO_TCX_NOISE /*FhG: Issue 723: fix for IGF that introduces wrong noise filling behavion*/



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



/* ################## End DEVELOPMENT switches ######################### */

lib_dec/dec_tcx_fx.c

+15 −0
Original line number Diff line number Diff line
@@ -4352,6 +4352,7 @@ void decoder_tcx_noisefilling_fx( 
            nf_seed = extract_l( tmp32 );

        }



#ifndef FIX_ISSUE_723_INFO_TCX_NOISE

        pInfoTCXNoise = NULL;

        Word16 tmp_infoTCXNoiseBuf[IGF_START_MX];

        if ( st->igf )
@@ -4363,14 +4364,28 @@ void decoder_tcx_noisefilling_fx( 
            pInfoTCXNoise = tmp_infoTCXNoiseBuf;

            move16();

        }

#else

        if ( st->igf )

        {

            pInfoTCXNoise = st->hIGFDec->infoTCXNoise_evs;

            move16();

        }

#endif

        tcx_noise_filling_with_shift( x, x_e, nf_seed, firstLine, noiseFillingSize, noiseTransWidth, L_frame, noiseTiltFactor, fac_ns, pInfoTCXNoise, st->element_mode );



#ifndef FIX_ISSUE_723_INFO_TCX_NOISE

        if ( pInfoTCXNoise )

        {

            for ( int j = 0; j < IGF_START_MX; j++ )

            {

#ifndef FIX_ISSUE_723_INFO_TCX_NOISE

                st->hIGFDec->infoTCXNoise[j] = (UWord8) tmp_infoTCXNoiseBuf[j];

#else

                st->hIGFDec->infoTCXNoise_evs[j] = (UWord8) tmp_infoTCXNoiseBuf[j];

#endif

            }

        }

#endif



        st->seed_tcx_plc = nf_seed;

        move16();