Commit 6ede4a1a authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into ci/add-usan-jobs-to-mr-pipeline

parents 76924b5b 2ccb55e9

Workspace_msvc/lib_dec.vcxproj

+0 −3
Original line number Diff line number Diff line
@@ -271,10 +271,7 @@ 
    <ClCompile Include="..\lib_dec\ivas_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_decision_matrix_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_dirac_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_dirac_decorr_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_dirac_onsets_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_dirac_output_synthesis_cov.c" />

    <ClCompile Include="..\lib_dec\ivas_dirac_output_synthesis_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_entropy_decoder.c" />

    <ClCompile Include="..\lib_dec\ivas_init_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_ism_dec.c" />

Workspace_msvc/lib_dec.vcxproj.filters

+0 −9
Original line number Diff line number Diff line
@@ -16,15 +16,6 @@ 
    <ClCompile Include="..\lib_dec\ivas_dirac_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_dirac_decorr_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_dirac_onsets_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_dirac_output_synthesis_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_rom_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

Workspace_msvc/lib_rend.vcxproj

+4 −0
Original line number Diff line number Diff line
@@ -222,6 +222,10 @@ 
    <ClCompile Include="..\lib_rend\ivas_splitRendererPLC.c" />

    <ClCompile Include="..\lib_rend\ivas_crend.c" />

    <ClCompile Include="..\lib_rend\ivas_dirac_ana.c" />

    <ClCompile Include="..\lib_rend\ivas_dirac_decorr_dec.c" />

    <ClCompile Include="..\lib_rend\ivas_dirac_onsets_dec.c" />

    <ClCompile Include="..\lib_rend\ivas_dirac_output_synthesis_dec.c" />

    <ClCompile Include="..\lib_rend\ivas_dirac_rend.c" />

    <ClCompile Include="..\lib_rend\ivas_efap.c" />

    <ClCompile Include="..\lib_rend\ivas_limiter.c" />

    <ClCompile Include="..\lib_rend\ivas_masa_merge.c" />

lib_com/ivas_cnst.h

+0 −10
Original line number Diff line number Diff line
@@ -313,13 +313,7 @@ typedef enum 
#define MIN_BRATE_SWB_SCE                       ACELP_9k60                  /* min. SCE bitrate where SWB is supported */

#define MIN_BRATE_SWB_STEREO                    IVAS_13k2                   /* min. stereo bitrate where SWB is supported */

#define MIN_BRATE_FB_STEREO                     IVAS_32k                    /* min. SCE and stereo bitrate where FB is supported */

#ifdef ISM_FB

#ifdef ISM_FB_16k4

#define MIN_BRATE_FB_ISM                        16000                       /* min. SCE bitrate where FB is supported in ISM format */

#else

#define MIN_BRATE_FB_ISM                        24000                       /* min. SCE bitrate where FB is supported in ISM format */

#endif

#endif



#define MIN_TDM_BRATE_WB_TBE_1k05               12000                       /* min. per channel bitrate where WB TBE @1.05 kbps is supported (0.35kbs at lower bitrates) */

#define MIN_BRATE_WB_TBE_1k05                   9650                        /* min. per channel bitrate where WB TBE @1.05 kbps is supported (0.35kbs at lower bitrates) */
@@ -1432,12 +1426,8 @@ typedef enum 
#define PARAM_MC_MAX_BAND_ABS_COV_DEC           10

#define PARAM_MC_ENER_LIMIT_INTRAFRAME          (1.5f)

#define PARAM_MC_ENER_LIMIT_INTERFRAME          (2.0f)

#ifdef FIX_563_PARAMMC_LIMITER

#define PARAM_MC_ENER_LIMIT_MAX_DELTA_FAC       (15.0f)

#endif

#ifdef FIX_580_PARAMMC_ENER_BURSTS

#define PARAM_MC_NUM_ATTACK_ILD_THRESH          (3)

#endif

#define PARAM_MC_LFE_ON_THRESH                  (8000.0f)

#define PARAM_MC_BAND_TO_MDCT_BAND_RATIO        16                          /* Ratio of resolution of CLDFB Bands to MDCT Bands */

#define PARAM_MC_SLOT_ENC_NS                    2500000L

lib_com/ivas_ism_com.c

+0 −6
Original line number Diff line number Diff line
@@ -54,9 +54,7 @@ 
#define BETA_ISM_LOW_IMP    0.6f

#define BETA_ISM_MEDIUM_IMP 0.8f



#ifdef FIX_562_ISM2_64KBPS

#define MAX_BRATE_TCX_32k 48000

#endif





/*-------------------------------------------------------------------*
@@ -292,7 +290,6 @@ ivas_error ivas_ism_config( 
            bits_CoreCoder[ch] = tmp;

        }



#ifdef FIX_562_ISM2_64KBPS

        /* limitaton to avoid too high bitrate in one active TCX channel */

        if ( element_brate[0] >= SCE_CORE_16k_LOW_LIMIT && element_brate[0] <= IVAS_32k )

        {
@@ -307,7 +304,6 @@ ivas_error ivas_ism_config( 
                bits_CoreCoder[ch] = tmp;

            }

        }

#endif



        if ( diff > 0 )

        {
@@ -510,10 +506,8 @@ void ivas_param_ism_config( 
        hParamIsm->last_el_sgn[i] = 1;

    }



#ifdef FIX_549_DMX_GAIN

    hParamIsm->last_dmx_gain = 1.0f;

    set_f( hParamIsm->last_cardioid_left, 1.0f, MAX_NUM_OBJECTS );

#endif

    return;

}