Commit c7985e79 authored by Vidhya V P's avatar Vidhya V P
Browse files

Added changes missed while merging to the main

parent a60616b5

lib_enc/ivas_spar_md_enc.c

+7 −6
Original line number Diff line number Diff line
@@ -657,6 +657,7 @@ ivas_error ivas_spar_md_enc_process( 
    }



    hMetaData_tmp.ind_list = ind_list_tmp;

    hMetaData_tmp.nb_bits_tot = 0;



    /* Save state of metadata bitstream buffer */

    bit_pos_start = hMetaData->nb_bits_tot;
@@ -692,7 +693,7 @@ ivas_error ivas_spar_md_enc_process( 
    {

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

        {

            for ( i = 0; i < FOA_CHANNELS - 1; i++ )

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

            {

                pred_coeffs_re_local[i][b] = hMdEnc->spar_md.band_coeffs[b].pred_re[i];

            }
@@ -873,7 +874,7 @@ ivas_error ivas_spar_md_enc_process( 
        {

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

            {

                for ( i = 0; i < FOA_CHANNELS - 1; i++ )

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

                {

                    /* Use the prediction coeffs computed based on DirAC MD to generate mixer matrix */

                    pred_coeffs_re[i][b] = pred_coeffs_re_local[i][b];
@@ -1704,12 +1705,12 @@ static void ivas_get_arith_coded_bs( 
                for ( j = 0; j < pred_cell_dims[i].dim1; j++ )

                {

                    hMdEnc->spar_md.band_coeffs_idx[i].pred_index_re[j] =

                        hMdEnc->spar_md.band_coeffs_idx[i].pred_index_re[j + ( FOA_CHANNELS - 1 )];

                        hMdEnc->spar_md.band_coeffs_idx[i].pred_index_re[j + DIRAC_TO_SPAR_HBR_PRED_CHS];



                    if ( any_diff == 1 )

                    {

                        hMdEnc->spar_md_prior.band_coeffs_idx_mapped[i].pred_index_re[j] =

                            hMdEnc->spar_md_prior.band_coeffs_idx_mapped[i].pred_index_re[j + ( FOA_CHANNELS - 1 )];

                            hMdEnc->spar_md_prior.band_coeffs_idx_mapped[i].pred_index_re[j + DIRAC_TO_SPAR_HBR_PRED_CHS];

                    }

                }

            }
@@ -1747,10 +1748,10 @@ static void ivas_get_arith_coded_bs( 
            {

                for ( j = pred_cell_dims[i].dim1 - 1; j >= 0; j-- )

                {

                    hMdEnc->spar_md.band_coeffs_idx[i].pred_index_re[j + ( FOA_CHANNELS - 1 )] =

                    hMdEnc->spar_md.band_coeffs_idx[i].pred_index_re[j + DIRAC_TO_SPAR_HBR_PRED_CHS] =

                        hMdEnc->spar_md.band_coeffs_idx[i].pred_index_re[j];

                }

                for ( j = 0; j < FOA_CHANNELS - 1; j++ )

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

                {

                    hMdEnc->spar_md.band_coeffs_idx[i].pred_index_re[j] = 0;

                }