Commit 63a92fcc authored by TYAGIRIS's avatar TYAGIRIS
Browse files

Merge branch 'main' into 1869_basop_lfe_lpf_plc_fix

parents a3411b70 eeacd4c3

Workspace_msvc/lib_isar.vcxproj

+2 −2
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ 
  <ItemGroup>

    <ClCompile Include="..\lib_isar\isar_lcld_decoder.c" />

    <ClCompile Include="..\lib_isar\isar_lcld_encoder.c" />

    <ClCompile Include="..\lib_isar\isar_lcld_rom_tables.c" />

    <ClCompile Include="..\lib_isar\isar_rom_lcld_tables.c" />

    <ClCompile Include="..\lib_isar\isar_splitRend_lcld_enc.c" />

    <ClCompile Include="..\lib_isar\isar_splitRend_lcld_dec.c" />

    <ClCompile Include="..\lib_isar\isar_lc3plus_common.c" />
@@ -150,7 +150,7 @@ 
    <ClInclude Include="..\lib_isar\isar_prot.h" />

    <ClInclude Include="..\lib_isar\isar_stat.h" />

    <ClInclude Include="..\lib_isar\isar_cnst.h" />

    <ClInclude Include="..\lib_isar\isar_lcld_rom_tables.h" />

    <ClInclude Include="..\lib_isar\isar_rom_lcld_tables.h" />

    <ClInclude Include="..\lib_isar\isar_lc3plus_common.h" />

    <ClInclude Include="..\lib_isar\isar_lc3plus_dec.h" />

    <ClInclude Include="..\lib_isar\isar_lc3plus_enc.h" />

lib_com/arith_coder_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -271,7 +271,11 @@ void tcx_arith_scale_envelope( 


    tmp2 = BASOP_Util_Add_MantExp( negate( b ), b_e, tmp, tmp2, &scale ); /* exp(scale) */

    scale = BASOP_Util_Divide1616_Scale( scale, round_fx( a ), &tmp );

#ifdef ISSUE_1796_replace_shl_o

    scale = shl_sat( scale, sub( sub( add( tmp, tmp2 ), a_e ), 1 ) ); /* Q15 */

#else

    scale = shl_o( scale, sub( sub( add( tmp, tmp2 ), a_e ), 1 ), &Overflow ); /* Q15 */

#endif



    /* iscale = 1.0f / scale; */

    iscale_e = 0;

lib_com/bitalloc_fx.c

+7 −1
Original line number Diff line number Diff line
@@ -245,9 +245,11 @@ Word16 BitAllocF_fx( 
    Word16 tmp, exp1, exp2;

    Word32 Rsubband_w32_fx[NB_SFM]; /* Q15  */

    Word16 B_w16_fx;

#ifndef ISSUE_1796_replace_shl_o

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

    move32();

#endif

#endif



    set32_fx( Rsubband_w32_fx, 0, NB_SFM );
@@ -442,7 +444,11 @@ Word16 BitAllocF_fx( 
            exp1 = sub( norm_l( L_tmp2 ), 1 );

            exp2 = norm_s( n );

            tmp = div_s( extract_h( L_shl( L_tmp2, exp1 ) ), shl( n, exp2 ) ); /*15 + 15 + exp1 - 16 - exp2*/

#ifdef ISSUE_1796_replace_shl_o

            m_fx = shl_sat( tmp, sub( exp2, exp1 ) ); /*Q14*/

#else

            m_fx = shl_o( tmp, sub( exp2, exp1 ), &Overflow ); /*Q14*/

#endif

            if ( L_tmp1 < 0 )

            {

                m_fx = negate( m_fx );

lib_com/cldfb_evs_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -1329,7 +1329,11 @@ void GetEnergyCldfb( Word32 *energyLookahead, /*!< o: Q(*sf_energyLookahead) 
        {

            FOR( j = 20; j < numberBandsM; j++ )

            {

#ifdef ISSUE_1799_replace_L_shr_o

                nrg = L_add_o( nrg, L_shr_sat( energyValues[k][j], s ), &Overflow );

#else

                nrg = L_add_o( nrg, L_shr_o( energyValues[k][j], s, &Overflow ), &Overflow );

#endif

            }

        }
@@ -1352,7 +1356,11 @@ void GetEnergyCldfb( Word32 *energyLookahead, /*!< o: Q(*sf_energyLookahead) 
        {

            FOR( j = 20; j < numberBandsM; j++ )

            {

#ifdef ISSUE_1799_replace_L_shr_o

                nrg = L_add_o( nrg, L_shr_sat( energyValues[k][j], s ), &Overflow );

#else

                nrg = L_add_o( nrg, L_shr_o( energyValues[k][j], s, &Overflow ), &Overflow );

#endif

            }

        }

lib_com/cldfb_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -1590,7 +1590,11 @@ static void GetEnergyCldfb_ivas_fx( Word32 *energyLookahead, /*!< o: Q(*sf_e 
        {

            FOR( j = 20; j < numberBandsM; j++ )

            {

#ifdef ISSUE_1799_replace_L_shr_o

                nrg = L_add_o( nrg, L_shr_sat( energyValues[k][j], s ), &Overflow );

#else

                nrg = L_add_o( nrg, L_shr_o( energyValues[k][j], s, &Overflow ), &Overflow );

#endif

            }

        }
@@ -1613,7 +1617,11 @@ static void GetEnergyCldfb_ivas_fx( Word32 *energyLookahead, /*!< o: Q(*sf_e 
        {

            FOR( j = 20; j < numberBandsM; j++ )

            {

#ifdef ISSUE_1799_replace_L_shr_o

                nrg = L_add_o( nrg, L_shr_sat( energyValues[k][j], s ), &Overflow );

#else

                nrg = L_add_o( nrg, L_shr_o( energyValues[k][j], s, &Overflow ), &Overflow );

#endif

            }

        }