Commit 94592af3 authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Minor refactoring

parent 9986b65e

lib_util/ivas_rtp_pi_data.c

+16 −16
Original line number Diff line number Diff line
@@ -298,42 +298,42 @@ static ivas_error unpackAcousticEnvironment( const uint8_t *buffer, uint32_t num 


#ifdef IVAS_RTPDUMP_ACOUSTIC_ENVIRONMENT

        uint32_t offset = numDataBytes * 8;

        aeEnv->aeid = (uint8_t) ( ( dWord >> ( offset - 7 ) ) & MASK_AEID );

        offset -= 7;

        aeEnv->rt60[IVAS_PI_AE_LOW] = mapRT60[( dWord >> ( offset - 5 ) ) & MASK_RT60];

        aeEnv->aeid = (uint8_t) ( ( dWord >> offset ) & MASK_AEID );

        offset -= 5;

        aeEnv->dsr[IVAS_PI_AE_LOW] = mapDSR[( dWord >> ( offset - 6 ) ) & MASK_DSR];

        aeEnv->rt60[IVAS_PI_AE_LOW] = mapRT60[( dWord >> offset ) & MASK_RT60];

        offset -= 6;

        aeEnv->rt60[IVAS_PI_AE_MID] = mapRT60[( dWord >> ( offset - 5 ) ) & MASK_RT60];

        aeEnv->dsr[IVAS_PI_AE_LOW] = mapDSR[( dWord >> offset ) & MASK_DSR];

        offset -= 5;

        aeEnv->dsr[IVAS_PI_AE_MID] = mapDSR[( dWord >> ( offset - 6 ) ) & MASK_DSR];

        aeEnv->rt60[IVAS_PI_AE_MID] = mapRT60[( dWord >> offset ) & MASK_RT60];

        offset -= 6;

        aeEnv->rt60[IVAS_PI_AE_HIGH] = mapRT60[( dWord >> ( offset - 5 ) ) & MASK_RT60];

        aeEnv->dsr[IVAS_PI_AE_MID] = mapDSR[( dWord >> offset ) & MASK_DSR];

        offset -= 5;

        aeEnv->dsr[IVAS_PI_AE_HIGH] = mapDSR[( dWord >> ( offset - 6 ) ) & MASK_DSR];

        aeEnv->rt60[IVAS_PI_AE_HIGH] = mapRT60[( dWord >> offset ) & MASK_RT60];

        offset -= 6;

        aeEnv->dsr[IVAS_PI_AE_HIGH] = mapDSR[( dWord >> offset ) & MASK_DSR];



        if (aeEnv->availEarlyReflections)

        {

            aeEnv->roomDimensions.x = mapRoomDims[( dWord >> ( offset - 4 ) ) & MASK_DIM];

            offset -= 4;

            aeEnv->roomDimensions.y = mapRoomDims[( dWord >> ( offset - 4 ) ) & MASK_DIM];

            aeEnv->roomDimensions.x = mapRoomDims[( dWord >> offset ) & MASK_DIM];

            offset -= 4;

            aeEnv->roomDimensions.z = mapRoomDims[( dWord >> ( offset - 4 ) ) & MASK_DIM];

            aeEnv->roomDimensions.y = mapRoomDims[( dWord >> offset ) & MASK_DIM];

            offset -= 4;

            aeEnv->roomDimensions.z = mapRoomDims[( dWord >> offset ) & MASK_DIM];



            aeEnv->absorbCoeffs[IVAS_PI_AE_FRONT] = mapAbsorbtion[( dWord >> ( offset - 2 ) ) & MASK_ABS];

            offset -= 2;

            aeEnv->absorbCoeffs[IVAS_PI_AE_BACK] = mapAbsorbtion[( dWord >> ( offset - 2 ) ) & MASK_ABS];

            aeEnv->absorbCoeffs[IVAS_PI_AE_FRONT] = mapAbsorbtion[( dWord >> offset ) & MASK_ABS];

            offset -= 2;

            aeEnv->absorbCoeffs[IVAS_PI_AE_LEFT] = mapAbsorbtion[( dWord >> ( offset - 2 ) ) & MASK_ABS];

            aeEnv->absorbCoeffs[IVAS_PI_AE_BACK] = mapAbsorbtion[( dWord >> offset ) & MASK_ABS];

            offset -= 2;

            aeEnv->absorbCoeffs[IVAS_PI_AE_RIGHT] = mapAbsorbtion[( dWord >> ( offset - 2 ) ) & MASK_ABS];

            aeEnv->absorbCoeffs[IVAS_PI_AE_LEFT] = mapAbsorbtion[( dWord >> offset ) & MASK_ABS];

            offset -= 2;

            aeEnv->absorbCoeffs[IVAS_PI_AE_CEILING] = mapAbsorbtion[( dWord >> ( offset - 2 ) ) & MASK_ABS];

            aeEnv->absorbCoeffs[IVAS_PI_AE_RIGHT] = mapAbsorbtion[( dWord >> offset ) & MASK_ABS];

            offset -= 2;

            aeEnv->absorbCoeffs[IVAS_PI_AE_FLOOR] = mapAbsorbtion[( dWord >> ( offset - 2 ) ) & MASK_ABS];

            aeEnv->absorbCoeffs[IVAS_PI_AE_CEILING] = mapAbsorbtion[( dWord >> offset ) & MASK_ABS];

            offset -= 2;

            aeEnv->absorbCoeffs[IVAS_PI_AE_FLOOR] = mapAbsorbtion[( dWord >> offset ) & MASK_ABS];

        }

#else

        aeEnv->aeid = (uint8_t) ( ( dWord >> 57 ) & MASK_AEID );