Commit d4f7e9ae authored by multrus's avatar multrus
Browse files

Merge branch 'Basop_issue_2533' into 'main' 

Fixed: Basop issue 2533 "Condition in ivas_param_mc_dec_prepare_renderer()"

Closes #2533

See merge request !2953
parents a7a2ccc4 b1cbd43b

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ 
#define FIX_BASOP_2546_HARMONIZE_TCX_SCALAR             /* FhG: Fix issue 2546 Harmonize function tcx_scalar_quantization_rateloop*/

#define FIX_BASOP_2532_cx_e                             /* FhG: Fix issue 2532 about additional exponent variable*/

#define HARMONIZE_2543_SQ_gain                          /* FhG: Harmonize SQ_gain */

#define FIX_ISSUE_2533_EXTRA_CONDITION                  /* FhG: Fix issue basop 2533 removing the extra condition*/



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

lib_dec/ivas_mc_param_dec_fx.c

+13 −1
Original line number Diff line number Diff line
@@ -1836,7 +1836,7 @@ void ivas_param_mc_dec_prepare_renderer( 
            {

                CONTINUE;

            }



#ifndef FIX_ISSUE_2533_EXTRA_CONDITION

            IF( NE_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) )

            {

                IF( is_next_band )
@@ -1854,6 +1854,18 @@ void ivas_param_mc_dec_prepare_renderer( 
                    ivas_param_mc_get_mixing_matrices_fx( hParamMC, hSynthesisOutputSetup, cx_fx, cx_e, add( param_band_idx, is_next_band ), hParamMC->h_output_synthesis_cov_state.mixing_matrix_fx, hParamMC->h_output_synthesis_cov_state.mixing_matrix_exp, hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_fx, hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_exp, nchan_out_transport, hParamMC->synthesis_conf, nchan_transport, nchan_out_cov );

                }

            }

#else

            IF( is_next_band )

            {



                ivas_param_mc_get_mixing_matrices_fx( hParamMC, hSynthesisOutputSetup, cx_next_band_fx, cx_e, add( param_band_idx, is_next_band ), hParamMC->h_output_synthesis_cov_state.mixing_matrix_fx, hParamMC->h_output_synthesis_cov_state.mixing_matrix_exp, hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_fx, hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_exp, nchan_out_transport, hParamMC->synthesis_conf, nchan_transport, nchan_out_cov );

            }

            ELSE

            {



                ivas_param_mc_get_mixing_matrices_fx( hParamMC, hSynthesisOutputSetup, cx_fx, cx_e, add( param_band_idx, is_next_band ), hParamMC->h_output_synthesis_cov_state.mixing_matrix_fx, hParamMC->h_output_synthesis_cov_state.mixing_matrix_exp, hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_fx, hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_exp, nchan_out_transport, hParamMC->synthesis_conf, nchan_transport, nchan_out_cov );

            }

#endif

        }

    }