Commit 2dba6296 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch '1643_basop_port_fl1545' into 'main' 

Port MR 1545 into main: Update LC3plus version to V1.5.1

See merge request !1712
parents dcfdb368 7531ee1e

lib_lc3plus/adjust_global_gain_fx.c

+1 −9
Original line number Diff line number Diff line 
/******************************************************************************

*                        ETSI TS 103 634 V1.4.5                               *

*                        ETSI TS 103 634 V1.5.1                               *

*              Low Complexity Communication Codec Plus (LC3plus)              *

*                                                                             *

* Copyright licence is solely granted through ETSI Intellectual Property      *
@@ -31,11 +31,7 @@ void processAdjustGlobalGain_fx(Word16 *gg_idx, Word16 gg_idx_min, Word16 gg_idx 
    Word16 gg_idx_inc;

    Word16 gg_idx_inc_max;

    Word16 gg_idx_inc_s;

#ifdef CR8_G_ADD_75MS

    Word32 factor;

#else

    Word16 factor;

#endif

#endif



#ifdef DYNMEM_COUNT
@@ -73,13 +69,11 @@ void processAdjustGlobalGain_fx(Word16 *gg_idx, Word16 gg_idx_min, Word16 gg_idx 
        factor = 2; move16();

        gg_idx_inc_max = 20; move16();

    }

#ifdef CR8_G_ADD_75MS

    ELSE IF (sub(frame_dms, 75) == 0)

    {

        factor = 40265318; move16(); // factor = 1.2 * 2^25

        gg_idx_inc_max = 12 ; move16();

    }

#endif

    ELSE

    {

        factor = 1; move16();
@@ -122,7 +116,6 @@ void processAdjustGlobalGain_fx(Word16 *gg_idx, Word16 gg_idx_min, Word16 gg_idx 
            IF (sub(nBits, target) > 0)

            {

                gg_idx_inc = sub(nBits, target);

#ifdef CR8_G_ADD_75MS

                IF (sub(frame_dms, 75) == 0)

                {

                    gg_idx_inc = extract_l(L_shr_pos(Mpy_32_16_lc3plus(factor, gg_idx_inc), 10)); // Mpy_32_16_lc3plus(1.2*2^25, gg_idx_inc), 25 - 15)
@@ -131,7 +124,6 @@ void processAdjustGlobalGain_fx(Word16 *gg_idx, Word16 gg_idx_min, Word16 gg_idx 
                    gg_idx_inc = add(gg_idx_inc, 1); // adding 1 instead of 1.2

                }

                ELSE

#endif

                {

                    gg_idx_inc = extract_l(L_mult0(gg_idx_inc, factor));

                    gg_idx_inc = BASOP_Util_Divide1616_Scale_lc3plus(gg_idx_inc, delta, &gg_idx_inc_s);

lib_lc3plus/al_fec.c

+1 −1
Original line number Diff line number Diff line 
/******************************************************************************

*                        ETSI TS 103 634 V1.4.5                               *

*                        ETSI TS 103 634 V1.5.1                               *

*              Low Complexity Communication Codec Plus (LC3plus)              *

*                                                                             *

* Copyright licence is solely granted through ETSI Intellectual Property      *

lib_lc3plus/apply_global_gain_fx.c

+1 −1
Original line number Diff line number Diff line 
/******************************************************************************

*                        ETSI TS 103 634 V1.4.5                               *

*                        ETSI TS 103 634 V1.5.1                               *

*              Low Complexity Communication Codec Plus (LC3plus)              *

*                                                                             *

* Copyright licence is solely granted through ETSI Intellectual Property      *

lib_lc3plus/attack_detector_fx.c

+1 −1
Original line number Diff line number Diff line 
/******************************************************************************

*                        ETSI TS 103 634 V1.4.5                               *

*                        ETSI TS 103 634 V1.5.1                               *

*              Low Complexity Communication Codec Plus (LC3plus)              *

*                                                                             *

* Copyright licence is solely granted through ETSI Intellectual Property      *

lib_lc3plus/basop_mpy_lc3plus.c

+1 −1
Original line number Diff line number Diff line 
/******************************************************************************

*                        ETSI TS 103 634 V1.4.5                               *

*                        ETSI TS 103 634 V1.5.1                               *

*              Low Complexity Communication Codec Plus (LC3plus)              *

*                                                                             *

* Copyright licence is solely granted through ETSI Intellectual Property      *