Commit 2de7746a authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

IVAS warnings fixes - 1

parent d1180a96

lib_com/ivas_dirac_com.c

+0 −2
Original line number Diff line number Diff line
@@ -1344,8 +1344,6 @@ void deindex_spherical_component_fx( 
    const MC_LS_SETUP mc_format /* i  : channel format if in MC-mode            */

)

{

    Word32 az_idx_fx;

    Word16 q_az_idx;

    assert( sph_idx < ( 1 << no_bits ) );

    SWITCH( no_bits )

    {

lib_com/swb_bwe_com_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -748,11 +748,11 @@ Word32 ivas_calc_tilt_bwe_fx( /* o : Tilt in Q24 */ 
    FOR(j = shr(N, 5); j > 0; j--)

    {

#ifdef BASOP_NOGLOB            /* Critical Overflow and all those below*/

        tmp1 = mult_ro(*ptr++, 8192, &Overflow); /* Divide by 4 */

        Word16 tmp = mult_ro(*ptr++, 8192, &Overflow); /* Divide by 4 */

#else

        tmp1 = mult_r(*ptr++, 8192); /* Divide by 4 */

#endif

        L_ener = L_mult0(tmp1, tmp1);

        L_ener = L_mult0( tmp, tmp );

        /* With the shift by 4 and the L_mult0, no overflow possible for 32 samples */

        FOR(i = 1; i < 32; i++)

        {

lib_dec/TonalComponentDetection.c

+2 −2
Original line number Diff line number Diff line
@@ -105,12 +105,12 @@ void DetectTonalComponents_flt( 
        FOR( Word16 k = 0; k < nSamplesCore; k++ )

        {

            if ( abs( (Word32) pScaledMdctSpectrum[k] ) != 0 )

                q_pScaledMdctSpectrum_fx = s_min( q_pScaledMdctSpectrum_fx, norm_l( pScaledMdctSpectrum[k] ) );

                q_pScaledMdctSpectrum_fx = s_min( q_pScaledMdctSpectrum_fx, norm_l( (Word32) pScaledMdctSpectrum[k] ) );

        }

        FOR( Word16 k = 0; k < FDNS_NPTS; k++ )

        {

            if ( abs( (Word32) scaleFactors[k] ) != 0 )

                q_scaleFactors_fx = s_min( q_scaleFactors_fx, norm_l( scaleFactors[k] ) );

                q_scaleFactors_fx = s_min( q_scaleFactors_fx, norm_l( (Word32) scaleFactors[k] ) );

        }

        q_pScaledMdctSpectrum_fx -= 1;

        q_scaleFactors_fx -= 1;

lib_dec/fd_cng_dec.c

+1 −7
Original line number Diff line number Diff line
@@ -3040,12 +3040,6 @@ void FdCngDecodeMDCTStereoSID( 
#ifdef IVAS_FLOAT_FIXED

    Word32 *invTrfMatrix_fx;

    Word32 tmpRAM_fx[FDCNG_VQ_MAX_LEN][FDCNG_VQ_DCT_MAXTRUNC];

    Word32 *ms_ptr_fx[CPE_CHANNELS];

    Word32 *lr_ptr_fx[CPE_CHANNELS];

    Word32 logNoiseEst_fx[CPE_CHANNELS][NPART];

    Word32 gain_fx[CPE_CHANNELS];

    Word16 norm1, norm2;

    float lr_ptr_fxfl[NPART];

#endif



    invTrfMatrix = (float *) tmpRAM;
@@ -3053,7 +3047,7 @@ void FdCngDecodeMDCTStereoSID( 
    invTrfMatrix_fx = (Word32 *)tmpRAM_fx;

    create_IDCT_N_Matrix_fx(invTrfMatrix_fx, FDCNG_VQ_MAX_LEN, FDCNG_VQ_DCT_MAXTRUNC, sizeof(tmpRAM_fx) / (sizeof(Word32)));



    FOR(Word16 i = 0; i < FDCNG_VQ_MAX_LEN; i++) {

    FOR( i = 0; i < FDCNG_VQ_MAX_LEN; i++) {

        FOR(Word16 j = 0; j < FDCNG_VQ_DCT_MAXTRUNC; j++) {

            Word16 index = i * FDCNG_VQ_DCT_MAXTRUNC + j;

            invTrfMatrix[index] = fix_to_float(invTrfMatrix_fx[index], 31); // Q factor 31

lib_dec/ivas_jbm_dec.c

+3 −3
Original line number Diff line number Diff line
@@ -2204,7 +2204,7 @@ ivas_error ivas_jbm_dec_render( 
        {

            *nSamplesRendered = min( st_ivas->hTcBuffer->n_samples_available, nSamplesAskedLocal );

#ifdef IVAS_FLOAT_FIXED

            Word16 i, j, q = Q16;

            Word16 q = Q16;

            Word32 *p_output_fx[20];

            Word32 *p_tc_fx[16];

            q = q - find_guarded_bits_fx( st_ivas->nchan_transport );
@@ -2753,7 +2753,7 @@ ivas_error ivas_jbm_dec_render( 
            {

                *nSamplesRendered = min( st_ivas->hTcBuffer->n_samples_available, nSamplesAskedLocal );

#ifdef IVAS_FLOAT_FIXED

                Word16 i, j, q = Q16;

                Word16 q = Q16;

                Word32 *p_output_fx[20];

                Word32 *p_tc_fx[16];

                q = q - find_guarded_bits_fx( st_ivas->nchan_transport );
@@ -2816,7 +2816,7 @@ ivas_error ivas_jbm_dec_render( 
            else if ( st_ivas->renderer_type == RENDERER_MC )

            {

#ifdef IVAS_FLOAT_FIXED

                Word16 i, j, q = Q16;

                Word16 q = Q16;

                Word32 *p_output_fx[20];

                q = q - find_guarded_bits_fx( MC_PARAMUPMIX_MAX_INPUT_CHANS );

                FOR( i = 0; i < max(st_ivas->hDecoderConfig->nchan_out, MC_PARAMUPMIX_MAX_INPUT_CHANS); ++i )