Commit 5dbbe90e authored by vaillancour's avatar vaillancour
Browse files

fix for 2334, removing duplicated and buggy function

parent a0051869

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ 
#define FIX_2290_COPY_OF_UNINIT_DATA                    /* VA: prevent the copy of un-initialized data */

#define CLEANUP_ACELP_ENC                               /* VA: basop issue 2304: Remove duplicated code in excitation encoding in the ACELP core */

#define CLEANUP_VBR_CAM_ENC                             /* VA: basop issue 2299: Remove unused core-encoder VBR and CAM code */



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



/* #################### Start NON-BE switches ############################ */
@@ -133,6 +132,7 @@ 
#define FIX_2285_CODE_DECODER_INIT_BW                   /* VA: basop issue 2285: fix core-decoder initialization bandwidth */

#define FIX_2306_MISSING_UPDATE_LOWRATE_PITCH_GAIN      /* Dolby: Fix missing update of low-rate pitch gain in the S/M classifier */

#define FIX_2297_SBA_SCALING_32KHZ                      /* VA: basop issue 2297: Fix scaling factor before the SBA decoder for output_Fs = 32 or 16 */

#define FIX_2334_HARM_CODER_MODIF                       /* VA: basop issue 2334: remove a duplicated and wrong function, might affect some cases of VBR */



/* ##################### End NON-BE switches ########################### */

lib_enc/ivas_cpe_enc_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -1096,7 +1096,11 @@ 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

+4 −1
Original line number Diff line number Diff line
@@ -450,8 +450,11 @@ 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

+4 −1
Original line number Diff line number Diff line
@@ -343,8 +343,11 @@ 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

+2 −1
Original line number Diff line number Diff line
@@ -1194,11 +1194,12 @@ 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   */

);