Commit 8a106c7c authored by vaclav's avatar vaclav
Browse files

- Merge remote-tracking branch 'remotes/origin/main' into... 

- Merge remote-tracking branch 'remotes/origin/main' into float-1562-crash-in-stereo-decoding-in-dtx-and-bitrate-switching
parents df865a24 1c2b4c54

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ 
#define FIX_1543_MID_LSF_BITS                           /* VA: float issue 1543: Resolve "MSAN: use-of-uninitialized-value in lib_enc/lsf_enc.c:262:5 for EVS encoder" */

#define FIX_1547_ISMDTX_HANDLE                          /* VA: float issue 1547: fix use of 'hISMDTX' handle */

#define FIX_1540_EXPOSE_PT_IN_RTP_HEADER_API            /* Expose Payload Type setting in RTP Header */

#define FIX_1563_FIX_STEREO_SW                          /* VA: float issue 1563: fix clicks in stereo switching */

#define FIX_1562_DTX_CRASH_DECODER                      /* VA: float issue 1562: fix crash in stereo decoding in DTX and bitrate switching */



/* ##################### End NON-BE switches ########################### */

lib_dec/ivas_stereo_switching_dec.c

+6 −0
Original line number Diff line number Diff line
@@ -1563,6 +1563,12 @@ void stereo_switching_dec( 
            mvr2r( sts[0]->delay_buf_out, sts[1]->delay_buf_out, HQ_DELTA_MAX * HQ_DELAY_COMP );

            mvr2r( sts[0]->hTcxDec->old_syn_Overl, sts[1]->hTcxDec->old_syn_Overl, 256 );

        }

#ifdef FIX_1563_FIX_STEREO_SW

        else if ( hCPE->element_mode == IVAS_CPE_TD )

        {

            sts[1]->last_core = ACELP_CORE;

        }

#endif

    }

    else if ( hCPE->element_mode == IVAS_CPE_TD && hCPE->last_element_mode == IVAS_CPE_MDCT )

    {

lib_enc/ivas_stereo_switching_enc.c

+6 −0
Original line number Diff line number Diff line
@@ -821,6 +821,12 @@ void stereo_switching_enc( 
            sts[1]->last_coder_type = sts[0]->last_coder_type;

            sts[1]->last_bwidth = sts[0]->last_bwidth;

        }

#ifdef FIX_1563_FIX_STEREO_SW

        else if ( hCPE->element_mode == IVAS_CPE_TD )

        {

            sts[1]->last_core = ACELP_CORE;

        }

#endif

    }

    else if ( hCPE->element_mode == IVAS_CPE_TD && hCPE->last_element_mode == IVAS_CPE_MDCT )

    {