Commit 9cf62c09 authored by vaclav's avatar vaclav
Browse files

merge FIX_DTX_BRATE_LIMIT, FORCE_EST and FIX_MD_SMOOTH_PARAMISM into DISCRETE_ISM_DTX_CNG

parent 2891b7a7

lib_com/ivas_prot.h

+0 −2
Original line number Diff line number Diff line
@@ -943,9 +943,7 @@ ivas_error ivas_ism_dtx_open( 
int16_t ivas_ism_dtx_enc(

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

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

#ifdef FIX_DTX_BRATE_LIMIT

    const int32_t ivas_total_brate,                             /* i  : IVAS total bitrate                          */

#endif

    const int16_t nchan_ism,                                    /* i  : number of objects                           */

    const int16_t nchan_transport,                              /* i  : number of transport channels                */

    int16_t vad_flag[MAX_NUM_OBJECTS],                          /* i  : VAD flag                                    */

lib_com/options.h

+0 −6
Original line number Diff line number Diff line
@@ -159,13 +159,7 @@ 
#endif



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



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

#define FIX_DTX_BRATE_LIMIT                             /* VA: limit the DTX usage in background noise to lower bitrates similarly as in other IVAS formats */

#ifdef DISCRETE_ISM_DTX_CNG

#define FORCE_EST                                       /* FhG: force ACELP noise estimation in ISM mode for first 100 frames to prevent all-zero CNG */

#define FIX_MD_SMOOTH_PARAMISM                          /* VA: apply decoder MD smoothing in paramISM also for objects 3 and 4 */

#endif

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

lib_dec/fd_cng_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ void ApplyFdCng( 
            hFdCngCom->sid_frame_counter = 0;

            /* set noise estimation inactive during concealment, as no update with noise generated by concealment should be performed. */

            /* set noise estimation inactive when we have bit errors, as no update with noise generated by corrupt frame (biterror) should be performed. */

#ifndef FORCE_EST

#ifndef DISCRETE_ISM_DTX_CNG

            if ( concealWholeFrame == 0 &&

                 ( timeDomainInput == NULL ||

                   ( *timeDomainInput<FLT_MAX && * timeDomainInput>( -FLT_MAX ) &&

lib_dec/init_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -740,7 +740,7 @@ ivas_error init_decoder( 
    st->cng_sba_flag = 0;

    st->cng_ism_flag = 0;

    st->read_sid_info = 1; /* by default read the sid info from bitstream */

#ifdef FORCE_EST

#ifdef DISCRETE_ISM_DTX_CNG

    st->is_ism_format = 0;

#endif

lib_dec/ivas_init_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -904,7 +904,7 @@ ivas_error ivas_init_decoder( 


            reset_indices_dec( st_ivas->hSCE[sce_id]->hCoreCoder[0] );



#ifdef FORCE_EST

#ifdef DISCRETE_ISM_DTX_CNG

            st_ivas->hSCE[sce_id]->hCoreCoder[0]->is_ism_format = 1;

#endif

        }