Commit 00498e16 authored by vaclav's avatar vaclav
Browse files

- activate again DISCRETE_ISM_DTX_CNG + fix compilation warnings when it is not activated

parent d3e1905f

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ 


#define FIX_380_BFI_PARAMISM                            /* VA: issue 380 - fix metadata recovery in ParamISM BFI */

#define FIX_MDCT_BASED_BWD                              /* FhG: fixes for BWD for issues with reaction to transients for MDCT-stereo and MCT */

//#define DISCRETE_ISM_DTX_CNG                            /* FhG/VA: contribution 15 - DTX/CNG for (discrete) ISM */

#define DISCRETE_ISM_DTX_CNG                            /* FhG/VA: contribution 15 - DTX/CNG for (discrete) ISM */

#define NCHAN_ISM_PARAMETER                             /* VA: make 'nchan_ism' parameter part of st_ivas/hEncoderConfig */

lib_dec/ivas_ism_metadata_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ ivas_error ivas_ism_metadata_dec( 
#endif



        pop_wmops();

        return error;

        return IVAS_ERR_OK;

    }

#endif

lib_enc/ivas_ism_enc.c

+5 −2
Original line number Diff line number Diff line
@@ -90,9 +90,10 @@ ivas_error ivas_ism_enc( 
    int16_t md_diff_flag[MAX_NUM_OBJECTS];

#else

#ifdef NCHAN_ISM_PARAMETER

    int16_t nchan_ism;

#endif

    int16_t nchan_ism, dtx_flag, sid_flag;

#else

    int16_t dtx_flag, sid_flag, flag_noisy_speech;

#endif

    int16_t i, nBits;

#endif

    ivas_error error;
@@ -107,7 +108,9 @@ ivas_error ivas_ism_enc( 


    dtx_flag = 0;

    sid_flag = 0;

#if ( !defined NCHAN_ISM_PARAMETER || defined DISCRETE_ISM_DTX_CNG )

    flag_noisy_speech = 0;

#endif



#ifdef NCHAN_ISM_PARAMETER

    nchan_ism = st_ivas->hEncoderConfig->nchan_ism;