Commit 03c27517 authored by vaclav's avatar vaclav
Browse files

Merge remote-tracking branch 'remotes/origin/main' into 1052-sba-decoder-confused-with-ext-output

parents ed56b1f5 09570f9a

Workspace_msvc/lib_com.vcxproj

+1 −0
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ 
    <ClCompile Include="..\lib_com\ivas_mdct_imdct.c" />

    <ClCompile Include="..\lib_com\ivas_mdft_imdft.c" />

    <ClCompile Include="..\lib_com\ivas_omasa_com.c" />

    <ClCompile Include="..\lib_com\ivas_osba_com.c" />

    <ClCompile Include="..\lib_com\ivas_pca_tools.c" />

    <ClCompile Include="..\lib_com\ivas_qmetadata_com.c" />

    <ClCompile Include="..\lib_com\ivas_qspherical_com.c" />

Workspace_msvc/lib_com.vcxproj.filters

+4 −1
Original line number Diff line number Diff line
@@ -469,6 +469,9 @@ 
    <ClCompile Include="..\lib_com\ivas_lfe_com.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_osba_com.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_rotation_com.c" />

  </ItemGroup>

  <ItemGroup>

lib_com/ivas_cnst.h

+2 −0
Original line number Diff line number Diff line
@@ -1424,7 +1424,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.c

+6 −0
Original line number Diff line number Diff line
@@ -62,7 +62,11 @@ void ivas_filters_init( 
    int16_t i;

    filter_state->order = order;



#ifdef NONBE_FIX_MC_LFE_LPF

    if ( order == IVAS_FILTER_ORDER_1 )

#else

    if ( order == IVAS_FILTER_ORDER_2 || order == IVAS_FILTER_ORDER_1 )

#endif

    {

        filter_state->filt_len = order + 1;
@@ -116,7 +120,9 @@ void ivas_filter_process( 
    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( filter_state, pIn_Out, length, IVAS_FILTER_STAGE_0 );

            break;

        case IVAS_FILTER_ORDER_4:

lib_com/ivas_lfe_com.c

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ void ivas_lfe_lpf_select_filt_coeff( 
{

    switch ( order )

    {

#ifndef NONBE_FIX_MC_LFE_LPF

        case IVAS_FILTER_ORDER_2:

            switch ( sampling_rate )

            {
@@ -76,6 +77,7 @@ void ivas_lfe_lpf_select_filt_coeff( 
                    break;

            }

            break;

#endif

        case IVAS_FILTER_ORDER_4:

            switch ( sampling_rate )

            {