Commit a374784f authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_CREND_SIMPLIFY_CODE

parent 4e66cc1f

apps/decoder.c

+0 −1
Original line number Diff line number Diff line
@@ -1112,7 +1112,6 @@ static bool parseCmdlIVAS_dec( 
#ifdef OBJ_EDITING_EXAMPLE

    arg->objEditEnabled = false;

#endif

#





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

lib_com/options.h

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


/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */



#define FIX_CREND_SIMPLIFY_CODE                         /* Ora : simplify line code in crend */

#define TMP_FIX_1119_SPLIT_RENDERING_VOIP               /* FhG: Add error check for unsupported config: split rendering with VoIP mode */



#define FIX_POINT_HRTF_FILE_FORMAT                     /* All: fix point hrtf binary file format */

lib_rend/ivas_crend.c

+0 −25
Original line number Diff line number Diff line
@@ -1566,15 +1566,9 @@ static ivas_error ivas_rend_crendConvolver( 
    int32_t offset, offset_in, offset_diffuse;

    int16_t nchan_in, nchan_out;

    const float *pIn;

#ifdef FIX_CREND_SIMPLIFY_CODE

    const float *pFreq_filt_re, *pFreq_filt_im;

    float *pFreq_buf_re = NULL, *pFreq_buf_im = NULL;

    float *pFreq_buf2_re = NULL, *pFreq_buf2_im = NULL;

#else

    float *pFreq_buf_re, *pFreq_buf_im;

    float *pFreq_buf2_re, *pFreq_buf2_im;

    const float *pFreq_filt_re, *pFreq_filt_im;

#endif

    float pOut[L_FRAME48k * 2];

    float tmp_out_re[L_FRAME48k], tmp_out_im[L_FRAME48k];

    CREND_HANDLE hCrend;
@@ -1621,7 +1615,6 @@ static ivas_error ivas_rend_crendConvolver( 
        }

    }



#ifdef FIX_CREND_SIMPLIFY_CODE

    if ( pCrend->hHrtfCrend->num_iterations_diffuse[0] > 0 )

    {

        if ( pCrend->hHrtfCrend->same_inv_diffuse_weight )
@@ -1637,7 +1630,6 @@ static ivas_error ivas_rend_crendConvolver( 
            pFreq_buf2_im = &hCrend->freq_buffer_im_diffuse[1][offset_diffuse];

        }

    }

#endif



    i = 0;

    for ( idx_in = 0; idx_in < nchan_in; idx_in++ )
@@ -1649,10 +1641,6 @@ static ivas_error ivas_rend_crendConvolver( 
            {

                if ( pCrend->hHrtfCrend->same_inv_diffuse_weight )

                {

#ifndef FIX_CREND_SIMPLIFY_CODE

                    pFreq_buf_re = &hCrend->freq_buffer_re_diffuse[0][offset_diffuse];

                    pFreq_buf_im = &hCrend->freq_buffer_im_diffuse[0][offset_diffuse];

#endif

                    pFreq_filt_re = &hCrend->freq_buffer_re[i][offset];

                    pFreq_filt_im = &hCrend->freq_buffer_im[i][offset];
@@ -1664,12 +1652,6 @@ static ivas_error ivas_rend_crendConvolver( 
                }

                else

                {

#ifndef FIX_CREND_SIMPLIFY_CODE

                    pFreq_buf_re = &hCrend->freq_buffer_re_diffuse[0][offset_diffuse];

                    pFreq_buf_im = &hCrend->freq_buffer_im_diffuse[0][offset_diffuse];

                    pFreq_buf2_re = &hCrend->freq_buffer_re_diffuse[1][offset_diffuse];

                    pFreq_buf2_im = &hCrend->freq_buffer_im_diffuse[1][offset_diffuse];

#endif

                    pFreq_filt_re = &hCrend->freq_buffer_re[i][offset];

                    pFreq_filt_im = &hCrend->freq_buffer_im[i][offset];
@@ -1683,14 +1665,7 @@ static ivas_error ivas_rend_crendConvolver( 
                }

            }



#ifdef FIX_CREND_SIMPLIFY_CODE

            ivas_mdft( pIn, &hCrend->freq_buffer_re[i][offset], &hCrend->freq_buffer_im[i][offset], subframe_length, subframe_length );

#else

            pFreq_buf_re = &hCrend->freq_buffer_re[i][offset];

            pFreq_buf_im = &hCrend->freq_buffer_im[i][offset];



            ivas_mdft( pIn, pFreq_buf_re, pFreq_buf_im, subframe_length, subframe_length );

#endif

            i++;

        }

    }