Commit 85ec41dd authored by lintervo's avatar lintervo
Browse files

Add forgotten code

parent a4107adc

lib_dec/ivas_jbm_dec_fx.c

+39 −0
Original line number Diff line number Diff line
@@ -4671,6 +4671,31 @@ void ivas_jbm_dec_prepare_renderer( 
        }

        ELSE IF( EQ_16( st_ivas->mc_mode, MC_MODE_PARAMMC ) )

        {

            Word16 nchan_transport = st_ivas->nchan_transport;

            move16();

            Word16 nchan_out_transport = add( st_ivas->hTransSetup.nchan_out_woLFE, st_ivas->hTransSetup.num_lfe );

            Word16 nchan_out_cov;

            test();

            test();

            IF( EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) || EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) )

            {

                nchan_out_cov = add( st_ivas->hTransSetup.nchan_out_woLFE, st_ivas->hTransSetup.num_lfe );

            }

            ELSE IF( EQ_16( st_ivas->hParamMC->synthesis_conf, PARAM_MC_SYNTH_LS_CONV_CLDFB ) )

            {

                nchan_out_cov = nchan_out_transport;

                move16();

            }

            ELSE IF( EQ_16( st_ivas->hParamMC->synthesis_conf, PARAM_MC_SYNTH_LS_CONV_COV ) || EQ_16( st_ivas->hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) )

            {

                nchan_out_cov = add( st_ivas->hOutSetup.nchan_out_woLFE, st_ivas->hOutSetup.num_lfe );

            }

            ELSE

            {

                nchan_out_cov = nchan_out_transport;

                move16();

            }



            scale_sig32( st_ivas->hParamMC->proto_matrix_int_fx, st_ivas->hParamMC->proto_matrix_int_len, -1 ); // Q(31-1)

            st_ivas->hParamMC->proto_matrix_int_e = 1;

            move16();
@@ -4678,6 +4703,20 @@ void ivas_jbm_dec_prepare_renderer( 
            ivas_param_mc_dec_prepare_renderer( st_ivas, (UWord8) n_render_timeslots );



            scale_sig32( st_ivas->hParamMC->proto_matrix_int_fx, st_ivas->hParamMC->proto_matrix_int_len, 1 ); // Q(31-1+1)



            Word16 shift;

            FOR( Word16 param_band_idx = 0; param_band_idx < st_ivas->hParamMC->num_param_bands_synth; param_band_idx++ )

            {

                shift = getScaleFactor32( st_ivas->hParamMC->h_output_synthesis_cov_state.cx_old_fx[param_band_idx], s_min( st_ivas->hParamMC->h_output_synthesis_cov_state.cx_old_len, nchan_transport * nchan_transport ) );

                scale_sig32( st_ivas->hParamMC->h_output_synthesis_cov_state.cx_old_fx[param_band_idx], s_min( st_ivas->hParamMC->h_output_synthesis_cov_state.cx_old_len, i_mult( nchan_transport, nchan_transport ) ), shift ); // Q(31-cx_old_e+shift)

                st_ivas->hParamMC->h_output_synthesis_cov_state.cx_old_e[param_band_idx] = sub( st_ivas->hParamMC->h_output_synthesis_cov_state.cx_old_e[param_band_idx], shift );

                move16();



                shift = getScaleFactor32( st_ivas->hParamMC->h_output_synthesis_cov_state.cy_old_fx[param_band_idx], nchan_out_cov * nchan_out_cov );

                scale_sig32( st_ivas->hParamMC->h_output_synthesis_cov_state.cy_old_fx[param_band_idx], i_mult( nchan_out_cov, nchan_out_cov ), shift ); // Q(31-cy_old_e+shift)

                st_ivas->hParamMC->h_output_synthesis_cov_state.cy_old_e[param_band_idx] = sub( st_ivas->hParamMC->h_output_synthesis_cov_state.cy_old_e[param_band_idx], shift );

                move16();

            }

        }

        ELSE IF( EQ_16( st_ivas->mc_mode, MC_MODE_MCMASA ) )

        {