Unverified Commit 5cad16d3 authored by norvell's avatar norvell
Browse files

Align RenderConfigReader_checkValues between BASOP/float

parent 6ac0c003

lib_util/render_config_reader.c

+4 −13
Original line number Diff line number Diff line
@@ -1237,7 +1237,7 @@ ivas_error RenderConfigReader_checkValues( 
{

    int16_t band_idx, tab_value_err_count;

    int16_t wall_idx;

    uint32_t n, i;

    int16_t n, i;



    tab_value_err_count = 0;
@@ -1353,21 +1353,12 @@ ivas_error RenderConfigReader_checkValues( 
        pRenderConfigReader->distAtt[2] = 1.0f;

    }



    /* Verify range of distance attenuation parameters */

#ifdef FIX_BASOP_2023_TDREND_DISTATT_PRECISION

    /* refDist:       0.0 <= distAtt[1] <= 6.3         */

    /* Verify range of distance attenuation parameters: refDist:       0.0 <= distAtt[1] <= 6.3         */

    /*                                                  maxDist:       distAtt[1] <= distAtt[0] <= 63.0 */

    /*                                                  rollOffFactor: 0 <= distAtt[2] <= 4.0           */

    pRenderConfigReader->distAtt[1] = min( max( 0, pRenderConfigReader->distAtt[1] ), DIST_ATT_MAX_REFDIST );

    pRenderConfigReader->distAtt[0] = min( max( pRenderConfigReader->distAtt[1], pRenderConfigReader->distAtt[0] ), DIST_ATT_MAX_MAXDIST );

    pRenderConfigReader->distAtt[2] = min( max( 0.0f, pRenderConfigReader->distAtt[2] ), DIST_ATT_MAX_ROLLOFF );

#else

    /* 0.1 <= distAtt[0] <= distAtt[1] */

    /* 0.0 <= distAtt[2] <= 10.0       */

    pRenderConfigReader->distAtt[0] = max( 0.1f, pRenderConfigReader->distAtt[0] );

    pRenderConfigReader->distAtt[1] = max( pRenderConfigReader->distAtt[0], pRenderConfigReader->distAtt[1] );

    pRenderConfigReader->distAtt[2] = max( 0.0f, min( 10.0f, pRenderConfigReader->distAtt[2] ) );

#endif



    /* Verify range of directivity patterns */

    for ( i = 0; i < pRenderConfigReader->nDP; i++ )