Commit 89cde47d authored by Marek Szczerba's avatar Marek Szczerba
Browse files

And copying the right data...

parent 1940c7c4

lib_dec/lib_dec_fx.c

+16 −16
Original line number Diff line number Diff line
@@ -3041,16 +3041,16 @@ 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_fx = roomAcousticsConfig.acousticPreDelay_fx;

            pAE->inputPreDelay_fx = roomAcousticsConfig.inputPreDelay_fx;

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

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

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

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



            Copy32( roomAcousticsConfig.pFc_input_fx, pAE->pFc_input_fx, CLDFB_NO_CHANNELS_MAX );           // Q16

            Copy32( roomAcousticsConfig.pAcoustic_rt60_fx, pAE->pAcoustic_rt60_fx, CLDFB_NO_CHANNELS_MAX ); // Q26

            Copy32( roomAcousticsConfig.pAcoustic_dsr_fx, pAE->pAcoustic_dsr_fx, CLDFB_NO_CHANNELS_MAX );   // Q30

            Copy32( st_ivas->pAcousticEnvironments[n].pFc_input_fx, pAE->pFc_input_fx, CLDFB_NO_CHANNELS_MAX ); // Q16

            Copy32( st_ivas->pAcousticEnvironments[n].pAcoustic_rt60_fx, pAE->pAcoustic_rt60_fx, CLDFB_NO_CHANNELS_MAX ); // Q26

            Copy32( st_ivas->pAcousticEnvironments[n].pAcoustic_dsr_fx, pAE->pAcoustic_dsr_fx, CLDFB_NO_CHANNELS_MAX );   // Q30



            pAE->use_er = roomAcousticsConfig.use_er;

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



            move16();

            move16();
@@ -3060,24 +3060,24 @@ ivas_error IVAS_DEC_AddAcousticEnvironment( 


            IF( EQ_16( pAE->use_er, 1 ) )

            {

                pAE->lowComplexity = roomAcousticsConfig.lowComplexity;

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

                move32();



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

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

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

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

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

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

                move32();

                move32();

                move32();



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

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

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

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

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

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

                move32();

                move32();

                move32();



                Copy32( roomAcousticsConfig.AbsCoeff_fx, pAE->AbsCoeff_fx, IVAS_ROOM_ABS_COEFF );

                Copy32( st_ivas->pAcousticEnvironments[n].AbsCoeff_fx, pAE->AbsCoeff_fx, IVAS_ROOM_ABS_COEFF );

            }

        }