Commit 92f7e4dc authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1_CUSTOM_LS

parent 54045e89

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -146,7 +146,6 @@ 
/*#define FIX_IVAS_185_MDCT_ST_PLC_FADEOUT*/            /* IVAS-185 fix bug in TCX-PLC fadeout for MDCT-Stereo and improve fadeout by fading to background noise instead of white noise */

/*#define FIX_I1_113*/                                  /* under review : MCT bit distribution optimization for SBA high bitrates*/



#define FIX_1_CUSTOM_LS                                   /* fix bug 1-ivas-internal-error-in-decoder-for-custom-loudspeaker-format-with-sba-input-at-24-4kbps */

#define FIX_TDREND_STANDALONE                           /* Fix for TD standalone renderer (broken after update of hHrtfTD pointer and addition of hRenderConfig */

#define FIX_MDCT_KERNEL_RATE_SWITCHING_PLC              /* force kernel that can handle ACELP -> TCX transition frame lengths for transition frames in decoder */

#define FIX_SBA_CLEAN_UP_OPT                            /* Fix for tickets #6, #10, #17 and #20 */

lib_dec/ivas_spar_foa_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -1182,11 +1182,7 @@ void ivas_spar_dec_upmixer( 
    ivas_spar_get_skip_mat( hSpar, numch_out, numch_in, num_spar_bands, b_skip_mat ); /* this can be precomputed based on bitrate and format*/

#endif



#ifdef FIX_1_CUSTOM_LS

    numch_out_dirac = st_ivas->hDecoderConfig->nchan_out;

#else

    numch_out_dirac = audioCfg2channels( st_ivas->hDecoderConfig->output_config );

#endif



    for ( int16_t i_sf = 0; i_sf < MAX_PARAM_SPATIAL_SUBFRAMES; i_sf++ )

    {