Commit ae8f59bb authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Merge branch 'main' into 196-refactor-renderer-output-configuration

parents f0bab996 d9d21b15

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -242,6 +242,7 @@ 


#define BINAURAL_AUDIO_CMDLINE

#define FIX_570_TCX_LPC_WRITE                           /* FhG: fix issue 570: LPC bitstream writer in TCX */

#define FIX_506                                         /* FhG: Compiler warnings */



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

/* clang-format on */

lib_dec/LD_music_post_filter.c

+8 −1
Original line number Diff line number Diff line
@@ -387,7 +387,10 @@ static void spectrum_mod_dct( 
    float slope;

    float inv_noise[MBANDS_GN_LD];

    float *pt_gbin, alpha, tmpN;

    int16_t i, cnt;

    int16_t i;

#ifndef FIX_506

    int16_t cnt;

#endif

    float *pt;

    float tmp, shift;

    const float *pt2;
@@ -475,7 +478,9 @@ static void spectrum_mod_dct( 


            tmpN = slope * inv_noise[i];

            tmp = 0.0f;

#ifndef FIX_506

            cnt = 0;

#endif

            while ( freq <= mfreq_loc_LD[i] )

            {

                gain = 1.0f;
@@ -502,7 +507,9 @@ static void spectrum_mod_dct( 


                *pt_gbin = gain + alpha * *pt_gbin;

                *pt++ *= *pt_gbin;

#ifndef FIX_506

                cnt++;

#endif

                freq += BIN_16kdct;

                pt_gbin++;

            }

lib_dec/hq_lr_dec.c

+6 −0
Original line number Diff line number Diff line
@@ -1370,10 +1370,14 @@ static void spt_shorten_domain_set_dec( 
)

{

    int16_t j, k;

#ifndef FIX_506

    int16_t kpos;

#endif

    int16_t spt_shorten_flag[SPT_SHORTEN_SBNUM];



#ifndef FIX_506

    kpos = 0;

#endif

    j = 0;

    for ( k = bands - SPT_SHORTEN_SBNUM; k < bands; k++ )

    {
@@ -1390,7 +1394,9 @@ static void spt_shorten_domain_set_dec( 
            }

        }



#ifndef FIX_506

        kpos++;

#endif

        j++;

    }

lib_dec/ivas_svd_dec.c

+6 −2
Original line number Diff line number Diff line
@@ -96,22 +96,26 @@ void mat2svdMat( 
)

{

    int16_t i, j;

#ifndef FIX_506

    int16_t posCounter;

#endif



    if ( transpose )

    {

#ifndef FIX_506

        posCounter = 0;



#endif

        for ( i = 0; i < mCols; i++ )

        {

            for ( j = 0; j < nRows; j++ )

            {

                svdMat[i][j] = mat[j + nRows * i];



#ifndef FIX_506

                if ( mat[j + nRows * i] > 0.0f )

                {

                    posCounter++;

                }

#endif

            }



            set_zero( &svdMat[i][mCols], MAX_OUTPUT_CHANNELS - nRows );

lib_dec/swb_bwe_dec_lr.c

+8 −1
Original line number Diff line number Diff line
@@ -130,7 +130,10 @@ static void DecodeSWBSubbands( 
    float ss_min = 1.0f, g, be_tonal[SWB_HAR_RAN1], xSynth_har[L_FRAME32k];

    GainItem pk_sf[(NB_SWB_SUBBANDS) *8];

    int16_t lagIndices_real[NB_SWB_SUBBANDS];

    int16_t pul_res[NB_SWB_SUBBANDS], cnt, imin;

#ifndef FIX_506

    int16_t cnt;

#endif

    int16_t pul_res[NB_SWB_SUBBANDS], imin;

    int16_t har_freq_est1 = 0;

    int16_t har_freq_est2 = 0;

    int16_t flag_dis = 1;
@@ -202,14 +205,18 @@ static void DecodeSWBSubbands( 
        {

            lagGains[k] *= 0.9f;

        }

#ifndef FIX_506

        cnt = 0;

#endif

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

        {

            th_g[k] = 0.0f;

            if ( p2a_flags[BANDS - NB_SWB_SUBBANDS + k] == 0 )

            {

                th_g[k] = lagGains[k] * ss_min;

#ifndef FIX_506

                cnt++;

#endif

            }

        }

        /* Construct spectrum */