Commit 6d19d90a authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_482_DUMMYDEC_INIT

parent f96fe9d0

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -151,7 +151,6 @@ 
#define FIX_393_459_460_SBA_MD                          /* FhG: fix issues 393, 459, 460, 494 all related to MD buffers and the read index for accessing them */





#define FIX_482_DUMMYDEC_INIT                           /* Nokia: fix issue #428: missing inits for dummyDec in IVAS_rend */

#define FIX_468_16KHZ_PUPMIX                            /* Dlb: Fix issue 468 for Param Upmix at 16kHz sampling rate */

#define FIX_499_DFT_STEREO_PLC                          /* Eri: Fix for issue 499: Wrong past memory addressed for computing energy of DFT stereo residual ECU frame  */

#define FIX_489_COV_SMOOTHING                           /* Dlb: Fix covariance smoothing for ParamUpmix */

lib_rend/lib_rend.c

+0 −4
Original line number Diff line number Diff line
@@ -2485,11 +2485,9 @@ static DecoderDummy *initDecoderDummy( 
    decDummy->hMasa = NULL;

    decDummy->hDiracDecBin = NULL;

    decDummy->hQMetaData = NULL;

#ifdef FIX_482_DUMMYDEC_INIT

    decDummy->hHrtfParambin = NULL;

    decDummy->hHeadTrackData = NULL;

    decDummy->hDirAC = NULL;

#endif

    decDummy->hTcBuffer = NULL;

    decDummy->hDecoderConfig->output_config = getIvasAudioConfigFromRendAudioConfig( outConfig );

    decDummy->nchan_transport = numTransChannels;
@@ -2504,7 +2502,6 @@ static DecoderDummy *initDecoderDummy( 
            decDummy->hHeadTrackData->Rmat_prev[i][i] = 1.0f;

        }



#ifdef FIX_482_DUMMYDEC_INIT

        set_zero( decDummy->hHeadTrackData->chEneIIR[0], MASA_FREQUENCY_BANDS );

        set_zero( decDummy->hHeadTrackData->chEneIIR[1], MASA_FREQUENCY_BANDS );

        set_zero( decDummy->hHeadTrackData->procChEneIIR[0], MASA_FREQUENCY_BANDS );
@@ -2516,7 +2513,6 @@ static DecoderDummy *initDecoderDummy( 
            decDummy->hHeadTrackData->Quaternions[i].y = 0.0f;

            decDummy->hHeadTrackData->Quaternions[i].z = 0.0f;

        }

#endif

        decDummy->hHeadTrackData->num_quaternions = 0;

        decDummy->hHeadTrackData->lrSwitchInterpVal = 0.0f;

        decDummy->hHeadTrackData->lrSwitchedCurrent = 0;