Commit 7c27cb4b authored by bayers's avatar bayers
Browse files

Merge branch '220-sanitizer-errors-in-parammc-svd-function' into 'main' 

#220: fix sanitizer problem in ParamMC/svd caused by NaNs

See merge request !291
parents 53694b65 23349265

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ 
#ifdef FIX_185_REDUCE_MD_BITS

#define CLEANUP_185_NO_AGC_EXCEPTION                    /* Issue 185: Cleanup AGC EXCEPTION code */

#endif

#define FIX_I220_PARAMMC_CPROTO                         /* Issue 220: sanitizer error in the svd due to NaNs coming from negative energies in Cproto */





/* ################## End DEVELOPMENT switches ######################### */

lib_dec/ivas_mc_param_dec.c

+10 −0
Original line number Diff line number Diff line
@@ -1564,6 +1564,16 @@ static void ivas_param_mc_get_mixing_matrices( 


        matrix_product( mat_mult_buffer1, nY_intern, nX, 0, hParamMC->proto_matrix_int, nY_intern, nX, 1, Cproto );



#ifdef FIX_I220_PARAMMC_CPROTO

        for ( ch_idx1 = 0; ch_idx1 < nY_intern; ch_idx1++ )

        {

            if ( Cproto[ch_idx1 + ch_idx1 * nY_intern] < 0.0f )

            {

                Cproto[ch_idx1 + ch_idx1 * nY_intern] = 0.0f;

            }

        }

#endif



        ivas_param_mc_dequantize_cov( hParamMC,

                                      hParamMC->icld_q + param_band_idx * hParamMC->hMetadataPMC->ild_mapping_conf->ild_map_size_lfe,

                                      hParamMC->icc_q + param_band_idx * hParamMC->hMetadataPMC->icc_mapping_conf->icc_map_size_lfe,