Commit e0e8d0e0 authored by malenov's avatar malenov
Browse files

replace mvr2r_Word16() and mvr2r_Word32() by MVR2R_WORD16() and MVR2R_WORD32()... 

replace mvr2r_Word16() and mvr2r_Word32() by MVR2R_WORD16() and MVR2R_WORD32() in order to be recognized as macros by the WMC tool
parent f24cb6da

lib_com/ivas_tools.c

+2 −2
Original line number Diff line number Diff line
@@ -948,7 +948,7 @@ void v_mult_mat_fixed( 
        pt_y++;

    }



    mvr2r_Word32( tmp_y, y, Nc );

    MVR2R_WORD32( tmp_y, y, Nc );

}

Word32 dot_product_cholesky_fx(

    const Word32 *x, /* i  : vector x                        */
@@ -1050,7 +1050,7 @@ void v_mult_mat_fx( 
        pt_y_fx++;

    }



    mvr2r_Word32( tmp_y_fx, y_fx, Nc );

    MVR2R_WORD32( tmp_y_fx, y_fx, Nc );



    return;

}

lib_com/prot_fx.h

+2 −2
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ 
 * Prototypes of RAM counting tool macros

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



#define mvr2r_Word32( x, y, n ) Copy32( x, y, n )

#define mvr2r_Word16( x, y, n ) Copy( x, y, n )

#define MVR2R_WORD32( x, y, n ) Copy32( x, y, n )

#define MVR2R_WORD16( x, y, n ) Copy( x, y, n )



#include <stdio.h>

#include <stdlib.h>

lib_dec/waveadjust_fec_dec_fx.c

+3 −3
Original line number Diff line number Diff line
@@ -920,7 +920,7 @@ void concealment_decode_fix( Word16 curr_mode, Word32 *invkoef, Word16 *invkoef_ 
        IF( EQ_16( curr_mode, 1 ) )

        {

            /* copy the data of the last frame */

            mvr2r_Word32( plcInfo->data_reci2_fx, invkoef, N );

            MVR2R_WORD32( plcInfo->data_reci2_fx, invkoef, N );

            *invkoef_scale = plcInfo->data_reci2_scale;

            move16();

            /* sign randomization */
@@ -1416,7 +1416,7 @@ static Word16 waveform_adj_fix( Word16 *overlapbuf, 
        /* use last good signal for noise generation */

        add_noise( sbuf, outx_new_n1, outdata2, tmp, nsapp_gain, nsapp_gain_n, 1 );

        /* save current (noisy) output from IMDCT */

        mvr2r_Word16( outx_new, data_noise, tmp );

        MVR2R_WORD16( outx_new, data_noise, tmp );

        /* overlapbuf can now be filled with sbuf, needed for subsequently lost frames */

        Copy( pitch125_data, &overlapbuf[Framesize / 4], shr( imult1616( 3, Framesize ), 2 ) );

    }
@@ -1481,7 +1481,7 @@ void waveform_adj2_fix( Word16 *overlapbuf, 
            /* save current (noisy) output from IMDCT */

            IF( bfi )

            {

                mvr2r_Word16( outx_new, noise_ptr, size );

                MVR2R_WORD16( outx_new, noise_ptr, size );

            }

        }

        test();

lib_enc/ext_sig_ana_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -612,7 +612,7 @@ void core_signal_analysis_high_bitrate_fx( 
            }



            /* Copy memory */

            mvr2r_Word16( lsp_new, st->lspold_enc_fx, M );

            MVR2R_WORD16( lsp_new, st->lspold_enc_fx, M );

        }

    }

}

lib_enc/ivas_front_vad.c

+2 −2
Original line number Diff line number Diff line
@@ -513,7 +513,7 @@ ivas_error front_vad_spar( 
        floatToFixed_arr( st->mem_decim2, st->mem_decim2_fx, Q10, 3 );

        // st->mem_wsp_fx = (Word16) floatToFixed( st->mem_wsp, Q_inp_12k8 );



        mvr2r_Word16( st->old_wsp_fx, old_wsp_fx, L_WSP_MEM );

        MVR2R_WORD16( st->old_wsp_fx, old_wsp_fx, L_WSP_MEM );

        wsp = old_wsp + L_WSP_MEM;

        wsp_fx = old_wsp_fx + L_WSP_MEM;
@@ -769,7 +769,7 @@ ivas_error front_vad_spar( 
#if 0

        vad_param_updt( st, corr_shift, corr_shift, A, st->pitch[1], &hFrontVad, 1 );

#else

        mvr2r_Word16( st->pitch, st->pitch, 3 );

        MVR2R_WORD16( st->pitch, st->pitch, 3 );

        corr_shift_fx = (Word16) floatToFixed( corr_shift, Q15 );

        hFrontVad->hVAD->running_avg_fx = (Word16) floatToFixed( hFrontVad->hVAD->running_avg, Q15 );

        hFrontVad->hVAD->ra_deltasum_fx = (Word16) floatToFixed( hFrontVad->hVAD->ra_deltasum, Q15 );