Commit d992c7e0 authored by bayers's avatar bayers
Browse files

Merge branch '840-mc-rs-parammc-hoa-encoder-wrongly-set-to-zero' into 'main' 

[Non-BE] Resolve "MC RS ParamMC hoa encoder wrongly set to zero"

See merge request !1129
parents 5f4755a3 1810f20f

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -191,6 +191,8 @@ 
#define NONBE_FIX_808_JBM_PARAMUPMIX_RS                       /* FhG: Issue 808: fix JBM MC rate switching */

#define NONBE_FIX_846_JBM_MASA_SIDSTART                       /* FhG: Issue #846: fix JBM for MASA DTX when the first frame is a SID frame */

#define NONBE_FIX_841_MC_RS_TDOBJ_RENDERER                    /* FhG: Issue #841: [Non-BE] Resolve "MC RS HRFT handle not set to NULL" */

#define NONBE_FIX_840_PARAMMC_RS                              /* FhG: Issue #840: Resolve "MC RS ParamMC hoa encoder wrongly set to zero" */



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



/* ################## End DEVELOPMENT switches ######################### */

lib_dec/ivas_mc_param_dec.c

+2 −0
Original line number Diff line number Diff line
@@ -584,7 +584,9 @@ ivas_error ivas_param_mc_dec_reconfig( 
    hTransportSetup = st_ivas->hTransSetup;

    mc_ls_setup = ivas_mc_map_output_config_to_mc_ls_setup( st_ivas->transport_config );

    nchan_out_transport = st_ivas->hTransSetup.nchan_out_woLFE + st_ivas->hTransSetup.num_lfe;

#ifndef NONBE_FIX_840_PARAMMC_RS

    hParamMC->hoa_encoder = NULL;

#endif



    if ( hParamMC->synthesis_conf == PARAM_MC_SYNTH_LS_CONV_COV || hParamMC->synthesis_conf == PARAM_MC_SYNTH_MONO_STEREO )

    {