Commit efa08a98 authored by vaclav's avatar vaclav
Browse files

replace magic numbers, e.g. 2 * order + 2, by a function call 

+ formatting
parent 1f55fb65

lib_com/ivas_spar_com.c

+4 −3
Original line number Diff line number Diff line
@@ -1667,8 +1667,8 @@ void ivas_get_spar_md_from_dirac( 


    remix_order = remix_order_set[hSpar_md_cfg->remix_unmix_order];



    num_ch = 2 * order + 2;

    hoa2_ch = 6;

    num_ch = ivas_sba_get_nchan_metadata( order );

    hoa2_ch = ivas_sba_get_nchan_metadata( 2 );

    foa_ch = FOA_CHANNELS;

    diff_norm_order1 = 3.0f;

    diff_norm_order2 = 5.0f;
@@ -1687,6 +1687,7 @@ void ivas_get_spar_md_from_dirac( 
    {

        float P_norm[3];

        int16_t idx;



        ndm = hSpar_md_cfg->num_dmx_chans_per_band[start_band - 1];

        P_norm[0] = 0.0f;

        for ( i = 0; i < max( 0, foa_ch - ndm ); i++ )
@@ -1754,7 +1755,7 @@ void ivas_get_spar_md_from_dirac( 
                    int16_t num_ch_order, hoa2_ch_order;



                    num_ch_order = ivas_sba_get_nchan( order, 0 );

                    hoa2_ch_order = 9;

                    hoa2_ch_order = ivas_sba_get_nchan( 2, 0 );



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

                    {

lib_dec/ivas_spar_md_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -627,7 +627,7 @@ void ivas_spar_md_dec_process( 
        char f_name[100];

        int16_t num_bands = nB;

        int16_t num_subframes = 1, num_block_groups = 1, num_elements = 1, byte_size = sizeof( float );

        int16_t num_ch = 2 * sba_order + 2;

        int16_t num_ch = ivas_sba_get_nchan_metadata( sba_order );

        for ( b = 0; b < num_bands; b++ )

        {

            sprintf( f_name, "spar_band_pred_coeffs_dec.bin" );

lib_enc/ivas_spar_md_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ ivas_error ivas_spar_md_enc_open( 
        return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR MD encoder" );

    }



    num_channels = 2 * sba_order + 2;

    num_channels = ivas_sba_get_nchan_metadata( sba_order );



    hMdEnc->spar_hoa_md_flag = ivas_sba_get_spar_hoa_md_flag( sba_order, hEncoderConfig->ivas_total_brate );