Commit 4cd5b646 authored by Jan Kiene's avatar Jan Kiene
Browse files

accept FIX_558_PLC_DISCONT

parent adaa09bb

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -154,7 +154,6 @@ 
#define SBA_MODE_CLEANUP_2                              /* Dlb : changes part of fix issue #523 for unused signaling bit in SBA SID*/

#define FIX_137_SID_MD_BITS                             /* Dlb: Fix issue #137 , SID bitrate mismatch correction */

#define FIX_470_MASA_JBM_EXT                            /* Nokia: Issue 470, fix MASA EXT output with JBM */

#define FIX_558_PLC_DISCONT                             /* FhG: issue 558: fix discontinuities in DFT Stereo when switching from TCX concealment to ACELP */

#define FIX_564                                         /* Nokia: Issue 564: Fix gains in JBM path for SBA with parametric binaural renderer */

#define FIX_566_2DIR_MASA_384K                          /* Nokia: Issued 566:  Bugfix in 384k MASA metadata encoding of second direction */

#define FIX_568_ISM_BITRATE_SWITCHING                   /* Philips: Issue 568: Bugfix for renderer re-initialization by ISM and bitrate switching */

lib_dec/ivas_post_proc.c

+0 −4
Original line number Diff line number Diff line
@@ -208,11 +208,7 @@ void stereo_dft_dec_core_switching( 
        lerp( hCPE->input_mem_BPF[0], hCPE->input_mem_BPF[0], NS2SA( st->L_frame * FRAMES_PER_SEC, STEREO_DFT32MS_OVL_NS ), NS2SA( st->last_L_frame * FRAMES_PER_SEC, STEREO_DFT32MS_OVL_NS ) );

    }



#ifdef FIX_558_PLC_DISCONT

    if ( st->prev_bfi && !( st->last_core_bfi == ACELP_CORE && st->last_con_tcx == 1 ) )

#else

    if ( st->prev_bfi )

#endif

    {

        /* last_core needed for correctly decoding ACELP->TCX/HQ switching frames in ivas_core_dec().

           In the following steps the decoder needs to consider if the core was changed due to a lost frame to apply the correct transition */