Commit 3b4a8a15 authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

Merge branch '2226-segmentation-fault-in-isar-pre-renderer' into 'main' 

Resolve "Segmentation fault in ISAR Pre-renderer"

Closes #2226

See merge request !2568
parents b64c6536 dd5266b0

lib_com/options.h

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


#define NONBE_FIX_2205_SATURATE_ALTERNATIVE

#define NONBE_FIX_2206_SATURATE_ALTERNATIVE

#define FIX_2226_ISAR_PRE_CRASH_CLDFB_NO_CHANNELS           /* Dolby: Fix crash of ISAR pre-renderer due to an attempt of re-scaling  uninitialized values in the CLDFB filter bank */



/* ################### End FIXES switches ########################### */

lib_isar/lib_isar_pre_rend.c

+4 −0
Original line number Diff line number Diff line
@@ -391,7 +391,11 @@ ivas_error ISAR_PRE_REND_MultiBinToSplitBinaural( 
            q_final = sub( s_min( Q_buff_re, Q_buff_im ), 2 );

            FOR( i = 0; i < hSplitBin->hSplitBinLCLDEnc->iChannels; i++ )

            {

#ifdef FIX_2226_ISAR_PRE_CRASH_CLDFB_NO_CHANNELS

                FOR( j = 0; j < hSplitBin->hSplitBinLCLDEnc->iNumBlocks; j++ )

#else

                FOR( j = 0; j < CLDFB_NO_COL_MAX; j++ )

#endif

                {

                    Scale_sig32( Cldfb_In_BinReal_fx[i][j], CLDFB_NO_CHANNELS_MAX, sub( q_final, Q_buff_re ) );

                    Scale_sig32( Cldfb_In_BinImag_fx[i][j], CLDFB_NO_CHANNELS_MAX, sub( q_final, Q_buff_im ) );