Commit d83c359d authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'ivas_rend_crendprocesssubframe_fxd' into 'main' 

ivas_rend_crendprocesssubframe converted to fixed point.

See merge request !127
parents 8e0ff68c 68765595

lib_com/cnst.h

+1 −1
Original line number Diff line number Diff line
@@ -1967,7 +1967,7 @@ typedef enum _DCTTYPE 
#define INV_PREECHO_SMOOTH_LENP1            ( 1 / ( PREECHO_SMOOTH_LEN + 1.0 ) );



#define EPSILON                             0.000000000000001f

#define EPSILON_fx                          0

#define EPSILON_FX                          0



#define MAX_SEGMENT_LENGTH                  480

#define NUM_TIME_SWITCHING_BLOCKS           4

lib_dec/ivas_jbm_dec.c

+481 −277

File changed.

Preview size limit exceeded, changes collapsed.

lib_rend/ivas_crend.c

+37 −152

File changed.

Preview size limit exceeded, changes collapsed.

lib_rend/ivas_prot_rend.h

+24 −1

File changed.

Preview size limit exceeded, changes collapsed.

lib_rend/ivas_reflections.c

+4 −4
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ ivas_error ivas_er_compute_reflections( 
#ifdef IVAS_FLOAT_FIXED

    for ( i = 0; i < 150; i++ )

    {

       reflections->shoebox_data.gains.data_fx[i] = (Word32) float_to_fix( reflections->shoebox_data.gains.data[i], 15 );

       reflections->shoebox_data.gains.data_fx[i] = (Word32)( reflections->shoebox_data.gains.data[i]*ONE_IN_Q31);

    }

    if ( reflections->circ_buffers )

    {
@@ -472,7 +472,7 @@ ivas_error ivas_er_process( 
    UWord16 ref_no, ref_delay;

    UWord16 n_ref_sources, n_ref;

    Word16 samp_idx, in_ch_idx, buf_ch_idx, ref_out_idx;

    Word16 ref_gain;

    Word32 ref_gain;

    Word32 *buffer_ch;

    Word32 temp;
@@ -555,7 +555,7 @@ ivas_error ivas_er_process( 
        for ( j = 0; j < n_ref; j++ )

        {

            ref_no = j + ( i * n_ref );

            ref_gain = (Word16) reflections->shoebox_data.gains.data_fx[ref_no];

            ref_gain = (Word32) reflections->shoebox_data.gains.data_fx[ref_no];

            ref_delay = (UWord16) reflections->shoebox_data.times.data[ref_no];

            ref_out_idx = reflections->closest_ch_idx[ref_no];
@@ -570,7 +570,7 @@ ivas_error ivas_er_process( 
            /* Pull reflection from circ buffer and apply gain */

            for ( k = 0; k < subframe_size; k++ )

            {

                temp = Mpy_32_16_r( buffer_ch[samp_idx], ref_gain );

                temp = Mpy_32_32( buffer_ch[samp_idx], ref_gain );

                io[ref_out_idx][k + subframe_offset] = L_add( temp, io[ref_out_idx][k + subframe_offset] );

                samp_idx++;

                samp_idx = samp_idx % reflections->circ_len;