Commit 775112f0 authored by TYAGIRIS's avatar TYAGIRIS
Browse files

clang address sanitizer fix

parent 0ec02111

apps/renderer.c

+8 −0
Original line number Diff line number Diff line
@@ -66,6 +66,10 @@ 
#define RENDERER_MAX_METADATA_LENGTH      8192

#define RENDERER_MAX_METADATA_LINE_LENGTH 1024



#ifdef SPLIT_REND_CLDFB_HUFF_SAN_FIX

#define SPLIT_REND_BITS_BUFF_SIZE ( ( ( ( (int32_t) SPLIT_REND_MAX_BRATE / FRAMES_PER_SEC ) + 7 ) >> 3 ) + SPLIT_REND_ADDITIONAL_BYTES_TO_READ )

#endif



#if !defined( DEBUGGING ) && !defined( WMOPS )

static

#endif
@@ -1215,8 +1219,12 @@ int main( 
#ifdef SPLIT_REND_WITH_HEAD_ROT

    if ( is_split_pre_rend_mode( &args ) || is_split_post_rend_mode( &args ) )

    {

#ifdef SPLIT_REND_CLDFB_HUFF_SAN_FIX

        bitsBufferSize = SPLIT_REND_BITS_BUFF_SIZE;

#else

        bitsBufferSize = (int32_t) SPLIT_REND_MAX_BRATE / FRAMES_PER_SEC;

        bitsBufferSize = ( bitsBufferSize + 7 ) >> 3;

#endif

    }

    else

    {

lib_com/ivas_cnst.h

+4 −1
Original line number Diff line number Diff line
@@ -1730,6 +1730,9 @@ typedef enum 
#define SPLIT_REND_768k                               768000

#define SPLIT_REND_MAX_BRATE                          SPLIT_REND_768k        



#ifdef SPLIT_REND_CLDFB_HUFF_SAN_FIX

#define SPLIT_REND_ADDITIONAL_BYTES_TO_READ ( 1 )

#endif



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

 * Limiter constants

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ 


#define ROM_TO_RAM                                      /*switch to convert CQMF decoder tables to RAM*/

#define SPLIT_REND_CLANG_SAN_FIX



#define SPLIT_REND_CLDFB_HUFF_SAN_FIX

#endif



/* ################## End DEVELOPMENT switches ######################### */

lib_dec/ivas_binRenderer_internal.c

+2 −1
Original line number Diff line number Diff line
@@ -1520,7 +1520,7 @@ void ivas_rend_CldfbMultiBinRendProcess( 




        for ( pose_idx = 0; pose_idx < hCldfbRend->numPoses; pose_idx++ )



        {

            for ( slot_idx = 0; slot_idx < MAX_PARAM_SPATIAL_SUBFRAMES; slot_idx++ )

            {

                idx = sf_idx * MAX_PARAM_SPATIAL_SUBFRAMES + slot_idx;
@@ -1531,6 +1531,7 @@ void ivas_rend_CldfbMultiBinRendProcess( 
                }

            }

        }

    }



    return;

}

lib_rend/lib_rend.c

+3 −2
Original line number Diff line number Diff line
@@ -6087,8 +6087,6 @@ static ivas_error renderSbaToSplitBinaural( 
{

    float tmpCrendBuffer[MAX_OUTPUT_CHANNELS][L_FRAME48k];

    ivas_error error;

    float Cldfb_RealBuffer[MAX_OUTPUT_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX];

    float Cldfb_ImagBuffer[MAX_OUTPUT_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX];

#ifdef SPLIT_REND_WITH_HEAD_ROT_DEBUG

    float Cldfb_RealBuffer_Binaural[MAX_HEAD_ROT_POSES + 1][BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX];

    float Cldfb_ImagBuffer_Binaural[MAX_HEAD_ROT_POSES + 1][BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX];
@@ -6114,6 +6112,9 @@ static ivas_error renderSbaToSplitBinaural( 
#if ( defined DEBUGGING ) || ( defined SPLIT_REND_WITH_HEAD_ROT )

    if ( sbaInput->base.ctx.hhRendererConfig[0]->renderer_type_override == RENDER_TYPE_OVERRIDE_FASTCONV )

    {

        float Cldfb_RealBuffer[MAX_OUTPUT_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX];

        float Cldfb_ImagBuffer[MAX_OUTPUT_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX];



        copyBufferToCLDFBarray( sbaInput->base.inputBuffer, Cldfb_RealBuffer, Cldfb_ImagBuffer );



        ivas_rend_CldfbMultiBinRendProcess(