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

Removed unnecessary change within unpackAcousticEnvironment

parent 466648a7

lib_util/ivas_rtp_pi_data.c

+0 −41
Original line number Original line Diff line number Diff line
@@ -296,46 +296,6 @@ static ivas_error unpackAcousticEnvironment( const uint8_t *buffer, uint32_t num 
        }

        }

        dWord <<= ( 8 - numDataBytes ) * 8;

        dWord <<= ( 8 - numDataBytes ) * 8;





#ifdef IVAS_RTPDUMP_ACOUSTIC_ENVIRONMENT

        uint32_t offset = numDataBytes * 8;

        offset -= NBITS_AEID;

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

        offset -= NBITS_RT60;

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

        offset -= NBITS_DSR;

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

        offset -= NBITS_RT60;

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

        offset -= NBITS_DSR;

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

        offset -= NBITS_RT60;

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

        offset -= NBITS_DSR;

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



        if (aeEnv->availEarlyReflections)

        {

            offset -= NBITS_DIM;

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

            offset -= NBITS_DIM;

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

            offset -= NBITS_DIM;

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



            offset -= NBITS_ABS;

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

            offset -= NBITS_ABS;

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

            offset -= NBITS_ABS;

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

            offset -= NBITS_ABS;

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

            offset -= NBITS_ABS;

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

            offset -= NBITS_ABS;

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

        }

#else

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

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

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

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

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

        aeEnv->dsr[IVAS_PI_AE_LOW] = mapDSR[( dWord >> 46 ) & MASK_DSR];
@@ -354,7 +314,6 @@ static ivas_error unpackAcousticEnvironment( const uint8_t *buffer, uint32_t num 
        aeEnv->absorbCoeffs[IVAS_PI_AE_RIGHT] = mapAbsorbtion[( dWord >> 4 ) & MASK_ABS];

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

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

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

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

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

#endif

    }

    }





    return IVAS_ERR_OK;

    return IVAS_ERR_OK;