Commit 4206dbab authored by TYAGIRIS's avatar TYAGIRIS
Browse files

update as per latest main

parents d04682f6 b4a8a48f

Workspace_msvc/lib_enc.vcxproj

+0 −2
Original line number Diff line number Diff line
@@ -379,8 +379,6 @@ 
    <ClCompile Include="..\lib_enc\multi_harm.c" />

    <ClCompile Include="..\lib_enc\nelp_enc.c" />

    <ClCompile Include="..\lib_enc\nelp_enc_fx.c" />

    <ClCompile Include="..\lib_enc\noise_adjust.c" />

    <ClCompile Include="..\lib_enc\nois_est.c" />

    <ClCompile Include="..\lib_enc\pitch_ol.c" />

    <ClCompile Include="..\lib_enc\pitch_ol2.c" />

    <ClCompile Include="..\lib_enc\pit_enc.c" />

Workspace_msvc/lib_enc.vcxproj.filters

+0 −4
Original line number Diff line number Diff line
@@ -216,10 +216,6 @@ 
    <ClCompile Include="..\lib_enc\multi_harm.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\nois_est.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\noise_adjust.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\pit_enc.c">

lib_com/basop_util.c

+8 −7
Original line number Diff line number Diff line
@@ -45,9 +45,6 @@ 
#include "basop_settings.h"

#include "cnst.h"





#define WMC_TOOL_SKIP



extern const Word32 SqrtTable[32];     // Q31

extern const Word16 SqrtDiffTable[32]; /* Q15 */
@@ -405,7 +402,9 @@ static Word16 ISqrt16_common( Word16 m, 


    /* handle even exponents */

    if ( s_and( e, 1 ) == 0 )

    {

        m = mult_r( m, 0x5a82 );

    }



    return m;

}
@@ -420,8 +419,11 @@ static Word32 ISqrt32_common( Word32 m, 
#endif



    assert( m >= 0x40000000 );



#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    m16 = round_fx_o( m, &Overflow );

#else

    m16 = round_fx( m );

#endif



    /* get table index (upper 6 bits minus 32) */

    /* index = (m16 >> 25) - 32; */
@@ -435,7 +437,9 @@ static Word32 ISqrt32_common( Word32 m, 


    /* handle even exponents */

    if ( s_and( e, 1 ) == 0 )

    {

        m = Mpy_32_16_1( m, 0x5a82 );

    }



    return m;

}
@@ -2653,6 +2657,3 @@ cmplx CL_mult_32x16( cmplx input, cmplx_s coeff ) 
#endif

    return result;

}
 




#undef WMC_TOOL_SKIP

lib_com/bits_alloc_fx.c

+106 −24
Original line number Diff line number Diff line
@@ -773,6 +773,9 @@ ivas_error config_acelp1( 
    ACELP_config *acelp_cfg,       /* i  : ACELP bit-allocation            */

    const Word16 signalling_bits,  /* i  : number of signalling bits       */

    const Word16 coder_type,       /* i  : coder type                      */

#ifdef NONBE_FIX_GSC_BSTR

    const Word16 inactive_coder_type_flag, /* i  : AVQ (0) or GSC (1) IC flag      */

#endif

    const Word16 tc_subfr,             /* i  : TC subfr ID                     */

    const Word16 tc_call,              /* i  : TC call number (0,1,2,3,5(DEC)) */

    Word16 *nBits_es_Pred,             /* o  : number of bits for Es_pred Q    */
@@ -1068,14 +1071,20 @@ ivas_error config_acelp1( 
        {

            bits = sub( bits, TDM_IC_LSF_PRED_BITS );

        }

        /* gain Q bit-budget - part 1 */

        /* gain Q bit-budget - part 1: 'Es_pred' of memory-less gain Q */

        test();

        test();

        test();

        test();

        test();

        test();

#ifdef NONBE_FIX_GSC_BSTR

        IF( ( NE_16( coder_type, UNVOICED ) && NE_16( coder_type, AUDIO ) && coder_type != INACTIVE && !( LE_32( core_brate, ACELP_8k00 ) && NE_16( coder_type, TRANSITION ) ) ) /* mid bitrates in GC and VC, low+mid bitrates in TC */ ||

            ( coder_type == INACTIVE && !inactive_coder_type_flag ) /* AVQ inactive */

        )

#else

        IF( ( NE_16( coder_type, UNVOICED ) && NE_16( coder_type, AUDIO ) && coder_type != INACTIVE && !( LE_32( core_brate, ACELP_8k00 ) && NE_16( coder_type, TRANSITION ) ) ) || ( coder_type == INACTIVE && GT_32( total_brate, MAX_GSC_INACTIVE_BRATE ) ) )

#endif

        {

            *nBits_es_Pred = Es_pred_bits_tbl[BIT_ALLOC_IDX_fx( core_brate, coder_type, -1, -1 )];

            move16();
@@ -1196,7 +1205,11 @@ ivas_error config_acelp1( 
    {

        test();

        test();

#ifdef NONBE_FIX_GSC_BSTR

        IF( coder_type == INACTIVE && EQ_16( L_frame, L_FRAME16k ) && inactive_coder_type_flag ) /* GSC Inactive @16kHz */

#else

        IF( coder_type == INACTIVE && EQ_16( L_frame, L_FRAME16k ) && LE_32( total_brate, MAX_GSC_INACTIVE_BRATE ) ) /* GSC Inactive @16kHz */

#endif

        {

            acelp_cfg->ltf_mode = FULL_BAND;

            move16();
@@ -1414,7 +1427,14 @@ ivas_error config_acelp1( 
        acelp_cfg->fixed_cdk_index[3] = -1;

        move16();

    }

#ifdef NONBE_FIX_GSC_BSTR

    ELSE IF( ( coder_type != INACTIVE && EQ_16( nb_subfr, NB_SUBFR ) && NE_16( coder_type, AUDIO ) ) || /* @12.8kHz core except of GSC */

             ( EQ_16( nb_subfr, NB_SUBFR16k ) && ( !inactive_coder_type_flag || coder_type != INACTIVE ) ) /* @16kHz core GC, TC, AVQ inactive */ ||

             EQ_16( core, HQ_CORE ) /* ACELP -> HQ switching in EVS */

    )

#else

    ELSE IF( ( coder_type != INACTIVE && EQ_16( nb_subfr, NB_SUBFR ) && NE_16( coder_type, AUDIO ) ) || ( EQ_16( nb_subfr, NB_SUBFR16k ) && ( GT_32( total_brate, MAX_GSC_INACTIVE_BRATE ) || coder_type != INACTIVE ) ) || EQ_16( core, HQ_CORE ) )

#endif

    {

        /* pitch Q & gain Q bit-budget - part 2*/

        FOR( i = 0; i < nb_subfr; i++ )
@@ -1478,7 +1498,13 @@ ivas_error config_acelp1( 
        test();

        test();

        test();

#ifdef NONBE_FIX_GSC_BSTR

        IF( flag_hardcoded /* EVS */ ||

            ( GE_32( core_brate_inp, MIN_BRATE_AVQ_EXC ) && coder_type != INACTIVE ) /* high-birate ACELP except IC */ ||

            ( !inactive_coder_type_flag && coder_type == INACTIVE ) /* AVQ inactive */ )

#else

        IF( flag_hardcoded || ( GE_32( core_brate_inp, MIN_BRATE_AVQ_EXC ) && coder_type != INACTIVE ) || ( GT_32( total_brate, MAX_GSC_INACTIVE_BRATE ) && coder_type == INACTIVE ) )

#endif

        {

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

            {
@@ -1587,7 +1613,12 @@ ivas_error config_acelp1( 
        test();

        test();

        test();

#ifdef NONBE_FIX_GSC_BSTR

        IF( ( GE_32( core_brate_inp, MIN_BRATE_AVQ_EXC ) && coder_type != INACTIVE ) /* high-birate ACELP except IC */ ||

            ( !inactive_coder_type_flag && coder_type == INACTIVE ) /* AVQ inactive */ )

#else

        IF( ( GE_32( core_brate_inp, MIN_BRATE_AVQ_EXC ) && coder_type != INACTIVE ) || ( GT_32( total_brate, MAX_GSC_INACTIVE_BRATE ) && coder_type == INACTIVE ) )

#endif

        {

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

            {
@@ -1627,7 +1658,13 @@ ivas_error config_acelp1( 
            }

        }

    }

#ifdef NONBE_FIX_GSC_BSTR

    ELSE IF( ( EQ_16( coder_type, UNVOICED ) && EQ_16( tdm_low_rate_mode, 1 ) && EQ_16( element_mode, IVAS_CPE_TD ) ) /* LBR secondary channel in TD stereo */ ||

             ( ( coder_type == INACTIVE || EQ_16( coder_type, AUDIO ) ) && EQ_16( nb_subfr, NB_SUBFR ) ) /* GSC @12.8kHz */ ||

             ( coder_type == INACTIVE && inactive_coder_type_flag ) /* AVQ inactive */ )

#else

    ELSE IF( ( EQ_16( coder_type, UNVOICED ) && EQ_16( tdm_low_rate_mode, 1 ) && EQ_16( element_mode, IVAS_CPE_TD ) ) || ( ( coder_type == INACTIVE || EQ_16( coder_type, AUDIO ) ) && EQ_16( nb_subfr, NB_SUBFR ) ) || ( coder_type == INACTIVE && LE_32( total_brate, MAX_GSC_INACTIVE_BRATE ) ) )

#endif

    {

        Word32 Local_BR, Pitch_BR;

        Word16 Pitch_CT;
@@ -1768,7 +1805,12 @@ ivas_error config_acelp1( 
        test();

        test();

        test();

#ifdef NONBE_FIX_GSC_BSTR

        IF( ( EQ_16( L_frame, L_FRAME16k ) && coder_type == INACTIVE && inactive_coder_type_flag ) /* GSC Inactive @16kHz */ ||

            ( GSC_IVAS_mode > 0 && EQ_16( L_frame, L_FRAME16k ) ) ) /* IVAS GSC @16kHz */

#else

        IF( ( EQ_16( L_frame, L_FRAME16k ) && coder_type == INACTIVE && LE_32( total_brate, MAX_GSC_INACTIVE_BRATE ) ) || ( GSC_IVAS_mode > 0 && EQ_16( L_frame, L_FRAME16k ) ) ) /* GSC Inactive @16kHz */

#endif

        {

            acelp_cfg->ubits = 0;

            move16();
@@ -1888,6 +1930,9 @@ ivas_error config_acelp1_IVAS( 
    ACELP_config *acelp_cfg,       /* i  : ACELP bit-allocation            */

    const Word16 signaling_bits,   /* i  : number of signaling bits        */

    const Word16 coder_type,       /* i  : coder type                      */

#ifdef NONBE_FIX_GSC_BSTR

    const Word16 inactive_coder_type_flag, /* i  : AVQ (0) or GSC (1) IC flag      */

#endif

    const Word16 tc_subfr,             /* i  : TC subfr ID                     */

    const Word16 tc_call,              /* i  : TC call number (0,1,2,3,5(DEC)) */

    Word16 *nBits_es_Pred,             /* o  : number of bits for Es_pred Q    */
@@ -2168,8 +2213,13 @@ ivas_error config_acelp1_IVAS( 
        test();

        test();

        test();

        /* gain Q bit-budget - part 1 */

        /* gain Q bit-budget - part 1: 'Es_pred' of memory-less gain Q */

#ifdef NONBE_FIX_GSC_BSTR

        IF( ( NE_16( coder_type, UNVOICED ) && NE_16( coder_type, AUDIO ) && coder_type != INACTIVE && !( LE_32( core_brate, ACELP_8k00 ) && NE_16( coder_type, TRANSITION ) ) ) /* mid bitrates in GC and VC, low+mid bitrates in TC */ ||

            ( coder_type == INACTIVE && !inactive_coder_type_flag ) /* AVQ inactive */ )

#else

        IF( ( NE_16( coder_type, UNVOICED ) && NE_16( coder_type, AUDIO ) && ( coder_type != INACTIVE ) && !( LE_32( core_brate, ACELP_8k00 ) && NE_16( coder_type, TRANSITION ) ) ) || ( ( coder_type == INACTIVE ) && GT_32( total_brate, MAX_GSC_INACTIVE_BRATE ) ) )

#endif

        {

            *nBits_es_Pred = Es_pred_bits_tbl[BIT_ALLOC_IDX( core_brate, coder_type, -1, -1 )];

            move16();
@@ -2294,7 +2344,11 @@ ivas_error config_acelp1_IVAS( 
    {

        test();

        test();

#ifdef NONBE_FIX_GSC_BSTR

        IF( coder_type == INACTIVE && EQ_16( L_frame, L_FRAME16k ) && inactive_coder_type_flag ) /* GSC Inactive @16kHz */

#else

        IF( coder_type == INACTIVE && EQ_16( L_frame, L_FRAME16k ) && LE_32( total_brate, MAX_GSC_INACTIVE_BRATE ) ) /* GSC Inactive @16kHz */

#endif

        {

            acelp_cfg->ltf_mode = FULL_BAND;

            move16();
@@ -2510,7 +2564,13 @@ ivas_error config_acelp1_IVAS( 
        acelp_cfg->fixed_cdk_index[3] = -1;

        move16();

    }

#ifdef NONBE_FIX_GSC_BSTR

    ELSE IF( ( coder_type != INACTIVE && EQ_16( nb_subfr, NB_SUBFR ) && NE_16( coder_type, AUDIO ) ) /* @12.8kHz core except of GSC */ ||

             ( EQ_16( nb_subfr, NB_SUBFR16k ) && ( !inactive_coder_type_flag || coder_type != INACTIVE ) ) /* @16kHz core GC, TC, AVQ inactive */ ||

             EQ_16( core, HQ_CORE ) /* ACELP -> HQ switching in EVS */ )

#else

    ELSE IF( ( coder_type != INACTIVE && EQ_16( nb_subfr, NB_SUBFR ) && NE_16( coder_type, AUDIO ) ) || ( EQ_16( nb_subfr, NB_SUBFR16k ) && ( GT_32( total_brate, MAX_GSC_INACTIVE_BRATE ) || coder_type != INACTIVE ) ) || EQ_16( core, HQ_CORE ) )

#endif

    {

        /* pitch Q & gain Q bit-budget - part 2*/

        FOR( i = 0; i < nb_subfr; i++ )
@@ -2574,7 +2634,13 @@ ivas_error config_acelp1_IVAS( 
        test();

        test();

        /* algebraic codebook bit-budget */

#ifdef NONBE_FIX_GSC_BSTR

        IF( flag_hardcoded /* EVS */ ||

            ( GE_32( core_brate_inp, MIN_BRATE_AVQ_EXC ) && coder_type != INACTIVE ) /* high-birate ACELP except IC */ ||

            ( !inactive_coder_type_flag && coder_type == INACTIVE ) /* AVQ inactive */ )

#else

        IF( flag_hardcoded || ( GE_32( core_brate_inp, MIN_BRATE_AVQ_EXC ) && coder_type != INACTIVE ) || ( GT_32( total_brate, MAX_GSC_INACTIVE_BRATE ) && coder_type == INACTIVE ) )

#endif

        {

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

            {
@@ -2675,7 +2741,12 @@ ivas_error config_acelp1_IVAS( 
        test();

        test();

        /* AVQ codebook */

#ifdef NONBE_FIX_GSC_BSTR

        IF( ( GE_32( core_brate_inp, MIN_BRATE_AVQ_EXC ) && coder_type != INACTIVE ) /* high-birate ACELP except IC */ ||

            ( !inactive_coder_type_flag && coder_type == INACTIVE ) /* AVQ inactive */ )

#else

        IF( ( GE_32( core_brate_inp, MIN_BRATE_AVQ_EXC ) && coder_type != INACTIVE ) || ( GT_32( total_brate, MAX_GSC_INACTIVE_BRATE ) && coder_type == INACTIVE ) )

#endif

        {

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

            {
@@ -2713,7 +2784,13 @@ ivas_error config_acelp1_IVAS( 
            }

        }

    }

#ifdef NONBE_FIX_GSC_BSTR

    ELSE IF( ( EQ_16( coder_type, UNVOICED ) && EQ_16( tdm_low_rate_mode, 1 ) && EQ_16( element_mode, IVAS_CPE_TD ) ) /* LBR secondary channel in TD stereo */ ||

             ( ( coder_type == INACTIVE || EQ_16( coder_type, AUDIO ) ) && EQ_16( nb_subfr, NB_SUBFR ) ) /* GSC @12.8kHz */ ||

             ( coder_type == INACTIVE && inactive_coder_type_flag ) /* AVQ inactive */ )

#else

    ELSE IF( ( EQ_16( coder_type, UNVOICED ) && EQ_16( tdm_low_rate_mode, 1 ) && EQ_16( element_mode, IVAS_CPE_TD ) ) || ( ( coder_type == INACTIVE || EQ_16( coder_type, AUDIO ) ) && EQ_16( nb_subfr, NB_SUBFR ) ) || ( coder_type == INACTIVE && LE_32( total_brate, MAX_GSC_INACTIVE_BRATE ) ) )

#endif

    {

        Word32 Local_BR, Pitch_BR;

        Word16 Pitch_CT;
@@ -2854,7 +2931,12 @@ ivas_error config_acelp1_IVAS( 
        test();

        test();

        test();

#ifdef NONBE_FIX_GSC_BSTR

        IF( ( EQ_16( L_frame, L_FRAME16k ) && coder_type == INACTIVE && inactive_coder_type_flag ) /* GSC Inactive @16kHz */ ||

            ( GSC_IVAS_mode > 0 && EQ_16( L_frame, L_FRAME16k ) ) ) /* IVAS GSC @16kHz */

#else

        IF( ( EQ_16( L_frame, L_FRAME16k ) && coder_type == INACTIVE && LE_32( total_brate, MAX_GSC_INACTIVE_BRATE ) ) || ( GSC_IVAS_mode > 0 && EQ_16( L_frame, L_FRAME16k ) ) ) /* GSC Inactive @16kHz */

#endif

        {

            acelp_cfg->ubits = 0;

            move16();

lib_com/cldfb.c

+1 −1
Original line number Diff line number Diff line
@@ -1213,7 +1213,7 @@ void cldfbSynthesis_ivas_fx( 
            /*cplxMult(&iBuffer[2*i], &iBuffer[2*i+1],-imagBuffer[k][2*i], imagBuffer[k][M1-1-2*i], rot_vctr_re[i], rot_vctr_im[i]);*/

            iBuffer_fx[2 * i] = Msub_32_32( Mpy_32_32( ( L_negate( imagBuffer_fx[k][2 * i] ) ), rot_vctr_re_fx[i] ), imagBuffer_fx[k][( M1 - 1 ) - ( i * 2 )], rot_vctr_im_fx[i] ); // Qx

            move32();

            iBuffer_fx[2 * i + 1] = Madd_32_32( Mpy_32_32( ( L_negate( imagBuffer_fx[k][2 * i] ) ), rot_vctr_im_fx[i] ), imagBuffer_fx[k][( M1 - 1 ) - ( i * 2 )], rot_vctr_re_fx[i] ); // Qx

            iBuffer_fx[2 * i + 1] = Msub_32_32( Mpy_32_32( imagBuffer_fx[k][( M1 - 1 ) - ( i * 2 )], rot_vctr_re_fx[i] ), imagBuffer_fx[k][2 * i], rot_vctr_im_fx[i] ); // Qx

            move32();

        }