Commit 6b7b8ea6 authored by vaclav's avatar vaclav
Browse files

activate NONBE_FIX_1402_WAVEADJUST to fix EVS non-BE

parent d3e828a2

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -172,5 +172,5 @@ 
#define DOT_PROD_CHOLESKY_64BIT                 /* FhG: Issue 1323, optimized 64 bit implementation of dot_product_cholesky() */

#define OPT_BASOP_ADD_v1                        /* optimizations to avoid usage of BASOP_Util_Add_MantExp */

#define FIX_ISSUE_1327                          /* Ittiam: Fix for issue 1327: Glitch when stereo is switching from TD to FD*/

//#define FIX_WAVEADJUST                          /* fix waveform adjustment decoder PLC */

#define NONBE_FIX_1402_WAVEADJUST               /* VA: BASOP iisue 1402: fix waveform adjustment decoder PLC */

#endif

lib_dec/dec_tcx_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -4406,7 +4406,7 @@ void decoder_tcx_noisefilling_fx( 
        /* get the starting location of the subframe in the frame */

        IF( EQ_16( st->core, TCX_10_CORE ) )

        {

#ifdef FIX_WAVEADJUST

#ifdef NONBE_FIX_1402_WAVEADJUST

            st->hPlcInfo->subframe_fx = extract_l( L_mult0( frame_cnt, L_frameTCX_glob ) );

#else

            st->hPlcInfo->subframe = extract_l( L_mult0( frame_cnt, L_frameTCX_glob ) );

lib_dec/ivas_core_dec_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -1284,7 +1284,7 @@ ivas_error ivas_core_dec_fx( 
                }

                waveform_adj2_fix( st->hPlcInfo, st->hTonalMDCTConc->secondLastPcmOut, synth_16_fx[n] + tmps, tmps, add( st->hPlcInfo->nbLostCmpt, 1 ), st->bfi );



#ifdef FIX_WAVEADJUST

#ifdef NONBE_FIX_1402_WAVEADJUST

                st->hPlcInfo->Pitch_fx = 0;

#else

                st->hPlcInfo->Pitch = 0;

lib_dec/ivas_tcx_core_dec_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -644,7 +644,7 @@ void stereo_tcx_core_dec_fx( 
            test();

            test();

            test();

#ifdef FIX_WAVEADJUST

#ifdef NONBE_FIX_1402_WAVEADJUST

            IF( ( bfi || st->prev_bfi ) && st->hPlcInfo->Pitch_fx && EQ_16( st->hPlcInfo->concealment_method, TCX_NONTONAL ) )

#else

            IF( ( bfi || st->prev_bfi ) && st->hPlcInfo->Pitch && EQ_16( st->hPlcInfo->concealment_method, TCX_NONTONAL ) )
@@ -654,7 +654,7 @@ void stereo_tcx_core_dec_fx( 


                if ( !bfi && st->prev_bfi )

                {

#ifdef FIX_WAVEADJUST

#ifdef NONBE_FIX_1402_WAVEADJUST

                    st->hPlcInfo->Pitch_fx = 0;

#else

                    st->hPlcInfo->Pitch = 0;

lib_dec/stat_dec.h

+3 −3
Original line number Diff line number Diff line
@@ -175,11 +175,11 @@ typedef struct 
{

    Word16 L_frameTCX;



#ifndef FIX_WAVEADJUST

#ifndef NONBE_FIX_1402_WAVEADJUST

    Word16 Pitch;

#endif

    Word16 Pitch_fx;

#ifndef FIX_WAVEADJUST

#ifndef NONBE_FIX_1402_WAVEADJUST

    Word16 T_bfi;

#endif

    Word8 T_bfi_fx;
@@ -202,7 +202,7 @@ typedef struct 


    Word16 concealment_method;



#ifndef FIX_WAVEADJUST

#ifndef NONBE_FIX_1402_WAVEADJUST

    Word16 subframe;

#endif

    Word16 subframe_fx;