Commit 3fc19ec9 authored by emerit's avatar emerit
Browse files

change switch name put back same as float repo

parent 54dc316a

lib_com/ivas_prot.h

+1 −1
Original line number Diff line number Diff line
@@ -2958,7 +2958,7 @@ int16_t check_bounds_s( 
    const int16_t high                                          /* i  : High limit                              */

);



#ifdef FIX_1440_PORT_1202_FROM_FLT_REPO

#ifdef FIX_CRASH_LONG_BRIR

void set_zero_l(

    float *vec,         /* o  : input vector                                    */

    const uint32_t lvec /* i  : length of the vector                            */

lib_com/ivas_tools.c

+1 −1
Original line number Diff line number Diff line
@@ -581,7 +581,7 @@ int16_t check_bounds_s( 
    return value_adj;

}



#ifdef FIX_1440_PORT_1202_FROM_FLT_REPO

#ifdef FIX_CRASH_LONG_BRIR

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

 * set_zero_l()

 *

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,6 @@ 
#define NONBE_FIX_GSC_BSTR                              /* VA: issue 1264 FLP (1189 BASOP): Fix bitstream synchronization between encoder and decoder in ACELP GSC in OMASA */

#define NONBE_FIX_1277_EVS_DTX_HIGH_RATE_THRESHOLD      /* VA/Eri: FLP issue 1277: Fix Mismatch in DTX high-rate threshold between EVS float and BASOP */

#define NONBE_FIX_708_OSBA_BR_SWITCHING_CRASH           /* FhG: issue 708: fix crash in OSBA BR switching with long test vectors */

#define FIX_1440_PORT_1202_FROM_FLT_REPO                /* Orange : Fix crash when long BRIR is set */



#define NONBE_1319_M2R_PRECISION_ALIGN                  /* Nokia: bring updates from PC code related to OMASA masa2total ratios */
@@ -209,6 +208,7 @@ 
#define FIX_910_REMOVE_DUPLICATION_TD_REND              /* VA: issue 910: remove duplication of function ivas_td_binaural_renderer() */

#define FIX_940_DEBUGGING_VARIABLE                      /* Nokia: issue #940: remove debugging variable */

#define NONBE_FIX_931_IGF_STEREO_DEC_NOISE	                  /* FhG: issue #931: fix noise substitution in the stereo IGF decoder      */

#define FIX_CRASH_LONG_BRIR                /* Orange : Fix crash when long BRIR is set */



/* #################### End BASOP porting switches ############################ */

lib_rend/ivas_crend.c

+8 −8
Original line number Diff line number Diff line
@@ -1249,7 +1249,7 @@ ivas_error ivas_rend_openCrend( 
)

{

    int16_t i, subframe_length;

#ifdef FIX_1440_PORT_1202_FROM_FLT_REPO

#ifdef FIX_CRASH_LONG_BRIR

    int32_t max_total_ir_len;

#else

    int16_t max_total_ir_len;
@@ -1303,7 +1303,7 @@ ivas_error ivas_rend_openCrend( 
                {

                    return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend" );

                }

#ifdef FIX_1440_PORT_1202_FROM_FLT_REPO

#ifdef FIX_CRASH_LONG_BRIR

                set_zero_l( hCrend->freq_buffer_re[i], max_total_ir_len );

#else

                set_zero( hCrend->freq_buffer_re[i], max_total_ir_len );
@@ -1313,7 +1313,7 @@ ivas_error ivas_rend_openCrend( 
                {

                    return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend" );

                }

#ifdef FIX_1440_PORT_1202_FROM_FLT_REPO

#ifdef FIX_CRASH_LONG_BRIR

                set_zero_l( hCrend->freq_buffer_im[i], max_total_ir_len );

#else

                set_zero( hCrend->freq_buffer_im[i], max_total_ir_len );
@@ -1326,7 +1326,7 @@ ivas_error ivas_rend_openCrend( 
                {

                    return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend" );

                }

#ifdef FIX_1440_PORT_1202_FROM_FLT_REPO

#ifdef FIX_CRASH_LONG_BRIR

                set_zero_l( hCrend->prev_out_buffer[i], subframe_length );

#else

                set_zero( hCrend->prev_out_buffer[i], subframe_length );
@@ -1341,7 +1341,7 @@ ivas_error ivas_rend_openCrend( 
                {

                    return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend" );

                }

#ifdef FIX_1440_PORT_1202_FROM_FLT_REPO

#ifdef FIX_CRASH_LONG_BRIR

                set_zero_l( hCrend->freq_buffer_re_diffuse, max_total_ir_len );

#else

                set_zero( hCrend->freq_buffer_re_diffuse, max_total_ir_len );
@@ -1351,7 +1351,7 @@ ivas_error ivas_rend_openCrend( 
                {

                    return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend" );

                }

#ifdef FIX_1440_PORT_1202_FROM_FLT_REPO

#ifdef FIX_CRASH_LONG_BRIR

                set_zero_l( hCrend->freq_buffer_im_diffuse, max_total_ir_len );

#else

                set_zero( hCrend->freq_buffer_im_diffuse, max_total_ir_len );
@@ -1370,7 +1370,7 @@ ivas_error ivas_rend_openCrend( 
                {

                    return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend" );

                }

#ifdef FIX_1440_PORT_1202_FROM_FLT_REPO

#ifdef FIX_CRASH_LONG_BRIR

                set_zero_l( hCrend->lfe_delay_line, max_total_ir_len );

#else

                set_zero( hCrend->lfe_delay_line, max_total_ir_len );
@@ -1617,7 +1617,7 @@ static ivas_error ivas_rend_crendConvolver( 
    int16_t i, j, k, m;

    int16_t subframe_length, idx_in;

    int16_t lfe_idx_in;

#ifdef FIX_1440_PORT_1202_FROM_FLT_REPO

#ifdef FIX_CRASH_LONG_BRIR

    int32_t offset, offset_in, offset_diffuse;

#else

    int16_t offset, offset_in, offset_diffuse;