Commit 91af3f0a authored by mcdonaldb's avatar mcdonaldb
Browse files

Merge branch... 

Merge branch '1-ivas-internal-error-in-decoder-for-custom-loudspeaker-format-with-sba-input-at-24-4kbps' into 'main'

fix for 1-ivas-internal-error-in-decoder-for-custom-loudspeaker-format-with-sba-input-at-24-4kbps

Fix for a bug which caused errors in the decoder when using a custom loudspeaker layout.

Related to #1

See merge request !6
parents 5caba6eb 939abc9e

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ 
/*#define FIX_IVAS_180_PLC_SIGNAL_LAST_OVLP_IN_TCX10*/  /* IVAS-180 write last overlap mode in TCX10 frames to allow for correct TCX10/TCX5 subframe decomposition in TCX10 frames after a lost frame */

/*#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 */



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

lib_dec/ivas_spar_foa_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -976,7 +976,11 @@ void ivas_spar_foa_dec_upmixer( 
    /* determine if we can skip certain data */

    ivas_spar_get_skip_mat( hSparFoa, numch_out, numch_in, num_spar_bands, b_skip_mat ); /* this can be precomputed based on bitrate and format*/



#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++ )

    {