Commit 3f3e94bf authored by Jan Kiene's avatar Jan Kiene
Browse files

Accept FIX_1559

parent 1841d349

lib_com/fd_cng_com_fx.c

+0 −2
Original line number Diff line number Diff line
@@ -112,10 +112,8 @@ void initFdCngCom( 
    move16();

    hFdCngCom->stopFFTbin = 0;

    move16();

#ifdef FIX_1559

    hFdCngCom->nFFTpart = 0;

    move16();

#endif

    hFdCngCom->frameSize = 0;

    move16();

    hFdCngCom->fftlen = 0;

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ 


#define FIX_1576_LCLD_CRASH_DIFFERENT_CODEC_ISAR_FRAME_SIZE  /* Dolby: float issue 1576: fix for crash in LCLD mode when codec frame size is less than isar frame size */

#define NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX_2549       /* FhG: Correct scale inconsistency of old_inp_16k_fx buffer scale. */

#define FIX_1559                                        /* Eri/FhG: fix for Issue 1559 in FD CNG with bitrate/bw switching */

#define FIX_BASOP_2571_MASA_EXT_RENDER_FIXES            /* Nokia: BASOP issue 2571: Fix MASA EXT DirAC renderer by unifying it with decoder */

#define NONBE_FIX_2575                                  /* Fhg: Fix issue 2575, precision loss in FD CNG */

#define FIX_2584_TD_SM_ISSUE                            /* VA: Fix inconsistencies in the SM part of the TD stereo */

lib_dec/fd_cng_dec_fx.c

+0 −6
Original line number Diff line number Diff line
@@ -3923,9 +3923,7 @@ void configureFdCngDec_fx( 
{

    Word16 j, stopBandFR;

    HANDLE_FD_CNG_COM hsCom = hFdCngDec->hFdCngCom;

#ifdef FIX_1559

    Word16 nFFTpart_prev;

#endif



    hsCom->CngBandwidth = bwidth; /*Q0*/

    move16();
@@ -4060,10 +4058,8 @@ void configureFdCngDec_fx( 
    hsCom->stopBand = add( hsCom->FdCngSetup.sidPartitions[( hsCom->FdCngSetup.numPartitions - 1 )], 1 ); /*Q0*/

    initPartitions( hsCom->FdCngSetup.sidPartitions, hsCom->FdCngSetup.numPartitions, hsCom->startBand, hsCom->stopBand, hsCom->part, &hsCom->npart, hsCom->midband, hsCom->psize, hsCom->psize_norm, &hsCom->psize_norm_exp, hsCom->psize_inv, 0 );



#ifdef FIX_1559

    nFFTpart_prev = hsCom->nFFTpart;

    move16();

#endif

    IF( EQ_16( hsCom->stopFFTbin, 160 ) )

    {

        hsCom->nFFTpart = 17;
@@ -4089,7 +4085,6 @@ void configureFdCngDec_fx( 
        move16();

    }



#ifdef FIX_1559

    /* In case of going from a lower number of partitions to a higher number, initialize

    the higher ines which might be zero and/or outdated with the highest partitions value

    this avoids almost-zero values to linger around and causing signal bursts after switching to higher bitrate.
@@ -4102,7 +4097,6 @@ void configureFdCngDec_fx( 
            move16();

        }

    }

#endif



    stopBandFR = 40; //(Word16)floor(1000.f /*Hz*/ / 25.f /*Hz/Bin*/);

    move16();