Commit b7f75527 authored by Jan Kiene's avatar Jan Kiene
Browse files

fix msan error and compiler warning

parent 9fbb1c3b

lib_com/options.h

+0 −2
Original line number Diff line number Diff line
@@ -180,8 +180,6 @@ 
#define FIX_411_EVS_BE_TESTS_ON_WINDOWS_FAILING         /* Eri: Fix incorrect use of stack variable used for channel aware config file */

#define COMBINED_FORMAT_SIGNALING                       /* VA: Introduce a signaling bit for combined format coding */







#define FIX_445_SNS_BUGFIXES                            /* FhG: bug fix for spectral tilt in SNS computation + necessary update of codebooks and converison to fixedpoint-compatible tables */



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

lib_enc/ivas_sns_enc.c

+29 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ static int16_t sns_1st_cod( 


        cdbk_ptr = cdbk;

        dist_min = 1.0e30f;

        index_split = 0;

        for ( int16_t i = 0; i < 32; ++i )

        {

            float dist;
@@ -523,21 +524,49 @@ int16_t quantize_sns( 
    sns_stereo_mode[1] = SNS_STEREO_MODE_LR;

    zero_side_flag[0] = 0;

    zero_side_flag[1] = 0;



#ifdef FIX_445_SNS_BUGFIXES

    /* use snsQ_out as buffer, move input vectors */

    for ( ch = 0; ch < CPE_CHANNELS; ++ch )

    {

        nSubframes = ( sts[ch]->core == TCX_20_CORE ) ? 1 : NB_DIV;

        for ( k = 0; k < nSubframes; ++k )

        {

            mvr2r( sns_in[ch][k], snsQ_out[ch][k], M );

        }

    }

#endif



    if ( sts[0]->core == sts[1]->core )

    {

        nSubframes = ( sts[0]->core == TCX_20_CORE ) ? 1 : NB_DIV;



        for ( k = 0; k < nSubframes; ++k )

        {

#ifdef FIX_445_SNS_BUGFIXES

            float side[M];

#else

            float *side;

#endif

            float ener_side;



#ifdef FIX_445_SNS_BUGFIXES

            v_sub( snsQ_out[0][k], snsQ_out[1][k], side, M );

#else

            side = &snsQ_out[1][k][0];

            v_sub( sns_in[0][k], sns_in[1][k], side, M );

#endif

            ener_side = dotp( side, side, M );



            sns_stereo_mode[k] = ener_side < 12.f;

            zero_side_flag[k] = ener_side < 1.f;



#ifdef FIX_445_SNS_BUGFIXES

            if ( sns_stereo_mode[k] == SNS_STEREO_MODE_MS )

            {

                convertToMS( M, snsQ_out[0][k], snsQ_out[1][k], 0.5f );

            }

#endif

        }

    }

lib_dec/ivas_sns_dec.c

+5 −5

File changed.

Contains only whitespace changes.