Commit 918014bc authored by vaclav's avatar vaclav
Browse files

deactivate DTX_PARAM_BE; non-BE for paramISM

parent ba9f0368

lib_com/ivas_prot.h

+6 −0
Original line number Diff line number Diff line
@@ -929,7 +929,11 @@ ivas_error ivas_ism_dtx_open( 


#ifdef DISCRETE_ISM_DTX_CNG

/*! r: indication of DTX frame */

#ifdef DTX_PARAM_BE

int16_t ivas_ism_dtx_enc_COMMON(

#else

int16_t ivas_ism_dtx_enc(

#endif

    ISM_DTX_HANDLE hISMDTX,                                     /* i/o: ISM DTX handle                              */

    SCE_ENC_HANDLE hSCE[MAX_SCE],                               /* i/o: SCE encoder structure                       */

    const int16_t num_obj,                                      /* i  : number of objects                           */
@@ -940,11 +944,13 @@ int16_t ivas_ism_dtx_enc_COMMON( 
    int16_t *sid_flag                                           /* o  : indication of SID frame                     */

);

#endif

#if ( !defined DISCRETE_ISM_DTX_CNG || defined DTX_PARAM_BE )

/*! r: indication of DTX frame */

int16_t ivas_ism_dtx_enc(

    Encoder_Struct *st_ivas,                                    /* i/o: IVAS encoder structure                      */

    int16_t *sid_flag                                           /* o  : indication of SID frame                     */

);

#endif



ivas_error ivas_ism_dtx_dec(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                      */

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ 
#define DISCRETE_ISM_DTX_CNG                            /* FhG/VA: contribution 15 - DTX/CNG for (discrete) ISM */

#define MD_Q_PARAM_BE

#define MD_SMOOTH_PARAM_BE

#define DTX_PARAM_BE

/*#define DTX_PARAM_BE*/



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

/* clang-format on */

lib_enc/ivas_ism_dtx_enc.c

+7 −3
Original line number Diff line number Diff line
@@ -104,7 +104,11 @@ ivas_error ivas_ism_dtx_open( 
 *-------------------------------------------------------------------*/



/*! r: indication of DTX frame */

#ifdef DTX_PARAM_BE

int16_t ivas_ism_dtx_enc_COMMON( // VE!!!!! to be renamed at the end

#else

int16_t ivas_ism_dtx_enc(

#endif

    ISM_DTX_HANDLE hISMDTX,            /* i/o: ISM DTX handle               */

    SCE_ENC_HANDLE hSCE[MAX_SCE],      /* i/o: SCE encoder structure        */

    const int16_t num_obj,             /* i  : number of objects            */
@@ -276,7 +280,7 @@ int16_t ivas_ism_dtx_enc_COMMON( // VE!!!!! to be renamed at the end 
}

#endif





#if ( !defined DISCRETE_ISM_DTX_CNG || defined DTX_PARAM_BE )

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

 * ivas_ism_dtx_enc()

 *
@@ -411,7 +415,7 @@ int16_t ivas_ism_dtx_enc( 


    return dtx_flag;

}



#endif



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

 * ivas_ism_get_sce_id_dtx()

lib_enc/ivas_ism_enc.c

+3 −2
Original line number Diff line number Diff line
@@ -226,15 +226,16 @@ ivas_error ivas_ism_enc( 
#ifdef DTX_PARAM_BE

        if ( st_ivas->ism_mode != ISM_MODE_PARAM )

        {

#endif

            dtx_flag = ivas_ism_dtx_enc_COMMON( st_ivas->hISMDTX, st_ivas->hSCE, num_obj, st_ivas->nchan_transport, vad_flag, st_ivas->hIsmMetaData, md_diff_flag, &sid_flag );

#ifdef DTX_PARAM_BE

        }

        else

        {

            dtx_flag = ivas_ism_dtx_enc( st_ivas, &sid_flag );

        }

#else

        dtx_flag = ivas_ism_dtx_enc( st_ivas->hISMDTX, st_ivas->hSCE, num_obj, st_ivas->nchan_transport, vad_flag, st_ivas->hIsmMetaData, md_diff_flag, &sid_flag );

#endif



#else

        dtx_flag = ivas_ism_dtx_enc( st_ivas, &sid_flag );

#endif