Commit ed818d7a authored by eichenseer's avatar eichenseer
Browse files

Added ParamISM explicitly to the "DTX supported" modes.

parent ca68222b

lib_com/options.h

+4 −2
Original line number Diff line number Diff line
@@ -161,8 +161,10 @@ 
#define PARAM_ISM_DTX_CNG_EST_RES_SPEC_DEC              /* Patch to estimate noise at decoder, includes USE_NOISE_EST_FROM_CORE_PARAM_ISM_DTX */

// helper switches:

#define SCALING_OFF                                     /* Remove the energy ratio/scaling parameter previously transmitted in the SID frames */

#define TMP_FIX                                         /* To do: move cng_type init to correct place */

//#define TMP_FIX2

// choose one of the following:

#define TMP_FIX                                         /* set cng_type to FD_CNG, quick hack; TODO: move init to correct place */

//#define TMP_FIX2                                        /* cng_type init here? seems to not quite produce the same results; to check */

//#define TMP_FIX3                                        /* cng_type here could work, to be verified 

#endif



/* ################## End DEVELOPMENT switches ######################### */

lib_dec/ivas_sce_dec.c

+3 −1
Original line number Diff line number Diff line
@@ -127,7 +127,9 @@ ivas_error ivas_sce_dec( 
    if (st_ivas->ism_mode == ISM_MODE_PARAM)

    {

        ivas_ism_preprocessing(st_ivas, sce_id);

        // TODO: esr: cng_type here?

#ifdef TMP_FIX3

        st->cng_type = FD_CNG;

#endif

    }

#else

    if (st_ivas->ism_mode == ISM_MODE_PARAM && (ivas_total_brate == IVAS_SID_5k2 || ivas_total_brate == FRAME_NO_DATA) && (sce_id == 1))

lib_enc/lib_enc.c

+2 −1
Original line number Diff line number Diff line
@@ -875,7 +875,8 @@ static ivas_error configureEncoder( 


#ifdef PARAM_ISM_DTX_CNG

    if ( hEncoderConfig->Opt_DTX_ON && hEncoderConfig->ivas_format != MONO_FORMAT &&

         ( ( hEncoderConfig->ivas_format == ISM_FORMAT && hEncoderConfig->nchan_inp == 2 ) ||                                  // ToDo: see Issue 113; quick hack for ParamISM DTX, bitrates not included in check

         ( ( hEncoderConfig->ivas_format == ISM_FORMAT && hEncoderConfig->nchan_inp == 2 ) ||                                  // ToDo: see Issue 113

           ( hEncoderConfig->ivas_format == ISM_FORMAT && hEncoderConfig->nchan_inp > 2 && !hEncoderConfig->ivas_total_brate == IVAS_24k4 && !hEncoderConfig->ivas_total_brate == IVAS_32k ) || // ParamISM

           ( hEncoderConfig->ivas_format == MASA_FORMAT && hEncoderConfig->ivas_total_brate > IVAS_128k ) ||                   // ToDo: remove the bitrate limitation

           ( hEncoderConfig->ivas_format == SBA_FORMAT && ivas_get_sba_num_TCs( hEncoderConfig->ivas_total_brate, 1 ) > 2 ) || // ToDo: support for 3+ TCs to be done

           hEncoderConfig->ivas_format == MC_FORMAT                                                                            // ToDo: TBD