Commit f9152c1a authored by vaclav's avatar vaclav
Browse files

changes and cleaning under DTX_PARAM_BE

parent 18cfa927

lib_com/ivas_prot.h

+0 −4
Original line number Diff line number Diff line
@@ -968,10 +968,6 @@ int16_t ivas_ism_dtx_enc_COMMON( 
    ISM_METADATA_HANDLE hIsmMeta[],                             /* i/o: ISM metadata handles                        */

    int16_t md_diff_flag[],                                     /* o  : metadata differential flag                  */

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

#ifdef MD_Q_PARAM_BE

    ,

    const ISM_MODE ism_mode

#endif

);

#endif

/*! r: indication of DTX frame */

lib_dec/ivas_ism_dtx_dec.c

+0 −1
Original line number Diff line number Diff line
@@ -216,7 +216,6 @@ ivas_error ivas_ism_dtx_dec( 
        }

    }





    return IVAS_ERR_OK;

}

#endif

lib_enc/ivas_ism_dtx_enc.c

+0 −11
Original line number Diff line number Diff line
@@ -113,10 +113,6 @@ int16_t ivas_ism_dtx_enc_COMMON( // VE!!!!! to be renamed at the end 
    ISM_METADATA_HANDLE hIsmMeta[],    /* i/o: ISM metadata handles         */

    int16_t md_diff_flag[],            /* o  : metadata differential flag   */

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

#ifdef MD_Q_PARAM_BE

    ,

    const ISM_MODE ism_mode

#endif

)

{

    int16_t ch, dtx_flag;
@@ -184,13 +180,6 @@ int16_t ivas_ism_dtx_enc_COMMON( // VE!!!!! to be renamed at the end 
                md_diff_flag[ch] = 1;

            }



#ifdef MD_Q_PARAM_BE

            if ( ism_mode == ISM_MODE_PARAM )

            {

                md_diff_flag[ch] = 1;

            }

#endif



            /* estimate SID metadata bit-budget */

            nBits++; /* number of objects */

            nBits++; /* SID metadata flag */

lib_enc/ivas_ism_enc.c

+10 −13
Original line number Diff line number Diff line
@@ -196,12 +196,6 @@ ivas_error ivas_ism_enc( 
        }



        vad_flag[sce_id] = st->vad_flag;

#ifdef DTX_PARAM_BE

        if ( st_ivas->ism_mode == ISM_MODE_PARAM )

        {

            vad_flag[sce_id] = vad_flag_dtx[sce_id][0];

        }

#endif

    }



#ifdef PARAM_ISM_DTX_CNG
@@ -219,19 +213,22 @@ ivas_error ivas_ism_enc( 
        ivas_ism_get_sce_id_dtx( st_ivas->hISMDTX, st_ivas->hSCE, st_ivas->nchan_transport, input_frame );



        /* analysis and decision about DTX */

#ifdef DISCRETE_ISM_DTX_CNG // VE!!!!! to be harmonized

#ifdef DISCRETE_ISM_DTX_CNG

#ifdef DTX_PARAM_BE

        if ( st_ivas->ism_mode != ISM_MODE_PARAM )

        {

            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 MD_Q_PARAM_BE

                                                ,

                                                st_ivas->ism_mode

#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 );

        }

#endif

#else

        dtx_flag = ivas_ism_dtx_enc( st_ivas, &sid_flag );

#endif



        if ( sid_flag )

        {