Commit 490ecd3d authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge remote-tracking branch 'origin/main' into... 

Merge remote-tracking branch 'origin/main' into 1860_fix_ivas_init_dec_get_num_cldfb_instances_duplication
parents dcfe8c59 a48d55a8

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ variables: 
  IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF main



include:

  - local: .gitlab-ci/variables.yml

  - local: .gitlab-ci/rules-basis.yml

  - project: ivas-codec-pc/ivas-codec-ci

    ref: *IVAS_CODEC_CI_REF

    file: main-basop.yml

  - local: .gitlab-ci/variables.yml

  - local: .gitlab-ci/rules-basis.yml

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/ivas_cnst.h

+2 −0
Original line number Diff line number Diff line
@@ -1562,7 +1562,9 @@ typedef enum 
typedef enum

{

    IVAS_FILTER_ORDER_1 = 1,

#ifndef NONBE_FIX_MC_LFE_LPF

    IVAS_FILTER_ORDER_2 = 2,

#endif

    IVAS_FILTER_ORDER_4 = 4,

} ivas_filter_order;

lib_com/ivas_filters_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -64,7 +64,11 @@ void ivas_filters_init_fx( 




    test();

#ifdef NONBE_FIX_MC_LFE_LPF

    IF( EQ_16( order, IVAS_FILTER_ORDER_1 ) )

#else

    IF( EQ_16( order, IVAS_FILTER_ORDER_2 ) || EQ_16( order, IVAS_FILTER_ORDER_1 ) )

#endif

    {

        filter_state->filt_len = add( order, 1 );

        move16();
@@ -166,7 +170,9 @@ void ivas_filter_process_fx( 
    SWITCH( filter_state->order )

    {

        case IVAS_FILTER_ORDER_1:

#ifndef NONBE_FIX_MC_LFE_LPF

        case IVAS_FILTER_ORDER_2:

#endif

            set_val_Word16( pIn_Out_e, sub( Q31, q_factor ), length );

            ivas_iir_2_filter_fx( filter_state, pIn_Out_fx, length, IVAS_FILTER_STAGE_0, pIn_Out_e );

            /* Scale pIn_Out_fx back to input Q */
@@ -205,7 +211,9 @@ void ivas_filter_process_exp_fx( 
    SWITCH( filter_state->order )

    {

        case IVAS_FILTER_ORDER_1:

#ifndef NONBE_FIX_MC_LFE_LPF

        case IVAS_FILTER_ORDER_2:

#endif

            ivas_iir_2_filter_fx( filter_state, pIn_Out_fx, length, IVAS_FILTER_STAGE_0, pIn_Out_e );

            /* Scale pIn_Out_fx back to input Q */

            BREAK;

lib_com/ivas_lfe_com_fx.c

+3 −0
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ void ivas_lfe_lpf_select_filt_coeff_fx( 
{

    SWITCH( order )

    {



#ifndef NONBE_FIX_MC_LFE_LPF

        case IVAS_FILTER_ORDER_2:

            SWITCH( sampling_rate )

            {
@@ -74,6 +76,7 @@ void ivas_lfe_lpf_select_filt_coeff_fx( 
                    BREAK;

            }

            BREAK;

#endif

        case IVAS_FILTER_ORDER_4:

            SWITCH( sampling_rate )

            {