Commit 28ced4cc authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Fixes issue 482

parent b5bfd17c

lib_com/options.h

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


#define HYBRID_ITD_MAX                                 /* FhG: Improvement for DFT-stereo for cases with large ITDs */



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



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

/* clang-format on */

lib_rend/lib_rend.c

+18 −0
Original line number Diff line number Diff line
@@ -2495,6 +2495,11 @@ 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

#ifdef JBM_TSM_ON_TCS

    decDummy->hTcBuffer = NULL;

#endif
@@ -2511,6 +2516,19 @@ 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 );

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

        for ( i = 0; i < MAX_PARAM_SPATIAL_SUBFRAMES; i++ )

        {

            decDummy->hHeadTrackData->Quaternions[i].w = 1.0f;

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

            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;