Commit f5aed6ae authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'revert-80811623' into 'main' 

Revert "Merge branch..."

See merge request !2262
parents 946c2fd6 f8e54c90

lib_rend/ivas_dirac_output_synthesis_dec_fx.c

+10 −15
Original line number Diff line number Diff line
@@ -1072,6 +1072,8 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx( 
            free( exp_temp_cy_cross_dir_smooth_fx );



            Word16 temp_q1 = sub( h_dirac_output_synthesis_state->q_cy_cross_dir_smooth, temp_q );

            FOR( ch_idx = s_min( 4, nchan_transport ); ch_idx < num_channels_dir; ch_idx++ )

            {

                IF( NE_16( temp_q, h_dirac_output_synthesis_state->q_cy_cross_dir_smooth ) )

                {

                    Word16 i;
@@ -1079,8 +1081,6 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx( 
                    IF( temp_q1 < 0 )

                    {

                        Word32 temp_q1_equiv = L_lshl( (Word32) 0x80000000, temp_q1 );

                    FOR( ch_idx = s_min( 4, nchan_transport ); ch_idx < num_channels_dir; ch_idx++ )

                    {

                        FOR( i = 0; i < num_freq_bands; i++ )

                        {

                            aux = Mpy_32_32( h_dirac_output_synthesis_state->direct_power_factor_fx[i], h_dirac_output_synthesis_state->direct_responses_fx[ch_idx * num_freq_bands + i] );
@@ -1088,10 +1088,7 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx( 
                            move32();

                        }

                    }

                }

                    ELSE

                {

                    FOR( ch_idx = s_min( 4, nchan_transport ); ch_idx < num_channels_dir; ch_idx++ )

                    {

                        FOR( i = 0; i < num_freq_bands; i++ )

                        {
@@ -1102,12 +1099,9 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx( 
                        }

                    }

                }

            }

                ELSE

                {

                    Word16 i;

                FOR( ch_idx = s_min( 4, nchan_transport ); ch_idx < num_channels_dir; ch_idx++ )

                {

                    FOR( i = 0; i < num_freq_bands; i++ )

                    {

                        h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + i] = Madd_32_32( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + i], h_dirac_output_synthesis_state->direct_power_factor_fx[i], h_dirac_output_synthesis_state->direct_responses_fx[ch_idx * num_freq_bands + i] );
@@ -1116,6 +1110,7 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx( 
                }

            }





            /*Diffuse gain*/

            FOR( ch_idx = s_min( 4, nchan_transport ); ch_idx < num_channels_diff; ch_idx++ )

            {