Commit 63985886 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

MLD improvements for SBA-PLC and MultiChannel cases

parent cb235e48

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ 
#define NONBE_FIX_849_OMASA_BFI_CRASH                         /* VA: issue 849: fix OMASA 2TC and FEC crashes */

#define NONBE_FIX_738_QUATERNION_SLERP_PRECISION              /* Quaternion slerp changes*/

#define IVAS_FLOAT_FIXED

#define IVAS_FLOAT_FIXED_CONVERSIONS /* Temporary macro to keep track of intermediate flt to fixed and fixed to flt conversions */

#ifdef IVAS_FLOAT_FIXED

#define MSAN_FIX

#define FIX_818_COMPLEXITY_IMPROV /* Fix for issue 818 */

lib_dec/FEC_scale_syn_fx.c

+10 −2
Original line number Diff line number Diff line
@@ -171,8 +171,16 @@ void FEC_scale_syn_fx( 
    /*-----------------------------------------------------------------*

     * Find the energy/gain at the end of the frame

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



    IF( LT_16( getScaleFactor16( synth, L_frame ), 2 ) )

    {

        Scale_sig( synth, L_frame, -1 );

        frame_ener_fx( L_frame, clas, synth, pitch[sub( shr( L_frame, 6 ), 1 )], &L_enr2 /*Q0*/, 1, sub( Q_syn, 1 ), 3, 0 );

        Scale_sig( synth, L_frame, 1 );

    }

    ELSE

    {

        frame_ener_fx( L_frame, clas, synth, pitch[sub( shr( L_frame, 6 ), 1 )], &L_enr2 /*Q0*/, 1, Q_syn, 3, 0 );

    }



    test();

    test();

lib_dec/ivas_mc_param_dec.c

+5 −4
Original line number Diff line number Diff line
@@ -3200,7 +3200,7 @@ void ivas_param_mc_dec_digest_tc_fx( 
        {

            FOR( i = 0; i < imult1616( nchan_transport, nchan_transport ); i++ )

            {

                if ( is_next_band )

                if ( is_next_band == 0 )

                {

                    cx_fx[i] = L_shr( cx_fx[i], sub( max_e, cx_buff_e[is_next_band][i] ) );

                }
@@ -5386,6 +5386,8 @@ static void ivas_param_mc_get_mixing_matrices_fx( 


    Word16 Cy_e, Cx_e;

    Word16 Cy_full_e;

    Word16 new_e = 0;

    move16();



    set_zero_fx( Cproto_fx, MAX_CICP_CHANNELS * MAX_CICP_CHANNELS );

    set_zero_fx( mat_mult_buffer1_fx, MAX_CICP_CHANNELS * MAX_CICP_CHANNELS );
@@ -5532,9 +5534,6 @@ static void ivas_param_mc_get_mixing_matrices_fx( 


    Copy32( Cy_state_fx, Cy_old_state_fx, imult1616( nY_cov, nY_cov ) );



    Word16 new_e = 0;

    move16();



    hParamMC->h_output_synthesis_cov_state.cx_old_e[param_band_idx] = Cx_state_e;

    move16();

    hParamMC->h_output_synthesis_cov_state.cy_old_e[param_band_idx] = Cy_state_e;
@@ -5546,6 +5545,7 @@ static void ivas_param_mc_get_mixing_matrices_fx( 
        {

            new_e = hParamMC->h_output_synthesis_cov_state.cx_old_e[param_band_idx];

            move16();

            BREAK;

        }

    }
@@ -5561,6 +5561,7 @@ static void ivas_param_mc_get_mixing_matrices_fx( 
        {

            new_e = hParamMC->h_output_synthesis_cov_state.cy_old_e[param_band_idx];

            move16();

            BREAK;

        }

    }

lib_rend/ivas_crend.c

+3 −0
Original line number Diff line number Diff line
@@ -3575,6 +3575,9 @@ ivas_error ivas_rend_crendProcess( 
                    return error;

                }

            }



            /* update combined orientation access index */

            ivas_combined_orientation_update_index( hCombinedOrientationData, subframe_len );

        }

        ELSE

        {