Commit 9d43551e authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'Q_info_dec_renderer_3' into 'main' 

Q-information update for lib_dec and lib_rend files [allow regression]

See merge request !707
parents 074e9116 26f383a1

lib_com/common_api_types.h

+7 −7
Original line number Diff line number Diff line
@@ -119,13 +119,13 @@ typedef struct _IVAS_ENC_CHANNEL_AWARE_CONFIG 
typedef struct _IVAS_ISM_METADATA

{

#ifdef IVAS_FLOAT_FIXED

    Word32 azimuth_fx;

    Word32 elevation_fx;

    Word16 radius_fx;

    Word32 spread_fx;

    Word32 gainFactor_fx;

    Word32 yaw_fx;

    Word32 pitch_fx;

    Word32 azimuth_fx;    /* Q22 */

    Word32 elevation_fx;  /* Q22 */

    Word16 radius_fx;     /* Q9 */

    Word32 spread_fx;     /* Q22 */

    Word32 gainFactor_fx; /* Q31 */

    Word32 yaw_fx;        /* Q22 */

    Word32 pitch_fx;      /* Q22 */

#endif

    float azimuth;

    float elevation;

lib_com/ivas_prot.h

+5 −5
Original line number Diff line number Diff line
@@ -7570,11 +7570,11 @@ void panning_wrap_angles( 
    float *ele_wrapped                                          /* o  : wrapped elevation component                              */

);

#ifdef IVAS_FLOAT_FIXED

void panning_wrap_angles_fixed(

    const Word32 azi_deg, /* i  : azimuth in degrees for panning direction (positive left) */

    const Word32 ele_deg, /* i  : elevation in degrees for panning direction (positive up) */

    Word32 *azi_wrapped,  /* o  : wrapped azimuth component                                */

    Word32 *ele_wrapped   /* o  : wrapped elevation component                              */

void panning_wrap_angles_fx(

    const Word32 azi_deg, /* i  : azimuth in degrees for panning direction (positive left) Q22 */

    const Word32 ele_deg, /* i  : elevation in degrees for panning direction (positive up) Q22 */

    Word32 *azi_wrapped,  /* o  : wrapped azimuth component                                Q22 */

    Word32 *ele_wrapped   /* o  : wrapped elevation component                              Q22 */

);

#endif

void v_sort_ind(

lib_com/ivas_tools.c

+10 −11
Original line number Diff line number Diff line
@@ -2938,8 +2938,8 @@ static float wrap_azi( 
}

#ifdef IVAS_FLOAT_FIXED

/* helper function for panning_wrap_angles */

static Word32 wrap_azi_fixed(

    const Word32 azi_deg )

static Word32 wrap_azi_fx(

    const Word32 azi_deg /* Q22 */ )

{

    Word32 azi = azi_deg;

    move32();
@@ -3027,19 +3027,18 @@ void panning_wrap_angles( 
}

#ifdef IVAS_FLOAT_FIXED

/*-------------------------------------------------------------------*

 * panning_wrap_angles_fixed()

 * panning_wrap_angles_fx()

 *

 * Wrap angles for amplitude panning to the range:

 * azimuth = (-180, 180]

 * elevation = [-90, 90]

 * Considers direction changes from large elevation values

 *-------------------------------------------------------------------*/

void panning_wrap_angles_fixed(

    const Word32 azi_deg, /* i  : azimuth in degrees for panning direction (positive left) */

    const Word32 ele_deg, /* i  : elevation in degrees for panning direction (positive up) */

    Word32 *azi_wrapped,  /* o  : wrapped azimuth component                                */

    Word32 *ele_wrapped   /* o  : wrapped elevation component                              */



void panning_wrap_angles_fx(

    const Word32 azi_deg, /* i  : azimuth in degrees for panning direction (positive left) Q22 */

    const Word32 ele_deg, /* i  : elevation in degrees for panning direction (positive up) Q22 */

    Word32 *azi_wrapped,  /* o  : wrapped azimuth component                                Q22 */

    Word32 *ele_wrapped   /* o  : wrapped elevation component                              Q22 */

)

{

    Word32 azi, ele;
@@ -3053,7 +3052,7 @@ void panning_wrap_angles_fixed( 
    {

        *ele_wrapped = ele;

        move32();

        *azi_wrapped = wrap_azi_fixed( azi );

        *azi_wrapped = wrap_azi_fx( azi );

        move32();

        return;

    }
@@ -3093,7 +3092,7 @@ void panning_wrap_angles_fixed( 
                    ele = L_sub( -ANGLE_180_DEG_Q22, ele );

                }

            }

            *azi_wrapped = wrap_azi_fixed( azi );

            *azi_wrapped = wrap_azi_fx( azi );

            move32();

            *ele_wrapped = ele;

            move32();

lib_com/tools.c

+3 −3
Original line number Diff line number Diff line
@@ -1101,8 +1101,8 @@ float dotp( 


/*! r: dot product of x[] and y[] */

Word32 dotp_fixed(

    const Word32 x[], /* i  : vector x[]                    */

    const Word32 y[], /* i  : vector y[]                    */

    const Word32 x[], /* i  : vector x[]                Qx */

    const Word32 y[], /* i  : vector y[]                Qy */

    const Word16 n    /* i  : vector length                */

)

{

lib_dec/lead_deindexing_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ static void fcb_decode_pos_fx( 
    FOR( i = 0; i < tmp_loop; i++ )

    {

        select_table23 = select_table22[temp1];

        select_table24 = &select_table23[sub( pulse_num, l )];

        select_table24 = &select_table23[pulse_num - l];



        k = sub( *select_table24, k );

        WHILE( LE_16( k, *select_table24 ) )
@@ -286,7 +286,7 @@ static void fcb_decode_pos_fx( 
            select_table24--;

        }



        k = sub( select_table23[sub( temp2, l )], k );

        k = sub( select_table23[temp2 - l], k );

        pos_vector[i] = sub( l, 1 );

        move16();

        temp1 = sub( temp1, 1 );