Commit 7f6eb74a authored by Andrea Genovese's avatar Andrea Genovese
Browse files

fixed use_er initialization and warnings

parent 6e92cb75

lib_rend/ivas_reflections.c

+1 −1
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ ivas_error er_encoder_init( 
        return error;

    }



    if ( getAudioConfigType( reflections->mode ) == IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED )

    if (getAudioConfigType(getRendAudioConfigFromIvasAudioConfig(reflections->mode)) == IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED )

    {

        /* Compute MC-snap location (closest channel position to reflection direction) */

        for ( i = 0; i < reflections->n_total_reflections; i++ )

lib_util/render_config_reader.c

+2 −1
Original line number Diff line number Diff line
@@ -2884,7 +2884,6 @@ ivas_error RenderConfigReader_getAcousticEnvironment( 
        {

            pAcEnv->nBands = (int16_t) pRenderConfigReader->pAE[n].pFG->nrBands;

            pAcEnv->inputPreDelay = pRenderConfigReader->pAE[n].preDelay;



            for ( m = 0; m < pAcEnv->nBands; m++ )

            {

                pAcEnv->pFc_input[m] = pRenderConfigReader->pAE[n].pFG->pFc[m];
@@ -2893,6 +2892,8 @@ ivas_error RenderConfigReader_getAcousticEnvironment( 
            }



#ifdef EARLY_REFLECTIONS

            pAcEnv->use_er = 0;

            /* If ER are allocated then propagate parameters */

            if ( pRenderConfigReader->pAE[n].pEarlyReflections != 0 )

            {

                pAcEnv->use_er = pRenderConfigReader->pAE[n].pEarlyReflections->use_er;               /* ER activation flag */