Commit 11b818b7 authored by sagnowski's avatar sagnowski
Browse files

Merge branch 'main' into 1119-split-rendering-crashes-in-jbm

parents e0d505fe a8d5bafd

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ 
#define FIX_1119_SPLIT_RENDERING_VOIP                   /* FhG: Add split rendering support to decoder in VoIP mode */

#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define FIX_1335_EXTREND_RETCODE                        /* FhG: Add modification of returncode for external renderer when an error occurs */

#define FIX_938_COMPILER_WARNING                        /* FhG: Fix compiler warning in ivas_mdct_core_reconstruct() */





/* #################### End BE switches ################################## */

lib_dec/ivas_cpe_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static void read_stereo_mode_and_bwidth( CPE_DEC_HANDLE hCPE, const Decoder_Stru 


static void stereo_mode_combined_format_dec( const Decoder_Struct *st_ivas, CPE_DEC_HANDLE hCPE );



static ivas_error stereo_dft_dec_main( CPE_DEC_HANDLE hCPE, const int32_t ivas_total_brate, const int16_t n_channels, float res_buf[STEREO_DFT_N_8k], float *output[], float outputHB[][L_FRAME48k], const int16_t output_frame );

static ivas_error stereo_dft_dec_main( CPE_DEC_HANDLE hCPE, const int32_t ivas_total_brate, const int16_t n_channels, float *p_res_buf, float *output[], float outputHB[][L_FRAME48k], const int16_t output_frame );





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

lib_dec/ivas_mdct_core_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -943,10 +943,14 @@ void ivas_mdct_core_reconstruct( 
        /* Postfiltering */

        post_decoder( st, synth_buf, pit_gain[ch], pitch[ch], x[ch][0], st->p_bpf_noise_buf );



#ifndef FIX_938_COMPILER_WARNING

        if ( signal_outFB[ch] )

        {

#endif

            mvr2r( synthFB, signal_outFB[ch], st->hTcxDec->L_frameTCX );

#ifndef FIX_938_COMPILER_WARNING

        }

#endif



#ifdef DEBUG_PLC_INFO

        {