Commit 31e19921 authored by multrus's avatar multrus
Browse files

Merge branch 'basop-2437-harmonize-encodeindex_ivas_fx-and-encodeindex_fx' into 'main' 

Resolves issue: 2437 "Harmonize EncodeIndex_ivas_fx() and EncodeIndex_fx()"

See merge request !2828
parents 46f230a3 b5805a3a

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ 
#define FIX_2411_Harmonize_TNSANALYSIS_DETECTTNSFILT    /* FhG: basop issue 2411: harmonize TNSAnalysis*_fx(), DetectTnsFilt*_fx()*/        

#define HARMONIZE_READ_DECODE_TNS                       /* FhG basop 2389: Harm between two pairs of functions. */

#define FIX_FLOAT_1526_DIRAC_MEM_LEAK                   /* FhG: float issue 1526: potential memory leak in DirAC handles in case of format switching */

#define FIX_2437_HARMONIZE_ENCODERINDEX                 /* FhG: basop issue 2437 EncoderIndex_ivas_fx() and EncoderIndex_fx()*/



/* #################### End BE switches ################################## */

lib_enc/ari_hm_enc_fx.c

+2 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ Word16 EncodeIndex_fx( 
        return 8;

    }

}

#ifndef FIX_2437_HARMONIZE_ENCODERINDEX

Word16 EncodeIndex_ivas_fx(

    const Word16 Bandwidth,

    Word16 PeriodicityIndex,
@@ -79,6 +80,7 @@ Word16 EncodeIndex_ivas_fx( 
        return 8;

    }

}

#endif // !FIX_2437_HARMONIZE_ENCODERINDEX

/*-------------------------------------------------------------------*

 * SearchPeriodicityIndex_Single()

 *

lib_enc/enc_prm_fx.c

+9 −0
Original line number Diff line number Diff line
@@ -82,7 +82,11 @@ static void enc_prm_hm_ivas_fx( 
            flag = 1;

            move16();

        }

#ifndef FIX_2437_HARMONIZE_ENCODERINDEX

        EncodeIndex_ivas_fx( flag, prm_hm[1], hBstr );

#else

        EncodeIndex_fx( flag, prm_hm[1], hBstr );

#endif // !FIX_2437_HARMONIZE_ENCODERINDEX



        IF( EQ_16( st->hTcxCfg->coder_type, VOICED ) )

        {
@@ -1234,7 +1238,12 @@ void writeTCXparam_fx( 


                    IF( prm[j] )

                    {

#ifndef FIX_2437_HARMONIZE_ENCODERINDEX

                        EncodeIndex_ivas_fx( (Word16) GE_16( hm_size, 256 ), prm[j + 1], hBstr );

#else

                        EncodeIndex_fx( (Word16) GE_16( hm_size, 256 ), prm[j + 1], hBstr );

#endif // !FIX_2437_HARMONIZE_ENCODERINDEX





                        flag_ctx_hm = 1;

                        move16();

lib_enc/prot_fx_enc.h

+2 −2
Original line number Diff line number Diff line
@@ -2577,13 +2577,13 @@ Word16 EncodeIndex_fx( 
    Word16 PeriodicityIndex,

    BSTR_ENC_HANDLE hBst /* i/o: bitstream handle            */

);



#ifndef FIX_2437_HARMONIZE_ENCODERINDEX

Word16 EncodeIndex_ivas_fx(

    const Word16 Bandwidth, /* 0: NB, 1: (S)WB */

    Word16 PeriodicityIndex,

    BSTR_ENC_HANDLE hBst /* i/o: bitstream handle            */

);



#endif

void enc_prm_side_Info_fx(

    PLC_ENC_EVS_HANDLE hPlc_Ext,

    Encoder_State *st );