Commit 5a8cff59 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_2334_HARM_CODER_MODIF

parent 50437ede

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ 
#define FIX_2255_ISAR_RENDER_POSES                      /* VA: issue 2255: fix missing check in isar_render_poses() */

#define FIX_1904_HARM_GSC_ENC                           /* VA: #1904 Harmonization of EVS and IVAS GSC code */

#define FIX_1478_UNINIT_ON_BFI                          /* VA: Fix issue 1478 where a vector is partly un-initialized during bfi */

#define FIX_2334_HARM_CODER_MODIF                       /* VA: basop issue 2334 : harmonizing coder_modif_function */

#define FIX_FLOAT_1501_UNIT_VALUE_IN_OMASA              /* Nokia: Fix float issue 1501, uninitialized value in ivas_masa_combine_directions for OMASA */

#define FIX_BASOP_2323_DIRAC_ENC_WRONG_INIT             /* Nokia/FhG: basop issue 2323: Use correct init size */

#define FIX_BASOP_2324_MISSING_SET_TO_ZERO              /* Nokia: basop issue 2324: Fix issue by setting the exponent to zero where it should be */

lib_enc/ivas_cpe_enc_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -1132,11 +1132,7 @@ ivas_error ivas_cpe_enc_fx( 
        IF( ( NE_16( hCPE->element_mode, IVAS_CPE_DFT ) && NE_16( hCPE->element_mode, IVAS_CPE_TD ) ) || n == 0 ) /* modify coder_type of primary channel */

        {

            /* limit coder_type depending on the bitrate */

#ifndef FIX_2334_HARM_CODER_MODIF

            coder_type_modif_ivas_fx( sts[n], relE_fx[n] );

#else

            coder_type_modif_fx( sts[n], relE_fx[n] );

#endif

        }

    }

lib_enc/ivas_ism_enc_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -438,11 +438,7 @@ ivas_error ivas_ism_enc_fx( 
        }



        /* modify the coder_type depending on the total_brate per channel */

#ifndef FIX_2334_HARM_CODER_MODIF

        coder_type_modif_ivas_fx( st, relE_fx[sce_id][0] );

#else

        coder_type_modif_fx( st, relE_fx[sce_id][0] );

#endif

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

         * Encoder

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

lib_enc/ivas_sce_enc_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -352,11 +352,7 @@ ivas_error ivas_sce_enc_fx( 
    move16();



    /* modify the coder_type depending on the total_brate per channel */

#ifndef FIX_2334_HARM_CODER_MODIF

    coder_type_modif_ivas_fx( st, relE_fx[0] );

#else

    coder_type_modif_fx( st, relE_fx[0] );

#endif

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

     * Encoder

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

lib_enc/prot_fx_enc.h

+0 −6
Original line number Diff line number Diff line
@@ -1152,12 +1152,6 @@ void coder_type_modif_fx( 
    const Word16 relE  /* i  : frame relative E to the long term average   */

);



#ifndef FIX_2334_HARM_CODER_MODIF

void coder_type_modif_ivas_fx(

    Encoder_State *st, /* i/o: encoder state structure                     */

    const Word16 relE  /* i  : frame relative E to the long term average   */

);

#endif

void speech_music_clas_init_fx(

    SP_MUS_CLAS_HANDLE hSpMusClas /* i/o: speech/music classifier handle   */

);