Commit 2e129cdf authored by bayers's avatar bayers
Browse files

fix #840, do net set the HOA encoder in ParaMC to NULL when reconfiguring

parent 8e40fa16

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -189,6 +189,7 @@ 
#define NONBE_FIX_730_DPID_NOT_SET_CORRECTLY                  /* Eri: issue 730: write dpid read from file in correct index, print informative error message when DPID specified is not found. */

#define NONBE_FIX_825_SBA_JBM_MONO_STEREO_OUTPUT              /* FhG: issue #825: Resolve "JBM SBA: AGC and PCA run twice for MONO and STEREO output"   */

#define NONBE_FIX_808_JBM_PARAMUPMIX_RS                       /* FhG: Issue 808: fix JBM MC rate switching */

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



/* ##################### End NON-BE 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 )

    {