Commit 16cd9565 authored by multrus's avatar multrus
Browse files

Merge branch 'main' into 1817-replace-carry-overflow-using-32-bit-operators-by-64-bit-version

parents 4890db2a da53bce0

.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_com.vcxproj

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

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

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

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

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

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

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

Workspace_msvc/lib_com.vcxproj.filters

+1 −0
Original line number Diff line number Diff line
@@ -512,6 +512,7 @@ 
      <Filter>common_ivas_c</Filter>

    </ClCompile>

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

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

      <Filter>common_ivas_c</Filter>

    </ClCompile>

  </ItemGroup>

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" />

apps/decoder.c

+13 −1
Original line number Diff line number Diff line
@@ -488,18 +488,30 @@ int main( 
            goto cleanup;

        }



#ifdef CONF_DISTATT

        if ( ( error = RenderConfigReader_getDirectivity( renderConfigReader, arg.directivityPatternId, renderConfig.directivity_fx ) ) != IVAS_ERR_OK )

#else

        if ( ( error = RenderConfigReader_getDirectivity( renderConfigReader, arg.directivityPatternId, renderConfig.directivity ) ) != IVAS_ERR_OK )

#endif

        {

            fprintf( stderr, "Failed to get directivity patterns for one or more of IDs: %d %d %d %d\n\n", arg.directivityPatternId[0], arg.directivityPatternId[1], arg.directivityPatternId[2], arg.directivityPatternId[3] );

            goto cleanup;

        }

#ifndef CONF_DISTATT

        FOR( Word16 i = 0; i < 4; i++ )

        {

            renderConfig.directivity_fx[i * 3] = (Word16) ( renderConfig.directivity[i * 3] * ( 1u << 6 ) );

            renderConfig.directivity_fx[i * 3 + 1] = (Word16) ( renderConfig.directivity[i * 3 + 1] * ( 1u << 6 ) );

            renderConfig.directivity_fx[i * 3 + 2] = (Word16) ( renderConfig.directivity[i * 3 + 2] * ( ( 1u << 15 ) - 1 ) );

        }



#endif

#ifdef CONF_DISTATT

        if ( ( error = RenderConfigReader_getDistanceAttenuation( renderConfigReader, renderConfig.distAtt_fx ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "Failed to get Distance Attenuation \n\n" );

            goto cleanup;

        }

#endif

        if ( ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ||

               arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )

        {