Commit 43b01fc4 authored by Jouni Paulus's avatar Jouni Paulus
Browse files

Merge remote-tracking branch... 

Merge remote-tracking branch 'origin/nokia/contribution-omasa-combined-format-refactor-merge' into 644-add-omasa-self-test-cases
parents 48a851c0 7bf4f6d7

lib_com/ivas_masa_com.c

+9 −1
Original line number Diff line number Diff line
@@ -256,7 +256,15 @@ void ivas_masa_set_coding_config( 
        if ( ivas_total_brate <= ivas_brate_tbl[i + SIZE_IVAS_BRATE_TBL - IVAS_NUM_ACTIVE_BRATES] )

        {

            int16_t idx_bands;

            if ( ivas_total_brate < IVAS_48k && nchan_transport == 2 && i > 3 )

            {

                /* because it uses the bitallocation for the lower bit rates from 'masa_bits_LR_stereo' and it has 4 elements */

                idx_bands = 3;

            }

            else

            {

                idx_bands = i;

            }



            if ( config->numberOfDirections > 1 )

            {

lib_dec/ivas_masa_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -503,7 +503,7 @@ ivas_error ivas_masa_decode( 
                    // Todo OMASA JBM: This might need adjustments

                    meta_write_index = ( dirac_bs_md_write_idx + block ) % st_ivas->hSpatParamRendCom->dirac_md_buffer_length;



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

                    for ( b = 0; b < st_ivas->hSpatParamRendCom->num_freq_bands; b++ )

                    {

                        st_ivas->hSpatParamRendCom->diffuseness_vector[meta_write_index][b] -= st_ivas->hMasaIsmData->energy_ratio_ism[i][meta_write_index][b];

                    }
@@ -514,7 +514,7 @@ ivas_error ivas_masa_decode( 
            {

                meta_write_index = ( dirac_bs_md_write_idx + block ) % st_ivas->hSpatParamRendCom->dirac_md_buffer_length;



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

                for ( b = 0; b < st_ivas->hSpatParamRendCom->num_freq_bands; b++ )

                {

                    st_ivas->hSpatParamRendCom->diffuseness_vector[meta_write_index][b] = max( 0.0f, st_ivas->hSpatParamRendCom->diffuseness_vector[meta_write_index][b] );

                }