Commit a75a3adb authored by reutelhuber's avatar reutelhuber
Browse files

fix discrepancy with EVS code that could cause crashes in rare cases

parent 1cedd06d

lib_com/options.h

100644 → 100755
+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ 
#define FIX_355_REFACTOR_PARAMBIN_TO_5MS                /* Nokia: Fixes issue 355 by refactoring parametric binauralizer code to 5 ms mode */

#define FIX_411_EVS_BE_TESTS_ON_WINDOWS_FAILING         /* Eri: Fix incorrect use of stack variable used for channel aware config file */

#define COMBINED_FORMAT_SIGNALING                       /* VA: Introduce a signaling bit for combined format coding */



#define FIX_446_STEREO_DMX_CRASH                        /* FhG: fix discrepancy with EVS code that could cause crashes in rare cases */





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

lib_enc/ext_sig_ana.c

100644 → 100755
+9 −0
Original line number Diff line number Diff line
@@ -444,10 +444,19 @@ void core_signal_analysis_high_bitrate( 
                ProcessIGF( st, hTcxEnc->spectrum[frameno], hTcxEnc->spectrum[frameno], powerSpec, transform_type[frameno] == TCX_20, frameno, 0, vad_hover_flag );

            }



#ifndef FIX_446_STEREO_DMX_CRASH

            /* Copy memory */

            mvr2r( lsp_new, st->lspold_enc, M );

#endif

        }

    }

#ifdef FIX_446_STEREO_DMX_CRASH

    if ( st->element_mode != IVAS_CPE_MDCT )

    {

        /* Copy memory */

        mvr2r( lsp_new, st->lspold_enc, M );

    }

#endif



    return;

}