Commit 58b0db81 authored by bayers's avatar bayers
Browse files

Merge branch '796-differences-between-ivas_dec-and-ivas_jbm_dec-for-mc_mode_mct' into 'main' 

Resolve "Differences between ivas_dec() and ivas_jbm_dec() for MC_MODE_MCT"

See merge request !1092
parents c5c2fec7 c5f40bf4

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ 
#define PARAM_ISM_REFACTOR                              /* FhG: Issue 768: Refactoring to decouple hDirAC and hParamISM */

#define FIX_678_ISM_SBA_ASAN                            /* FhG: Issue 678: ASAN in ISM to SBA conversion in JBM */

#define FIX_676_JBM_USAN                                /* FhG: Issue 676: USAN in JBM */

#define FIX_796_MCT_MODE_DIFF_JBM                       /* FhG: Issue 796: fix differences between JBM and non-JBM fOR MC */



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

lib_dec/ivas_jbm_dec.c

+3 −2
Original line number Diff line number Diff line
@@ -412,11 +412,12 @@ ivas_error ivas_jbm_dec_tc( 


        if ( st_ivas->mc_mode == MC_MODE_MCT )

        {

#ifndef FIX_796_MCT_MODE_DIFF_JBM

            if ( st_ivas->hCPE[1]->hCoreCoder[1]->hTcxCfg == NULL ) // ToDo: this is missing in ivas_dec() -> TBV

            {

                st_ivas->hCPE[1]->hCoreCoder[1]->hTcxCfg = st_ivas->hCPE[1]->hCoreCoder[0]->hTcxCfg;

            }



#endif

            /* LFE channel decoder */

            ivas_lfe_dec( st_ivas->hLFE, st, output_frame, st_ivas->bfi, p_output[LFE_CHANNEL] );
@@ -436,7 +437,7 @@ ivas_error ivas_jbm_dec_tc( 


            if ( st_ivas->transport_config != st_ivas->intern_config && ( st_ivas->intern_config == IVAS_AUDIO_CONFIG_FOA || st_ivas->intern_config == IVAS_AUDIO_CONFIG_HOA2 || st_ivas->intern_config == IVAS_AUDIO_CONFIG_HOA3 ) )

            {

                if ( ( st_ivas->hTransSetup.nchan_out_woLFE + st_ivas->hTransSetup.num_lfe ) >= ( st_ivas->hIntSetup.nchan_out_woLFE + st_ivas->hIntSetup.num_lfe ) ) // ToDo: this is missing in ivas_dec() -> TBV

                if ( ( st_ivas->hTransSetup.nchan_out_woLFE + st_ivas->hTransSetup.num_lfe ) >= ( st_ivas->hIntSetup.nchan_out_woLFE + st_ivas->hIntSetup.num_lfe ) )

                {

                    ivas_mc2sba( st_ivas->hTransSetup, p_output, p_output, output_frame, st_ivas->hIntSetup.ambisonics_order, GAIN_LFE );

                }