Commit 5b6f3912 authored by Jouni Paulus's avatar Jouni Paulus
Browse files

Merge branch... 

Merge branch '482-uninitialized-members-in-decdummy-breaking-external-renderer-masa-binaural-output' into 'main'

Resolve #482 "Uninitialized members in decDummy breaking external renderer MASA binaural output"

See merge request !660
parents efb96ffc 7d66ae40

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ 
#define FIX_490_MASA_2TC_LBR_DTX                        /* Nokia: Fixes issue 490 by correcting condition. */



#define FIX_HBR_MASAMETA                                /* Nokia: Fixes to HBR MASA metadata at 384 and 512 kbps. Addresses issues 438 and 477 as well. */

#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
@@ -2481,6 +2481,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
@@ -2497,6 +2502,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;