Commit 426271f5 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'renderer_funcs_conv_some_float_cleanup' into 'main' 

renderer float dependencies cleanup, conversions of few functions to fixed

See merge request !300
parents 3af778b5 2bf0827c

lib_com/cnst.h

+1 −0
Original line number Diff line number Diff line
@@ -566,6 +566,7 @@ enum 


#define FRAMES_PER_SEC                      50

#ifdef IVAS_FLOAT_FIXED

#define MAX_PARAM__SPATIAL_SUB_FRAMES_PER_SEC              200 //(FRAMES_PER_SEC * MAX_PARAM_SPATIAL_SUBFRAMES)

#define ONE_BY_FRAMES_PER_SEC               ((Word32)(0x028F5C29))

#define FRAMES_PER_SEC_BY_2                 (FRAMES_PER_SEC >> 1)

#endif

lib_com/float_to_fix_ops.c

+7 −4
Original line number Diff line number Diff line
@@ -194,6 +194,13 @@ Word16 Q_factor_L(float x) 
        Q = norm_l(abs((Word32)x));

    return Q;

}

Word16 Q_factor_L_32( Word32 x )

{

    Word16 Q = 31;

    if ( x >= 1 || x <= -1 )

        Q = norm_l(L_abs( (Word32) x ) );

    return Q;

}

Word16 Q_factor_arr(float *x, Word16 l)

{

	Word16 Q = 15;
@@ -789,10 +796,6 @@ void stereo_tcx_dec_mode_switch_reconf_To_fixed_2( 
                //st->hFdCngDec->msPeriodog_ST_fx[p] = (Word32) ( st->hFdCngDec->msPeriodog_ST[p] * ( 1u << ( 31 - st->hFdCngDec->msPeriodog_ST_exp ) ) );

            }



           // st->hFdCngDec->hFdCngCom->cngNoiseLevelExp = 31 - Q4; // Q4

            //for ( int p = 0; p < FFTCLDFBLEN; p++ )

            //{

              //  st->hFdCngDec->hFdCngCom->cngNoiseLevel[p] = (Word32) ( st->hFdCngDec->hFdCngCom->cngNoiseLevel_flt[p] * ( 1u << ( 31 - st->hFdCngDec->hFdCngCom->cngNoiseLevelExp ) ) );

            //}

            //st->hFdCngDec->hFdCngCom->sidNoiseEstExp = 31 - Q4;

            //st->hFdCngDec->partNoiseShape_exp = 31 - Q4;

lib_com/ivas_prot.h

+6 −0
Original line number Diff line number Diff line
@@ -6485,9 +6485,15 @@ ivas_error ivas_binRenderer_open( 
);

#endif



#ifdef IVAS_FLOAT_FIXED

void ivas_binRenderer_close_fx(

    BINAURAL_RENDERER_HANDLE *hBinRenderer                      /* i/o: decoder binaural renderer handle                */

);

#else

void ivas_binRenderer_close(

    BINAURAL_RENDERER_HANDLE *hBinRenderer                      /* i/o: decoder binaural renderer handle                */

);

#endif



void ivas_binaural_hrtf_close(

    HRTFS_FASTCONV_HANDLE *hHrtfFastConv                        /* i/o: decoder binaural hrtf handle                    */

lib_com/prot_fx2.h

+2 −1
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ Word16 Q_factor(float x); 
Word16 Q_factor_L(float x);

Word16 Q_factor_arr(float* x, Word16 l);

Word16 Q_factor_arrL(float* x, Word16 l);

Word16 Q_factor_L_32( Word32 x );

    //Handles the cases where Q is negative

Word32 floatToFixed( float f, Word16 Q);

float fixedToFloat( Word32 i, Word16 Q);

lib_dec/ivas_binRenderer_internal.c

+218 −691

File changed.

Preview size limit exceeded, changes collapsed.