Commit bfcd32d6 authored by emerit's avatar emerit
Browse files

rename switch name with original name from float version

parent ba5ac41d

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,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_1440_PORT_1202_FROM_FLT_REPO                /* Orange : port 1202 Fix crash when long BRIR is set */

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



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

lib_rend/ivas_crend_fx.c

+14 −14
Original line number Diff line number Diff line
@@ -1526,7 +1526,7 @@ ivas_error ivas_rend_openCrend( 
)

{

    Word16 i, subframe_length;

#ifdef FIX_1440_PORT_1202_FROM_FLT_REPO

#ifdef FIX_CRASH_LONG_BRIR

    Word32 max_total_ir_len;

#else

    Word16 max_total_ir_len;
@@ -1573,7 +1573,7 @@ ivas_error ivas_rend_openCrend( 


        IF( hHrtf != NULL )

        {

#ifdef FIX_1440_PORT_1202_FROM_FLT_REPO

#ifdef FIX_CRASH_LONG_BRIR

            max_total_ir_len = L_mult0( hHrtf->max_num_iterations, subframe_length );

#else

            max_total_ir_len = imult1616( hHrtf->max_num_iterations, subframe_length );
@@ -1585,7 +1585,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_zero2_fx( hCrend->freq_buffer_re_fx[i], max_total_ir_len );

#else

                set_zero_fx( hCrend->freq_buffer_re_fx[i], max_total_ir_len );
@@ -1594,7 +1594,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_zero2_fx( hCrend->freq_buffer_im_fx[i], max_total_ir_len );

#else

                set_zero_fx( hCrend->freq_buffer_im_fx[i], max_total_ir_len );
@@ -1610,7 +1610,7 @@ ivas_error ivas_rend_openCrend( 
                set_zero_fx( hCrend->prev_out_buffer_fx[i], subframe_length );

            }



#ifdef FIX_1440_PORT_1202_FROM_FLT_REPO

#ifdef FIX_CRASH_LONG_BRIR

            max_total_ir_len = L_mult0( (Word16) hHrtf->num_iterations_diffuse[0], subframe_length );

#else

            max_total_ir_len = imult1616( (Word16) hHrtf->num_iterations_diffuse[0], subframe_length );
@@ -1622,7 +1622,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_zero2_fx( hCrend->freq_buffer_re_diffuse_fx, max_total_ir_len );

#else

                set_zero_fx( hCrend->freq_buffer_re_diffuse_fx, max_total_ir_len );
@@ -1631,7 +1631,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_zero2_fx( hCrend->freq_buffer_im_diffuse_fx, max_total_ir_len );

#else

                set_zero_fx( hCrend->freq_buffer_im_diffuse_fx, max_total_ir_len );
@@ -1650,7 +1650,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_zero2_fx( hCrend->lfe_delay_line_fx, max_total_ir_len );

#else

                set_zero_fx( hCrend->lfe_delay_line_fx, max_total_ir_len );
@@ -1897,7 +1897,7 @@ static ivas_error ivas_rend_crendConvolver( 
    Word16 i, j, k, m;

    Word16 subframe_length, idx_in;

    Word16 lfe_idx_in;

#ifdef FIX_1440_PORT_1202_FROM_FLT_REPO

#ifdef FIX_CRASH_LONG_BRIR

    Word32 offset, offset_in, offset_diffuse;

    Word16 index_in;

#else
@@ -1948,7 +1948,7 @@ static ivas_error ivas_rend_crendConvolver( 
        }

    }



#ifdef FIX_1440_PORT_1202_FROM_FLT_REPO

#ifdef FIX_CRASH_LONG_BRIR

    offset = L_mult0( hCrend->delay_line_rw_index, subframe_length );                 /* subframe_length * ( pCrend->hHrtfCrend->max_num_iterations - 1 ); */

    offset_diffuse = L_mult0( hCrend->diffuse_delay_line_rw_index, subframe_length ); /* subframe_length *( pCrend->hHrtfCrend->num_iterations_diffuse[0] - 1 ); */

#else
@@ -2011,7 +2011,7 @@ static ivas_error ivas_rend_crendConvolver( 
                move16();

                FOR( m = 0; m < pCrend->hHrtfCrend->num_iterations[i][j]; m++ )

                {

#ifdef FIX_1440_PORT_1202_FROM_FLT_REPO

#ifdef FIX_CRASH_LONG_BRIR

                    index_in = add( add( hCrend->delay_line_rw_index, sub( pCrend->hHrtfCrend->max_num_iterations, pCrend->hHrtfCrend->num_iterations[i][j] ) ), add( m, 1 ) );

                    index_in = index_in % ( pCrend->hHrtfCrend->max_num_iterations );

                    move16();
@@ -2034,7 +2034,7 @@ static ivas_error ivas_rend_crendConvolver( 
                        move32();

                        move32();

                    }

#ifdef FIX_1440_PORT_1202_FROM_FLT_REPO

#ifdef FIX_CRASH_LONG_BRIR

                    offset = L_add( offset, k );

#else

                    offset = add( offset, k );
@@ -2048,7 +2048,7 @@ static ivas_error ivas_rend_crendConvolver( 
        move16();

        FOR( m = 0; m < pCrend->hHrtfCrend->num_iterations_diffuse[j]; m++ )

        {

#ifdef FIX_1440_PORT_1202_FROM_FLT_REPO

#ifdef FIX_CRASH_LONG_BRIR

            index_in = add( hCrend->diffuse_delay_line_rw_index, add( m, 1 ) );

            index_in = index_in % pCrend->hHrtfCrend->num_iterations_diffuse[0];

            move16();
@@ -2070,7 +2070,7 @@ static ivas_error ivas_rend_crendConvolver( 
                move32();

                move32();

            }

#ifdef FIX_1440_PORT_1202_FROM_FLT_REPO

#ifdef FIX_CRASH_LONG_BRIR

            offset = L_add( offset, k );

            move32();

#else