Unverified Commit db771234 authored by norvell's avatar norvell
Browse files

Replaced literals in distance attenuation init with constants

parent 31a3c891

lib_com/ivas_cnst.h

+5 −0
Original line number Diff line number Diff line
@@ -1588,6 +1588,11 @@ typedef enum 
#define RESAMPLE_FACTOR_16_48_FX                ( 5461 )  // Q14

#define RESAMPLE_FACTOR_32_48_FX                ( 10922 ) // Q14



#ifdef FIX_BASOP_2023_TDREND_DISTATT_PRECISION

#define DIST_ATT_DEFAULT_MAXDIST_Q25 528482304 /* Q25 */                      /* Default maxDist based on maximum radius in encoded metadata (2^ISM_RADIUS_NBITS-1)*0.25 */ 

#define DIST_ATT_DEFAULT_REFDIST_Q28 ONE_IN_Q28 /* Q28 */                     /* Default refDist 1.0 in Q28 */                                      

#define DIST_ATT_DEFAULT_ROLLOFF_Q28 ONE_IN_Q28 /* Q28 */                     /* Default rolloffFactor 1.0 in Q28 */                                      

#endif



/* ----- Enums - TD Renderer ----- */

lib_rend/ivas_objectRenderer_fx.c

+6 −6
Original line number Diff line number Diff line
@@ -203,11 +203,11 @@ ivas_error ivas_td_binaural_open_unwrap_fx( 
            DistAtten.DistAttenModel = TDREND_DIST_ATTEN_MODEL_INV_DIST_CLAMPED; // Q0

            move16();

#ifdef FIX_BASOP_2023_TDREND_DISTATT_PRECISION

            DistAtten.MaxDist_fx = 528482304; /* Maximum radius (2^ISM_RADIUS_NBITS-1)*0.25 */ /*15.75 in Q25*/

            DistAtten.MaxDist_fx = DIST_ATT_DEFAULT_MAXDIST_Q25; /* Maximum radius (2^ISM_RADIUS_NBITS-1)*0.25 */ /*15.75 in Q25*/

            move32();

            DistAtten.RefDist_fx = ONE_IN_Q28; // Q28

            DistAtten.RefDist_fx = DIST_ATT_DEFAULT_REFDIST_Q28; // Q28

            move32();

            DistAtten.RollOffFactor_fx = ONE_IN_Q28; // Q28

            DistAtten.RollOffFactor_fx = DIST_ATT_DEFAULT_ROLLOFF_Q28; // Q28

            move32();

#else

            DistAtten.MaxDist_fx = 2113929216; /* Maximum radius (2^ISM_RADIUS_NBITS-1)*0.25 */ /*15.75 in Q27*/
@@ -272,11 +272,11 @@ ivas_error ivas_td_binaural_open_unwrap_fx( 
                DistAtten.DistAttenModel = TDREND_DIST_ATTEN_MODEL_INV_DIST_CLAMPED; // Q0

                move16();

#ifdef FIX_BASOP_2023_TDREND_DISTATT_PRECISION

                DistAtten.MaxDist_fx = 528482304; /* Maximum radius (2^ISM_RADIUS_NBITS-1)*0.25 */ /*15.75 in Q25*/

                DistAtten.MaxDist_fx = DIST_ATT_DEFAULT_MAXDIST_Q25; /* Maximum radius (2^ISM_RADIUS_NBITS-1)*0.25 */ /*15.75 in Q25*/

                move32();

                DistAtten.RefDist_fx = ONE_IN_Q28; // Q28

                DistAtten.RefDist_fx = DIST_ATT_DEFAULT_REFDIST_Q28; // Q28

                move32();

                DistAtten.RollOffFactor_fx = ONE_IN_Q28; // Q28

                DistAtten.RollOffFactor_fx = DIST_ATT_DEFAULT_ROLLOFF_Q28; // Q28

                move32();

#else

                DistAtten.MaxDist_fx = 2113929216; /* Maximum radius (2^ISM_RADIUS_NBITS-1)*0.25 */ /*15.75 in Q27*/

lib_rend/ivas_objectRenderer_sources_fx.c

+3 −3
Original line number Diff line number Diff line
@@ -672,11 +672,11 @@ static void TDREND_SRC_SPATIAL_Init_fx( 
    SrcSpatial_p->DistAtten.DistAttenModel = TDREND_DIST_ATTEN_MODEL_INV_DIST_CLAMPED; // Q0

    move16();

#ifdef FIX_BASOP_2023_TDREND_DISTATT_PRECISION

    SrcSpatial_p->DistAtten.RefDist_fx = ONE_IN_Q28; // Q28

    SrcSpatial_p->DistAtten.RefDist_fx = DIST_ATT_DEFAULT_REFDIST_Q28; // Q28

    move32();

    SrcSpatial_p->DistAtten.MaxDist_fx = 528482304; /* Maximum radius (2^ISM_RADIUS_NBITS-1)*0.25 */ /*15.75 in Q25*/

    SrcSpatial_p->DistAtten.MaxDist_fx = DIST_ATT_DEFAULT_MAXDIST_Q25; /* Maximum radius (2^ISM_RADIUS_NBITS-1)*0.25 */ /*15.75 in Q25*/

    move32();

    SrcSpatial_p->DistAtten.RollOffFactor_fx = ONE_IN_Q28; // Q28

    SrcSpatial_p->DistAtten.RollOffFactor_fx = DIST_ATT_DEFAULT_ROLLOFF_Q28; // Q28

    move16();

#else

    SrcSpatial_p->DistAtten.RefDist_fx = ONE_IN_Q30; // Q30

lib_rend/ivas_render_config_fx.c

+3 −3
Original line number Diff line number Diff line
@@ -153,11 +153,11 @@ ivas_error ivas_render_config_init_from_rom_fx( 
        move16();

    }

#ifdef FIX_BASOP_2023_TDREND_DISTATT_PRECISION

    ( *hRenderConfig )->distAtt_fx[0] = 528482304; /* Maximum radius (2^ISM_RADIUS_NBITS-1)*0.25 */ /*15.75 in Q25*/ /* Default max dist */

    ( *hRenderConfig )->distAtt_fx[0] = DIST_ATT_DEFAULT_MAXDIST_Q25; /* Maximum radius (2^ISM_RADIUS_NBITS-1)*0.25 */ /*15.75 in Q25*/ /* Default max dist */

    move32();

    ( *hRenderConfig )->distAtt_fx[1] = ONE_IN_Q28; // Q28   /* Default ref dist */

    ( *hRenderConfig )->distAtt_fx[1] = DIST_ATT_DEFAULT_REFDIST_Q28; // Q28   /* Default ref dist */

    move32();

    ( *hRenderConfig )->distAtt_fx[2] = ONE_IN_Q28; // Q28   /* Default rolloff factor */

    ( *hRenderConfig )->distAtt_fx[2] = DIST_ATT_DEFAULT_ROLLOFF_Q28; // Q28   /* Default rolloff factor */

    move32();

#else

    ( *hRenderConfig )->distAtt_fx[0] = 2113929216; /* Maximum radius (2^ISM_RADIUS_NBITS-1)*0.25 */ /*15.75 in Q27*/ /* Default max dist */