Commit da601adf authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into ci/interop-test

parents 9d9a917b b111ce5f

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ stages: 
.ivas-pytest-mld-anchor: &ivas-pytest-mld-anchor

  stage: test

  needs: ["build-codec-linux-make"]

  timeout: "120 minutes"

  timeout: "240 minutes"

  script:

    - *print-common-info

    - *update-scripts-repo

Workspace_msvc/lib_dec.vcxproj

+1 −0
Original line number Diff line number Diff line
@@ -302,6 +302,7 @@ 
    <ClCompile Include="..\lib_dec\ivas_mct_core_dec.c" />

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

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

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

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

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

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

Workspace_msvc/lib_dec.vcxproj.filters

+2 −0
Original line number Diff line number Diff line
@@ -817,6 +817,8 @@ 
    <ClCompile Include="..\lib_dec\ivas_sns_dec_fx.c" />

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

      <Filter>decoder_all_c</Filter>

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

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>

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

      <Filter>decoder_ivas_c</Filter>

apps/renderer.c

+1 −1
Original line number Diff line number Diff line
@@ -1194,7 +1194,7 @@ int main( 
        /* Convert from int to float and from interleaved to packed */

        convertInputBuffer( inpInt16Buffer, numSamplesRead, inBuffer.config.numSamplesPerChannel, num_in_channels, inFloatBuffer );

#ifdef IVAS_FLOAT_FIXED

        *outBuffer.pq_fact = 16 - ( gd_bits + 1 );

        *outBuffer.pq_fact = 16 - ( gd_bits);

        convertInputBuffer_fx( inpInt16Buffer, numSamplesRead, inBuffer.config.numSamplesPerChannel, num_in_channels, inInt32Buffer, *outBuffer.pq_fact );

#endif

        int16_t num_subframes, sf_idx;

lib_com/cnst.h

+1 −0
Original line number Diff line number Diff line
@@ -1966,6 +1966,7 @@ typedef enum _DCTTYPE 
#define INV_PREECHO_SMOOTH_LENP1            ( 1 / ( PREECHO_SMOOTH_LEN + 1.0 ) );



#define EPSILON                             0.000000000000001f

#define EPSILON_fx                          0



#define MAX_SEGMENT_LENGTH                  480

#define NUM_TIME_SWITCHING_BLOCKS           4