Commit f873cf7b authored by vaclav's avatar vaclav
Browse files

avoid defined-function macros

parent 5da38eed

apps/renderer.c

+2 −2
Original line number Diff line number Diff line
@@ -655,8 +655,8 @@ static void setupWithSingleFormatInput( 


            /* It is allowed on CLI to have no metadata for an ISM input - skip opening if string contains "NULL" */

            char charBuf[FILENAME_MAX];

            strncpy( charBuf, args.inMetadataFilePaths[i], min( FILENAME_MAX, RENDERER_MAX_CLI_ARG_LENGTH ) - 1 );

            charBuf[min( FILENAME_MAX, RENDERER_MAX_CLI_ARG_LENGTH ) - 1] = '\0';

            strncpy( charBuf, args.inMetadataFilePaths[i], RENDERER_MAX_CLI_ARG_LENGTH - 1 );

            charBuf[RENDERER_MAX_CLI_ARG_LENGTH - 1] = '\0';

            to_upper( charBuf );

            if ( strncmp( charBuf, "NULL", 4 ) == 0 )

            {

lib_com/ivas_rotation_com_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ void Quat2EulerDegree_fx( 
        Word32 tmp8 = W_extract_l( W_shr( W_mult0_32_32( quat.w_fx, quat.y_fx ), Q22 ) ); // Q22

        Word32 tmp9 = W_extract_l( W_shr( W_mult0_32_32( quat.z_fx, quat.x_fx ), Q22 ) ); // Q22

        p_fx = L_shl( L_sub( tmp8, tmp9 ), 1 );

        p_fx = max( L_negate( ONE_IN_Q22 ), min( ONE_IN_Q22, p_fx ) ); // Q22

        p_fx = L_max( L_negate( ONE_IN_Q22 ), L_min( ONE_IN_Q22, p_fx ) ); // Q22



        Word32 p_fx_sq = W_extract_l( W_shr( W_mult0_32_32( p_fx, p_fx ), Q22 ) );

        Word16 res_exp = 0;

lib_com/ivas_spar_com_fx.c

+16 −14
Original line number Diff line number Diff line
@@ -3843,7 +3843,8 @@ void ivas_get_spar_md_from_dirac_enc_fx( 
    Word32 **ppMixer_mat_fx[IVAS_MAX_FB_MIXER_OUT_CH];

    Word32 *pMixer_mat_fx[IVAS_MAX_FB_MIXER_OUT_CH][IVAS_MAX_SPAR_FB_MIXER_IN_CH];

    Word16 q_ppMixer_mat = 0;

    Word32 en_ratio_fac_fx, diff_norm_order1_fx, diff_norm_order2_fx, diff_norm_order3_fx;

    Word32 en_ratio_fac_fx;

    Word16 diff_norm_order1_fx, diff_norm_order2_fx, diff_norm_order3_fx;

    Word16 active_w;

    move16();

    move16();
@@ -3862,11 +3863,11 @@ void ivas_get_spar_md_from_dirac_enc_fx( 
    foa_ch = FOA_CHANNELS;

    move16();

    diff_norm_order1_fx = 3;

    move32();

    move16();

    diff_norm_order2_fx = 5;

    move32();

    move16();

    diff_norm_order3_fx = 7;

    move32();

    move16();



    FOR( i = 0; i < IVAS_MAX_FB_MIXER_OUT_CH; i++ )

    {
@@ -3898,7 +3899,7 @@ void ivas_get_spar_md_from_dirac_enc_fx( 
            P_norm_fx[0] = L_add( P_norm_fx[0], Mpy_32_32( hSpar_md->band_coeffs[start_band - 1].P_re_fx[i], hSpar_md->band_coeffs[start_band - 1].P_re_fx[i] ) ); // 2*q_P_re - 31

            move32();

        }

        P_norm_fx[0] = Mpy_32_32( L_shl( P_norm_fx[0], 3 ), diff_norm_order1_table[min( diff_norm_order1_fx, max( 0, sub( foa_ch, ndm ) ) )] ); // 2*q_P_re - 31

        P_norm_fx[0] = Mpy_32_32( L_shl( P_norm_fx[0], 3 ), diff_norm_order1_table[s_min( diff_norm_order1_fx, s_max( 0, sub( foa_ch, ndm ) ) )] ); // 2*q_P_re - 31

        move32();



        P_norm_fx[1] = 0;
@@ -3909,7 +3910,7 @@ void ivas_get_spar_md_from_dirac_enc_fx( 
            P_norm_fx[1] = L_add( P_norm_fx[1], Mpy_32_32( hSpar_md->band_coeffs[start_band - 1].P_re_fx[i], hSpar_md->band_coeffs[start_band - 1].P_re_fx[i] ) ); // 2*q_P_re - 31

            move32();

        }

        P_norm_fx[1] = Mpy_32_32( L_shl( P_norm_fx[1], 3 ), diff_norm_order2_table[min( diff_norm_order2_fx, max( 0, ( min( num_ch, hoa2_ch ) - ndm ) ) )] ); // 2*q_P_re - 31

        P_norm_fx[1] = Mpy_32_32( L_shl( P_norm_fx[1], 3 ), diff_norm_order2_table[s_min( diff_norm_order2_fx, s_max( 0, ( s_min( num_ch, hoa2_ch ) - ndm ) ) )] ); // 2*q_P_re - 31

        move32();



        P_norm_fx[2] = 0;
@@ -3919,7 +3920,7 @@ void ivas_get_spar_md_from_dirac_enc_fx( 
            P_norm_fx[2] = L_add( P_norm_fx[2], Mpy_32_32( hSpar_md->band_coeffs[start_band - 1].P_re_fx[i], hSpar_md->band_coeffs[start_band - 1].P_re_fx[i] ) ); // 2*q_P_re - 31

            move32();

        }

        P_norm_fx[2] = Mpy_32_32( L_shl( P_norm_fx[2], 3 ), diff_norm_order3_table[min( diff_norm_order3_fx, max( 0, ( num_ch - ndm ) ) )] ); // 2*q_P_re - 31

        P_norm_fx[2] = Mpy_32_32( L_shl( P_norm_fx[2], 3 ), diff_norm_order3_table[s_min( diff_norm_order3_fx, s_max( 0, ( num_ch - ndm ) ) )] ); // 2*q_P_re - 31

        move32();

        len = s_max( 0, sub( foa_ch, ndm ) );

        FOR( i = 0; i < len; i++ ) // i < max( 0, ( foa_ch - ndm ) )
@@ -4291,7 +4292,8 @@ void ivas_get_spar_md_from_dirac_fx( 
    Word32 **ppMixer_mat_fx[IVAS_MAX_FB_MIXER_OUT_CH];

    Word32 *pMixer_mat_fx[IVAS_MAX_FB_MIXER_OUT_CH][IVAS_MAX_SPAR_FB_MIXER_IN_CH];

    Word16 q_ppMixer_mat = 0;

    Word32 en_ratio_fac_fx, diff_norm_order1_fx, diff_norm_order2_fx, diff_norm_order3_fx;

    Word32 en_ratio_fac_fx;

    Word16 diff_norm_order1_fx, diff_norm_order2_fx, diff_norm_order3_fx;

    Word16 active_w;

    move16();

    move16();
@@ -4310,11 +4312,11 @@ void ivas_get_spar_md_from_dirac_fx( 
    foa_ch = FOA_CHANNELS;

    move16();

    diff_norm_order1_fx = 3;

    move32();

    move16();

    diff_norm_order2_fx = 5;

    move32();

    move16();

    diff_norm_order3_fx = 7;

    move32();

    move16();



    FOR( i = 0; i < IVAS_MAX_FB_MIXER_OUT_CH; i++ )

    {
@@ -4346,7 +4348,7 @@ void ivas_get_spar_md_from_dirac_fx( 
            P_norm_fx[0] = L_add( P_norm_fx[0], Mpy_32_32( hSpar_md->band_coeffs[start_band - 1].P_re_fx[i], hSpar_md->band_coeffs[start_band - 1].P_re_fx[i] ) ); // 2*q_P_re - 31

            move32();

        }

        P_norm_fx[0] = Mpy_32_32( L_shl( P_norm_fx[0], 3 ), diff_norm_order1_table[min( diff_norm_order1_fx, max( 0, sub( foa_ch, ndm ) ) )] ); // 2*q_P_re - 31

        P_norm_fx[0] = Mpy_32_32( L_shl( P_norm_fx[0], 3 ), diff_norm_order1_table[s_min( diff_norm_order1_fx, s_max( 0, sub( foa_ch, ndm ) ) )] ); // 2*q_P_re - 31

        move32();



        P_norm_fx[1] = 0;
@@ -4357,7 +4359,7 @@ void ivas_get_spar_md_from_dirac_fx( 
            P_norm_fx[1] = L_add( P_norm_fx[1], Mpy_32_32( hSpar_md->band_coeffs[start_band - 1].P_re_fx[i], hSpar_md->band_coeffs[start_band - 1].P_re_fx[i] ) ); // 2*q_P_re - 31

            move32();

        }

        P_norm_fx[1] = Mpy_32_32( L_shl( P_norm_fx[1], 3 ), diff_norm_order2_table[min( diff_norm_order2_fx, max( 0, ( min( num_ch, hoa2_ch ) - ndm ) ) )] ); // 2*q_P_re - 31

        P_norm_fx[1] = Mpy_32_32( L_shl( P_norm_fx[1], 3 ), diff_norm_order2_table[s_min( diff_norm_order2_fx, s_max( 0, ( s_min( num_ch, hoa2_ch ) - ndm ) ) )] ); // 2*q_P_re - 31

        move32();



        P_norm_fx[2] = 0;
@@ -4367,7 +4369,7 @@ void ivas_get_spar_md_from_dirac_fx( 
            P_norm_fx[2] = L_add( P_norm_fx[2], Mpy_32_32( hSpar_md->band_coeffs[start_band - 1].P_re_fx[i], hSpar_md->band_coeffs[start_band - 1].P_re_fx[i] ) ); // 2*q_P_re - 31

            move32();

        }

        P_norm_fx[2] = Mpy_32_32( L_shl( P_norm_fx[2], 3 ), diff_norm_order3_table[min( diff_norm_order3_fx, max( 0, ( num_ch - ndm ) ) )] ); // 2*q_P_re - 31

        P_norm_fx[2] = Mpy_32_32( L_shl( P_norm_fx[2], 3 ), diff_norm_order3_table[s_min( diff_norm_order3_fx, s_max( 0, ( num_ch - ndm ) ) )] ); // 2*q_P_re - 31

        move32();

        len = s_max( 0, sub( foa_ch, ndm ) );

        FOR( i = 0; i < len; i++ ) // i < max( 0, ( foa_ch - ndm ) )

lib_com/ivas_spar_com_quant_util_fx.c

+3 −3
Original line number Diff line number Diff line
@@ -346,11 +346,11 @@ void ivas_map_prior_coeffs_quant( 
    {

        ivas_quant_strat_t qs = pSpar_md_cfg->quant_strat[qsi];

        ivas_quant_strat_t prev_qs = pSpar_md_cfg->quant_strat[pSpar_md_cfg->prev_quant_idx];

        Word32 one_by_q_lvl_PR_fx = one_by_q_level[max( ( prev_qs.PR.q_levels[0] - 1 ), 1 )]; /*q31*/

        Word32 one_by_q_lvl_PR_fx = one_by_q_level[s_max( ( prev_qs.PR.q_levels[0] - 1 ), 1 )]; /*q31*/

        move32();

        Word32 one_by_q_lvl_C_fx = one_by_q_level[max( ( prev_qs.C.q_levels[0] - 1 ), 1 )]; /*q31*/

        Word32 one_by_q_lvl_C_fx = one_by_q_level[s_max( ( prev_qs.C.q_levels[0] - 1 ), 1 )]; /*q31*/

        move32();

        Word32 one_by_q_lvl_P_r_fx = one_by_q_level[max( ( prev_qs.P_r.q_levels[0] - 1 ), 1 )]; /*q31*/

        Word32 one_by_q_lvl_P_r_fx = one_by_q_level[s_max( ( prev_qs.P_r.q_levels[0] - 1 ), 1 )]; /*q31*/

        move32();

        FOR( i = 0; i < nB; i++ )

        {

lib_dec/igf_dec_fx.c

+8 −8
Original line number Diff line number Diff line
@@ -1838,11 +1838,11 @@ static void IGF_appl( IGF_DEC_PRIVATE_DATA_HANDLE hPrivateData, /**< in 
        FOR( tb = 0; tb < hopsize; tb++ )

        {

            /* calculate of the current sfb width */

            width = sub( hGrid->swb_offset[min( sfb + tb + 1, stop_sfb )], /* 15Q0 | width is Q0 */

                         hGrid->swb_offset[min( sfb + tb, stop_sfb )] );

            width = sub( hGrid->swb_offset[s_min( sfb + tb + 1, stop_sfb )], /* 15Q0 | width is Q0 */

                         hGrid->swb_offset[s_min( sfb + tb, stop_sfb )] );



            tmp = dS[min( sfb + tb, stop_sfb - 1 )];

            tmp_e = dS_e[min( sfb + tb, stop_sfb - 1 )];

            tmp = dS[s_min( sfb + tb, stop_sfb - 1 )];

            tmp_e = dS_e[s_min( sfb + tb, stop_sfb - 1 )];

            move16();

            move16();
@@ -2507,11 +2507,11 @@ static void IGF_appl_ivas( IGF_DEC_PRIVATE_DATA_HANDLE hPrivateData, /**< in 
        FOR( tb = 0; tb < hopsize; tb++ )

        {

            /* calculate of the current sfb width */

            width = sub( hGrid->swb_offset[min( sfb + tb + 1, stop_sfb )], /* 15Q0 | width is Q0 */

                         hGrid->swb_offset[min( sfb + tb, stop_sfb )] );

            width = sub( hGrid->swb_offset[s_min( sfb + tb + 1, stop_sfb )], /* 15Q0 | width is Q0 */

                         hGrid->swb_offset[s_min( sfb + tb, stop_sfb )] );



            tmp = dS[min( sfb + tb, stop_sfb - 1 )];

            tmp_e = dS_e[min( sfb + tb, stop_sfb - 1 )];

            tmp = dS[s_min( sfb + tb, stop_sfb - 1 )];

            tmp_e = dS_e[s_min( sfb + tb, stop_sfb - 1 )];

            move16();

            move16();