Commit 5fe6524e authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_380_BFI_PARAMISM

parent ae6f33c7

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -146,7 +146,6 @@ 
#define FIX_350_MASA_DELAY_COMP                         /* Nokia: Issue 350: MASA audio/meta delay compensation */





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

#define FIX_MDCT_BASED_BWD                              /* FhG: fixes for BWD for issues with reaction to transients for MDCT-stereo and MCT */

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

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

lib_dec/ivas_ism_metadata_dec.c

+0 −18
Original line number Diff line number Diff line
@@ -437,7 +437,6 @@ ivas_error ivas_ism_metadata_dec( 
    }

    else /* BFI */

    {

#ifdef FIX_380_BFI_PARAMISM

#ifndef NCHAN_ISM_PARAMETER

        /* "nchan_ism", "hIsmMeta->azimuth" and "hIsmMeta->elevation" are recycled from the last frame */

        if ( ism_mode == ISM_MODE_PARAM )
@@ -450,14 +449,6 @@ ivas_error ivas_ism_metadata_dec( 
        }

#endif

        for ( ch = 0; ch < nchan_ism; ch++ )

#else

        /* "*nISms", "hIsmMeta->azimuth" and "hIsmMeta->elevation" are recycled from the last frame */

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

        {

            hIsmMeta[ch]->ism_metadata_flag = hIsmMeta[ch]->last_ism_metadata_flag;

        }

        for ( ; ch < nchan_ism; ch++ )

#endif

        {

            hIsmMeta[ch]->last_ism_metadata_flag = hIsmMeta[ch]->ism_metadata_flag;

        }
@@ -468,17 +459,8 @@ ivas_error ivas_ism_metadata_dec( 
        {

            for ( ch = 0; ch < nchan_ism; ch++ )

            {

#ifdef FIX_380_BFI_PARAMISM

                hParamIsm->azi_index[ch] = hParamIsm->azi_index[ch] + hParamIsm->last_az_sgn[ch] * hParamIsm->last_az_diff[ch];

                hParamIsm->ele_index[ch] = hParamIsm->ele_index[ch] + hParamIsm->last_el_sgn[ch] * hParamIsm->last_el_diff[ch];

#else

                hParamIsm->azi_index[ch] = hParamIsm->azi_index[ch] + hParamIsm->last_az_sgn[ch] * hParamIsm->last_az_diff[ch];

                /*hParamIsm->azi_index[ch] = hParamIsm->azi_index[ch] % hParamIsm->az_alpha[ch];*/

                hParamIsm->azi_index[ch] = hParamIsm->azi_index[ch];

                hParamIsm->ele_index[ch] = hParamIsm->ele_index[ch] + hParamIsm->last_el_sgn[ch] * hParamIsm->last_el_diff[ch];

                /*hParamIsm->ele_index[ch] = hParamIsm->ele_index[ch] % hParamIsm->ele_alpha;*/

                hParamIsm->ele_index[ch] = hParamIsm->ele_index[ch];

#endif

                hIsmMeta[ch]->angle[0].last_azimuth_idx = hParamIsm->azi_index[ch];

                hIsmMeta[ch]->angle[0].last_elevation_idx = hParamIsm->ele_index[ch];

            }