Commit cba58af8 authored by vaclav's avatar vaclav
Browse files

apply decoder MD smoothing in paramISM also for objects 3 and 4; under FIX_MD_SMOOTH_PARAMISM

parent 47c0ea20

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ 
#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/ivas_ism_dtx_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -229,7 +229,11 @@ ivas_error ivas_ism_dtx_dec( 
        }

    }



#ifdef FIX_MD_SMOOTH_PARAMISM

    update_last_metadata( nchan_ism, st_ivas->hIsmMetaData, md_diff_flag );

#else

    update_last_metadata( st_ivas->nchan_transport, st_ivas->hIsmMetaData, md_diff_flag );

#endif



    st_ivas->hISMDTX.ism_dtx_hangover_cnt = 0;

#endif

lib_dec/ivas_ism_metadata_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -702,7 +702,11 @@ ivas_error ivas_ism_metadata_dec( 
     *----------------------------------------------------------------*/



    set_s( md_diff_flag, 1, nchan_ism );

#ifdef FIX_MD_SMOOTH_PARAMISM

    update_last_metadata( nchan_ism, hIsmMeta, md_diff_flag );

#else

    update_last_metadata( *nchan_transport, hIsmMeta, md_diff_flag );

#endif

#endif



    for ( ch = 0; ch < *nchan_transport; ch++ )

lib_enc/ivas_ism_enc.c

+6 −2
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ ivas_error ivas_ism_enc( 
#ifdef TD5

        ivas_ism_metadata_enc( st_ivas->hEncoderConfig->ivas_total_brate,

#ifdef NCHAN_ISM_PARAMETER

                               st_ivas->hEncoderConfig->nchan_ism,

                               nchan_ism,

#endif

                               st_ivas->nchan_transport, st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->hSCE[st_ivas->nSCE - 1]->hMetaData, nb_bits_metadata, vad_flag, st_ivas->ism_mode, st_ivas->hDirAC->hParamIsm, st_ivas->hEncoderConfig->ism_extended_metadata_flag );

#else
@@ -279,7 +279,7 @@ ivas_error ivas_ism_enc( 
#ifdef TD5

        ivas_ism_metadata_enc( st_ivas->hEncoderConfig->ivas_total_brate,

#ifdef NCHAN_ISM_PARAMETER

                               st_ivas->hEncoderConfig->nchan_ism,

                               nchan_ism,

#endif

                               st_ivas->nchan_transport, st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->hSCE[st_ivas->nSCE - 1]->hMetaData, nb_bits_metadata, vad_flag, st_ivas->ism_mode, NULL, st_ivas->hEncoderConfig->ism_extended_metadata_flag );

#else
@@ -288,7 +288,11 @@ ivas_error ivas_ism_enc( 
    }



#ifdef DISCRETE_ISM_DTX_CNG

#ifdef FIX_MD_SMOOTH_PARAMISM

    update_last_metadata( nchan_ism, st_ivas->hIsmMetaData, md_diff_flag );

#else

    update_last_metadata( st_ivas->nchan_transport, st_ivas->hIsmMetaData, md_diff_flag );

#endif

#endif



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