Commit 0b6c9965 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_ISM_DTX_CLICKS

parent 420a1a10

lib_com/options.h

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






#define FIX_ISM_DTX_CLICKS                              /* FhG: fix for clicks in ISM DTX for inactive to active TCX transitions */

#define ISSUE_24_CLEANUP_MCT_LFE                        /* Issue 24: Cleanup LFE path withing MCT */

#define FIX_398_MASA_DIRECTION_ALIGNMENT                /* Nokia: Issue 398: in 2dir MASA, dynamically adjust directions to be consistent */

lib_com/prot.h

+0 −2
Original line number Diff line number Diff line
@@ -5858,9 +5858,7 @@ ivas_error core_switching_post_dec( 
    float *synth,       /* i/o: output synthesis                        */

    float *output,      /* i/o: LB synth/upsampled LB synth             */

    float output_mem[], /* i  : OLA memory from last TCX/HQ frame       */

#ifdef FIX_ISM_DTX_CLICKS

    const IVAS_FORMAT ivas_format, /* i  : IVAS format                             */

#endif

    const int16_t use_cldfb_for_dft,     /* i  : flag to use of CLDFB for DFT Stereo     */

    const int16_t output_frame,          /* i  : frame length                            */

    const int16_t core_switching_flag,   /* i  : ACELP->HQ switching frame flag          */

lib_dec/core_switching_dec.c

+0 −6
Original line number Diff line number Diff line
@@ -556,9 +556,7 @@ ivas_error core_switching_post_dec( 
    float *synth,       /* i/o: output synthesis                    */

    float *output,      /* i/o: LB synth/upsampled LB synth         */

    float output_mem[], /* i  : OLA memory from last TCX/HQ frame   */

#ifdef FIX_ISM_DTX_CLICKS

    const IVAS_FORMAT ivas_format, /* i  : IVAS format                         */

#endif

    const int16_t use_cldfb_for_dft,     /* i  : flag to use of CLDFB for DFT Stereo */

    const int16_t output_frame,          /* i  : frame length                        */

    const int16_t core_switching_flag,   /* i  : ACELP->HQ switching flag            */
@@ -680,11 +678,7 @@ ivas_error core_switching_post_dec( 
                    synth[i + delay_comp] = ( synth[i + delay_comp] * i + ( tmpDelta - i ) * st->previoussynth[i + delay_comp] ) / tmpDelta;

                }



#ifdef FIX_ISM_DTX_CLICKS

                if ( ( st->element_mode == IVAS_CPE_MDCT || ( ivas_format == ISM_FORMAT && st->core == TCX_20_CORE /* <- means TCX in general, TCX10 is forbidden after ACELP */ ) ) && st->last_core_brate <= SID_2k40 && st->core_brate > SID_2k40 )

#else

                if ( st->element_mode == IVAS_CPE_MDCT && st->last_core_brate <= SID_2k40 && st->core_brate > SID_2k40 )

#endif

                {

                    /* smooth transitions to avoid pops in car noise items */

                    smoothTransitionDtxToTcx( synth, output_frame, delay_comp );

lib_dec/evs_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -276,11 +276,7 @@ ivas_error evs_dec( 
         * Postprocessing for ACELP/MDCT core switching

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



#ifdef FIX_ISM_DTX_CLICKS

        if ( ( error = core_switching_post_dec( st, synth, NULL, NULL, 0, MONO_FORMAT, output_frame, core_switching_flag, 0, -1, EVS_MONO ) ) != IVAS_ERR_OK )

#else

        if ( ( error = core_switching_post_dec( st, synth, NULL, NULL, 0, output_frame, core_switching_flag, 0, -1, EVS_MONO ) ) != IVAS_ERR_OK )

#endif

        {

            return error;

        }

lib_dec/ivas_core_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -447,11 +447,7 @@ ivas_error ivas_core_dec( 
            mvr2r( synth[n], hSCE->save_synth, output_frame );

        }



#ifdef FIX_ISM_DTX_CLICKS

        if ( ( error = core_switching_post_dec( st, synth[n], output[n], p_output_mem, ( st_ivas != NULL ) ? st_ivas->ivas_format : UNDEFINED_FORMAT, use_cldfb_for_dft, output_frame, 0 /*core_switching_flag*/, sba_dirac_stereo_flag, nchan_out, ( hCPE != NULL ) ? hCPE->last_element_mode : IVAS_SCE ) ) != IVAS_ERR_OK )

#else

        if ( ( error = core_switching_post_dec( st, synth[n], output[n], p_output_mem, use_cldfb_for_dft, output_frame, 0 /*core_switching_flag*/, sba_dirac_stereo_flag, nchan_out, ( hCPE != NULL ) ? hCPE->last_element_mode : IVAS_SCE ) ) != IVAS_ERR_OK )

#endif

        {

            return error;

        }