Commit 1e32cf7b authored by eichenseer's avatar eichenseer
Browse files

Merge DISC_CNG into DISCRETE_ISM_DTX_CNG.

parent b403bd06

lib_com/ivas_prot.h

+1 −1
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ void stereo_tcx_core_dec( 
#ifdef PARAM_ISM_DTX_CNG

    ,

    const IVAS_FORMAT ivas_format                               /* i  : IVAS format                             */

#ifndef DISC_CNG

#ifndef DISCRETE_ISM_DTX_CNG

   ,const ISM_MODE ism_mode                                     /* i  : ISM mode (only needed if format is ISM) */

#endif

#endif

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -168,7 +168,6 @@ 
#define TUNE_360_OBJECT_WITH_NOISE                      /* VA: issue 360: consider objects being speech+noise for active speech coding */



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

#define DISC_CNG

lib_dec/ivas_core_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ ivas_error ivas_core_dec( 
            /* TCX decoder */

#ifdef PARAM_ISM_DTX_CNG

            stereo_tcx_core_dec( st, frameMode[n], output[n], synth[n], pitch_buf[n], sba_dirac_stereo_flag, hStereoTD, last_element_mode, flag_sec_CNA, hCPE == NULL ? NULL : hCPE->hStereoCng, nchan_out, st_ivas == NULL ? 0 : st_ivas->ivas_format

#ifndef DISC_CNG

#ifndef DISCRETE_ISM_DTX_CNG

                                 ,

                                 st_ivas == NULL ? 0 : st_ivas->ism_mode

#endif

lib_dec/ivas_sce_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ ivas_error ivas_sce_dec( 
    last_ivas_total_brate = st_ivas->hDecoderConfig->last_ivas_total_brate;



#ifdef PARAM_ISM_DTX_CNG

#ifdef DISC_CNG

#ifdef DISCRETE_ISM_DTX_CNG

    if ( st_ivas->ivas_format == ISM_FORMAT )

#else

    if ( st_ivas->ism_mode == ISM_MODE_PARAM )

lib_dec/ivas_tcx_core_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ void stereo_tcx_core_dec( 
#ifdef PARAM_ISM_DTX_CNG

    ,

    const IVAS_FORMAT ivas_format /* i  : IVAS format                             */

#ifndef DISC_CNG

#ifndef DISCRETE_ISM_DTX_CNG

    ,

    const ISM_MODE ism_mode /* i  : ISM mode (only needed if format is ISM) */

#endif
@@ -733,7 +733,7 @@ void stereo_tcx_core_dec( 
        if ( st->element_mode != IVAS_CPE_TD )

        {

#ifdef PARAM_ISM_DTX_CNG

#ifndef DISC_CNG

#ifndef DISCRETE_ISM_DTX_CNG

            if ( ivas_format == ISM_FORMAT && ism_mode == ISM_MODE_PARAM )

#else

            if ( ivas_format == ISM_FORMAT )