Commit 6bdeeec0 authored by vaclav's avatar vaclav
Browse files

accept FIX_CRASH_LONG_BRIR

parent 99ef80a0

lib_com/ivas_prot.h

+2 −4
Original line number Diff line number Diff line
@@ -2920,12 +2920,10 @@ int16_t check_bounds_s( 
    const int16_t high                                          /* i  : High limit                              */

);



#ifdef FIX_CRASH_LONG_BRIR

void set_zero_l(

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

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

);

#endif



ivas_error stereo_memory_enc(

    CPE_ENC_HANDLE hCPE,                                        /* i  : CPE encoder structure                   */

lib_com/ivas_tools.c

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

}



#ifdef FIX_CRASH_LONG_BRIR



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

 * set_zero_l()

 *
@@ -600,7 +600,7 @@ void set_zero_l( 


    return;

}

#endif





/****************************************************************************/

/* matrix functions                                                         */

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -151,7 +151,6 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



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

#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 FIX_911_REMOVE_CREND_DUPLICATION                /* VA: issue 911: resolve duplication of CRend binaural external renderer function */

lib_rend/ivas_crend.c

+0 −32
Original line number Diff line number Diff line
@@ -1248,11 +1248,7 @@ ivas_error ivas_rend_openCrend( 
)

{

    int16_t i, subframe_length;

#ifdef FIX_CRASH_LONG_BRIR

    int32_t max_total_ir_len;

#else

    int16_t max_total_ir_len;

#endif

    HRTFS_HANDLE hHrtf;

    CREND_HANDLE hCrend;

    ivas_error error;
@@ -1302,21 +1298,13 @@ ivas_error ivas_rend_openCrend( 
                {

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

                }

#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 );

#endif



                if ( ( hCrend->freq_buffer_im[i] = (float *) malloc( sizeof( float ) * max_total_ir_len ) ) == NULL )

                {

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

                }

#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 );

#endif

            }



            for ( i = 0; i < BINAURAL_CHANNELS; i++ )
@@ -1325,11 +1313,7 @@ ivas_error ivas_rend_openCrend( 
                {

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

                }

#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 );

#endif

            }



            max_total_ir_len = hHrtf->num_iterations_diffuse[0] * subframe_length;
@@ -1340,21 +1324,13 @@ ivas_error ivas_rend_openCrend( 
                {

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

                }

#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 );

#endif



                if ( ( hCrend->freq_buffer_im_diffuse = (float *) malloc( sizeof( float ) * max_total_ir_len ) ) == NULL )

                {

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

                }

#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 );

#endif

            }

            else

            {
@@ -1369,11 +1345,7 @@ ivas_error ivas_rend_openCrend( 
                {

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

                }

#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 );

#endif

            }

            else

            {
@@ -1616,11 +1588,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_CRASH_LONG_BRIR

    int32_t offset, offset_in, offset_diffuse;

#else

    int16_t offset, offset_in, offset_diffuse;

#endif

    int16_t nchan_in, nchan_out;

    const float *pIn;

    float *pFreq_buf_re, *pFreq_buf_im;