Commit 592784dd authored by Fabian Bauer's avatar Fabian Bauer
Browse files

Revert some unwanted changes

parent 9c4d45bb

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -164,7 +164,6 @@ 
#define FIX_ISSUE_1247

#define NONBE_FIX_1087_OOB_SBA_DTX_RS                   /* VA: issue 1087: Extend the length of the buffer for MCT decoding to avoid out-of-bound writing in SBA SID bitrate switching decoding */

#define FIX_1285_DECODER_CRASH

#define FIX_MINOR_SVD_WMOPS_MR1010X             /* FhG: Minor WMOPS tuning, bit-exact to previous version, saves about 8.2 WMOPS for MR1010 */

#define FIX_1072_SPEEDUP_gainpanning            /* FhG: Minor WMOPS tuning, in development*/

#define FIX_1072_SPEEDUP_COMPUTEDIFUSENESS      /* "-" */

lib_dec/ivas_dirac_dec.c

+2 −1
Original line number Diff line number Diff line
@@ -3595,6 +3595,7 @@ void ivas_dirac_dec_render_sf_fx( 
    /*-----------------------------------------------------------------*

     * CLDFB synthesis (and binaural rendering)

     *-----------------------------------------------------------------*/



    index_slot = slot_idx_start_cldfb_synth;

    move16();
@@ -3976,7 +3977,6 @@ void ivas_dirac_dec_render_sf_fx( 
        }

    }





    hSpatParamRendCom->slots_rendered = add( hSpatParamRendCom->slots_rendered, hSpatParamRendCom->subframe_nbslots[subframe_idx] );

    move16();

    hSpatParamRendCom->subframes_rendered = add( hSpatParamRendCom->subframes_rendered, 1 );
@@ -4091,6 +4091,7 @@ void ivas_dirac_dec_render_sf_fx( 
            }

        }

    }

    

    pop_wmops(); /*push_wmops( "ivas_dirac_dec_render (IDR)" );*/



    return;

lib_rend/ivas_dirac_output_synthesis_dec.c

+4 −1
Original line number Diff line number Diff line
@@ -623,6 +623,7 @@ void ivas_dirac_dec_output_synthesis_close_fx( 
 *

 *

 *------------------------------------------------------------------------*/



void ivas_dirac_dec_output_synthesis_process_slot_fx(

    const Word32 *reference_power,  /* i  : Estimated power             Q(q_reference_power)*/

    const Word16 q_reference_power, /* i  : Estimated power Q            */
@@ -769,6 +770,7 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx( 
                                                         sh_rot_max_order,

                                                         p_Rmat,

                                                         hodirac_flag );

       

        {

            IF( h_dirac_output_synthesis_state->direct_responses_square_fx )

            {
@@ -1011,9 +1013,11 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx( 
                                b = BASOP_Util_Divide3232_Scale( reference_power[k + num_freq_bands], reference_power[k + ( ch_idx + 1 ) * num_freq_bands], &b_exp ); /*q(15-b_exp)*/

                            }

                        }



                        mpy_a_a_b = Mpy_32_32( a, Mpy_32_16_1( a, b ) );                                           // Q = (h_dirac_output_synthesis_state->q_direct_responses + (15 - b_exp) - 15) + (h_dirac_output_synthesis_state->q_direct_responses) - 31

                        mpy_diff_aab = Mpy_32_32( L_sub( L_shl( 1, q_diffuseness ), diffuseness[k] ), mpy_a_a_b ); // Q = 2*(h_dirac_output_synthesis_state->q_direct_responses) - b_exp - 31 + q_diffuseness -31

                        mpy_diff_c = Mpy_32_32( diffuseness[k], c );                                               // Q = q_diffuseness - 4



                        q_diff_aab = add( add( h_dirac_output_synthesis_state->direct_responses_q, sub( sub( 15, b_exp ), 15 ) ), add( sub( h_dirac_output_synthesis_state->direct_responses_q, 31 ), sub( q_diffuseness, 31 ) ) );

                        q_diff_c = sub( q_diffuseness, 4 );
@@ -1037,7 +1041,6 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx( 
                                sqr_exp = sub( 31, q_diff_c ); /*q_diff_c*/

                            }

                        }



                        sqr = Sqrt32( sqr_inp, &sqr_exp ); /*Q(31-sqr_exp)*/

                        sqr = L_shr( sqr, 2 );             /*Q(31-sqr_exp)*/

                    }

lib_com/ivas_prot_fx.h

+1 −1

File changed.

Contains only whitespace changes.