Commit 935c16c2 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_1329_FIX_OSBA_CRASH

parent 7c5ff854

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -157,7 +157,6 @@ 
/* #################### Start BASOP porting switches ############################ */



#define FIX_1129_EXT_REND_OUTPUT_HIGH                   /* Philips: issue 1129: External renderer BINAURAL_ROOM_REVERB format output level too high compared to internal rendering output */

#define NONBE_1329_FIX_OSBA_CRASH                       /* FhG: issue 1329: prevent assert when bit budget is low*/

#define NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER            /* FhG: issue 1128: set output ambisonics order to input order for EXT output  */

#define FIX_1138_SBA_EXT_ERROR_PRINTOUT                 /* VA: issue 1138: Fix SBA EXT output call of audioCfg2channels() */

#define NONBE_1244_FIX_SWB_BWE_MEMORY                   /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */

lib_enc/ivas_stereo_mdct_stereo_enc.c

+0 −4
Original line number Diff line number Diff line
@@ -411,7 +411,6 @@ void stereo_coder_tcx( 


            nAvailBitsMS[k] = ( ( mct_on ? 2 * sts[0]->bits_frame_channel : sts[0]->bits_frame_nominal ) - sts[0]->side_bits_frame_channel - sts[1]->side_bits_frame_channel - ( nSubframes == 2 ? OFFSET_BITS_TCX10 : OFFSET_BITS_TCX20 ) ) / nSubframes;



#ifdef NONBE_1329_FIX_OSBA_CRASH

            if ( mct_on && nAvailBitsMS[k] <= 0 ) /*Force M/S when bit-budget is low for MCT*/

            {

                hStereoMdct->mdct_stereo_mode[k] = 1;
@@ -420,7 +419,6 @@ void stereo_coder_tcx( 
            }

            else

            {

#endif

                MsStereoDecision( sfbConf, sts[0]->hTcxEnc->spectrum[k], sts[1]->hTcxEnc->spectrum[k], inv_spectrum[0][k], inv_spectrum[1][k], &hStereoMdct->mdct_stereo_mode[k], &ms_mask[k][0], nAvailBitsMS[k] );



                if ( sts[0]->igf )
@@ -432,9 +430,7 @@ void stereo_coder_tcx( 
                {

                    hStereoMdct->IGFStereoMode[k] = hStereoMdct->mdct_stereo_mode[k];

                }

#ifdef NONBE_1329_FIX_OSBA_CRASH

            }

#endif



            if ( hStereoMdct->mdct_stereo_mode[k] != SMDCT_DUAL_MONO || hStereoMdct->IGFStereoMode[k] != SMDCT_DUAL_MONO )

            {