Commit 72cd219e authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_1329_FIX_OSBA_CRASH

parent 61d55412

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ 


/* #################### Start BASOP porting switches ############################ */



#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_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -472,7 +472,6 @@ void stereo_coder_tcx_fx( 
            nAvailBitsMS[k] = idiv1616( nAvailBitsMS[k], nSubframes ); /* Q0 */

            move16();



#ifdef NONBE_1329_FIX_OSBA_CRASH

            test();

            IF( mct_on && LE_16( nAvailBitsMS[k], 0 ) ) /*Force M/S when bit-budget is low for MCT*/

            {
@@ -484,7 +483,6 @@ void stereo_coder_tcx_fx( 
            }

            ELSE

            {

#endif

                MsStereoDecision_fx( sfbConf, sts[0]->hTcxEnc->spectrum_fx[k], sts[1]->hTcxEnc->spectrum_fx[k], inv_spectrum_fx[0][k], inv_spectrum_fx[1][k], sub( Q31, exp_spec ), &hStereoMdct->mdct_stereo_mode[k], &ms_mask[k][0], nAvailBitsMS[k] );



                IF( sts[0]->igf )
@@ -497,9 +495,7 @@ void stereo_coder_tcx_fx( 
                    hStereoMdct->IGFStereoMode[k] = hStereoMdct->mdct_stereo_mode[k];

                    move16();

                }

#ifdef NONBE_1329_FIX_OSBA_CRASH

            }

#endif



            IF( NE_16( hStereoMdct->mdct_stereo_mode[k], SMDCT_DUAL_MONO ) || NE_16( hStereoMdct->IGFStereoMode[k], SMDCT_DUAL_MONO ) )

            {