Commit 34a18965 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_ISM_DTX_INFINITE_CNG_ON_TRAILING_SILENCE

parent 887cf6a1

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -177,7 +177,6 @@ 


#define NONBE_FIX_787_PARAM_UPMIX_LEVEL                       /* Dlb: issue 787: fix level of Mono/Stereo for ParamUpmix mode */



#define NONBE_FIX_ISM_DTX_INFINITE_CNG_ON_TRAILING_SILENCE    /* FhG: fix for cng in ISM DTX on sudden silence periods - JBM addon (issue 552) */

#define NONBE_FIX_738_SBA_BR_SW_ASAN                          /* FhG: issue 738: fixes bug when switching to an MCT bitrate and previous frame was ACELP */

#define NONBE_CR_FIX_735_SBA_HP20_BRATE_SWITCHING             /* VA: Issue 735: Resolve "HP20 filtering bug in SBA/OSBA bitrate switching" */

#define NONBE_FIX_588_UPDATE_FASTCONV_SD                      /* FhG: issue 588: update FastConv SD HRTFs in CLDFB domain with new conversion method */

lib_dec/ivas_jbm_dec.c

+0 −9
Original line number Diff line number Diff line
@@ -147,7 +147,6 @@ ivas_error ivas_jbm_dec_tc( 
            {

                return error;

            }

#ifdef NONBE_FIX_ISM_DTX_INFINITE_CNG_ON_TRAILING_SILENCE



            /* decode dominant object first so the noise energy of the other objects can be limited */

            if ( ( error = ivas_sce_dec( st_ivas, st_ivas->hISMDTX.sce_id_dtx, &p_output[st_ivas->hISMDTX.sce_id_dtx], output_frame, nb_bits_metadata[st_ivas->hISMDTX.sce_id_dtx] ) ) != IVAS_ERR_OK )
@@ -156,7 +155,6 @@ ivas_error ivas_jbm_dec_tc( 
            }



            ivas_ism_dtx_limit_noise_energy_for_near_silence( st_ivas->hSCE, st_ivas->hISMDTX.sce_id_dtx, st_ivas->nchan_transport );

#endif

        }

        else if ( st_ivas->ism_mode == ISM_MODE_PARAM )

        {
@@ -175,7 +173,6 @@ ivas_error ivas_jbm_dec_tc( 


        for ( n = 0; n < st_ivas->nchan_transport; n++ )

        {

#ifdef NONBE_FIX_ISM_DTX_INFINITE_CNG_ON_TRAILING_SILENCE

            /* for DTX frames, dominant object has already been decoded before */

            if ( !( ( ivas_total_brate == IVAS_SID_5k2 || ivas_total_brate == FRAME_NO_DATA ) && n == st_ivas->hISMDTX.sce_id_dtx ) )

            {
@@ -184,12 +181,6 @@ ivas_error ivas_jbm_dec_tc( 
                    return error;

                }

            }

#else

            if ( ( error = ivas_sce_dec( st_ivas, n, &output[n], output_frame, nb_bits_metadata[n] ) ) != IVAS_ERR_OK )

            {

                return error;

            }

#endif



            /* HP filtering */

            hp20( p_output[n], output_frame, st_ivas->mem_hp20_out[n], output_Fs );