Commit 239778f4 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_I220_PARAMMC_CPROTO

parent 603e62d0

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -149,7 +149,6 @@ 
#define SBA_BR_SWITCHING                                /* Issue 114: Changes for sba bit rate switching*/

#define FIX_ITD                                         /* Contribution 16: TD renderer ITD improvement and code cleanup */

#define BRATE_SWITCHING_RENDERING                       /* Bitrate switching changes related to the renderers */

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

#define FIX_221_BR_SWITCH_STEREO                        /* Issue 221: Fix missing initialization when switchin from TD to MDCT stereo*/

#define FIX_DTX_RANGE                                   /* Issue 118: fix the DTX usage: default DTX up to 64 kbps, otherwise only in silence */

#define FIX_ISM_METADATA_READER                         /* Issue 211: make ISM metadata file reader robust against invalid files */

lib_dec/ivas_mc_param_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -1564,7 +1564,6 @@ 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 )
@@ -1572,7 +1571,6 @@ static void ivas_param_mc_get_mixing_matrices( 
                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,
@@ -1614,7 +1612,6 @@ static void ivas_param_mc_get_mixing_matrices( 


        matrix_product_diag( mat_mult_buffer1, nY_band, nX, 0, proto_matrix_ptr, nY_band, nX, 1, Cproto_diag );



#ifdef FIX_I220_PARAMMC_CPROTO

        /* make sure we have no negative entries in Cproto_diag due to rounding errors */

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

        {
@@ -1623,7 +1620,6 @@ static void ivas_param_mc_get_mixing_matrices( 
                Cproto_diag[ch_idx1] = 0.0f;

            }

        }

#endif



        /* Computing the mixing matrices */