Commit fdbe8354 authored by Marek Szczerba's avatar Marek Szczerba
Browse files

And copying the right data...

parent 07a2c5fb

lib_dec/lib_dec.c

+17 −17
Original line number Diff line number Diff line
@@ -3367,28 +3367,28 @@ ivas_error IVAS_DEC_AddAcousticEnvironment( 
        for ( n = 0; n < st_ivas->acousticEnvironmentsCount; n++ )

        {

            pAE = &ppAE[n];

            pAE->aeID = roomAcousticsConfig.aeID;

            pAE->nBands = roomAcousticsConfig.nBands;

            pAE->acousticPreDelay = roomAcousticsConfig.acousticPreDelay;

            pAE->inputPreDelay = roomAcousticsConfig.inputPreDelay;

            pAE->aeID = st_ivas->pAcousticEnvironments[n].aeID;

            pAE->nBands = st_ivas->pAcousticEnvironments[n].nBands;

            pAE->acousticPreDelay = st_ivas->pAcousticEnvironments[n].acousticPreDelay;

            pAE->inputPreDelay = st_ivas->pAcousticEnvironments[n].inputPreDelay;



            mvr2r( roomAcousticsConfig.pFc_input, pAE->pFc_input, CLDFB_NO_CHANNELS_MAX );

            mvr2r( roomAcousticsConfig.pAcoustic_rt60, pAE->pAcoustic_rt60, CLDFB_NO_CHANNELS_MAX );

            mvr2r( roomAcousticsConfig.pAcoustic_dsr, pAE->pAcoustic_dsr, CLDFB_NO_CHANNELS_MAX );

            mvr2r( st_ivas->pAcousticEnvironments[n].pFc_input, pAE->pFc_input, CLDFB_NO_CHANNELS_MAX );

            mvr2r( st_ivas->pAcousticEnvironments[n].pAcoustic_rt60, pAE->pAcoustic_rt60, CLDFB_NO_CHANNELS_MAX );

            mvr2r( st_ivas->pAcousticEnvironments[n].pAcoustic_dsr, pAE->pAcoustic_dsr, CLDFB_NO_CHANNELS_MAX );



            pAE->use_er = roomAcousticsConfig.use_er;

            pAE->use_er = st_ivas->pAcousticEnvironments[n].use_er;



            if ( pAE->use_er == 1 )

            {

                pAE->lowComplexity = roomAcousticsConfig.lowComplexity;

                pAE->dimensions.x = roomAcousticsConfig.dimensions.x;

                pAE->dimensions.y = roomAcousticsConfig.dimensions.y;

                pAE->dimensions.z = roomAcousticsConfig.dimensions.z;

                pAE->ListenerOrigin.x = roomAcousticsConfig.ListenerOrigin.x;

                pAE->ListenerOrigin.y = roomAcousticsConfig.ListenerOrigin.y;

                pAE->ListenerOrigin.z = roomAcousticsConfig.ListenerOrigin.z;

                pAE->lowComplexity = st_ivas->pAcousticEnvironments[n].lowComplexity;

                pAE->dimensions.x = st_ivas->pAcousticEnvironments[n].dimensions.x;

                pAE->dimensions.y = st_ivas->pAcousticEnvironments[n].dimensions.y;

                pAE->dimensions.z = st_ivas->pAcousticEnvironments[n].dimensions.z;

                pAE->ListenerOrigin.x = st_ivas->pAcousticEnvironments[n].ListenerOrigin.x;

                pAE->ListenerOrigin.y = st_ivas->pAcousticEnvironments[n].ListenerOrigin.y;

                pAE->ListenerOrigin.z = st_ivas->pAcousticEnvironments[n].ListenerOrigin.z;



                mvr2r( roomAcousticsConfig.AbsCoeff, pAE->AbsCoeff, IVAS_ROOM_ABS_COEFF );

                mvr2r( st_ivas->pAcousticEnvironments[n].AbsCoeff, pAE->AbsCoeff, IVAS_ROOM_ABS_COEFF );

            }

        }