Commit e53cbccc authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge remote-tracking branch 'origin/ivas-float-update' into... 

Merge remote-tracking branch 'origin/ivas-float-update' into 1847_ref_port_float_mr_1542_omasa_lbr_signaling_fix
parents 6611aca7 26d614c0

.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

+2 −1
Original line number Diff line number Diff line
@@ -203,6 +203,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

+5 −0
Original line number Diff line number Diff line
@@ -469,6 +469,11 @@ 
    <ClCompile Include="..\lib_com\ivas_lfe_com.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

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

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

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

      <Filter>common_ivas_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_com\basop_proto_func.h">

apps/decoder.c

+7 −0
Original line number Diff line number Diff line
@@ -630,6 +630,13 @@ int main( 
            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;

        }

#ifdef CONF_DISTATT

        if ( ( error = RenderConfigReader_getDistanceAttenuation( renderConfigReader, renderConfig.distAtt ) ) != 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 ) )

        {

lib_com/bitstream.c

+16 −0
Original line number Diff line number Diff line
@@ -902,7 +902,11 @@ ivas_error check_ind_list_limits( 
        }

        else

        {

#ifdef DEBUGGING

            return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Buffer of indices corrupted in frame %d! Attempt to overwrite indice ID = %d (value: %d, bits: %d)!\n", frame, hBstr->ind_list[hBstr->nb_ind_tot].id, hBstr->ind_list[hBstr->nb_ind_tot].value, hBstr->ind_list[hBstr->nb_ind_tot].nb_bits );

#else

            return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Buffer of indices corrupted! Attempt to overwrite indice ID = %d (value: %d, bits: %d)!\n", hBstr->ind_list[hBstr->nb_ind_tot].id, hBstr->ind_list[hBstr->nb_ind_tot].value, hBstr->ind_list[hBstr->nb_ind_tot].nb_bits );

#endif

        }

    }
@@ -2819,7 +2823,11 @@ ivas_error push_indice( 
    /* check the limits of the list of indices */

    if ( ( error = check_ind_list_limits( hBstr ) ) != IVAS_ERR_OK )

    {

#ifdef DEBUGGING

        return IVAS_ERROR( error, "Error occured in push_indice() while re-allocating the list of indices (frame %d) !\n", frame );

#else

        return IVAS_ERROR( error, "Error occured in push_indice() while re-allocating the list of indices!\n" );

#endif

    }



    /* find the location in the list of indices based on ID */
@@ -2971,7 +2979,11 @@ ivas_error push_next_bits( 
        /* check the limits of the list of indices */

        if ( ( error = check_ind_list_limits( hBstr ) ) != IVAS_ERR_OK )

        {

#ifdef DEBUGGING

            return IVAS_ERROR( error, "Error occured in push_next_bits() while re-allocating the list of indices (frame %d) !\n", frame );

#else

            return IVAS_ERROR( error, "Error occured in push_next_bits() while re-allocating the list of indices!\n" );

#endif

        }

        ptr = &hBstr->ind_list[hBstr->nb_ind_tot];
@@ -2990,7 +3002,11 @@ ivas_error push_next_bits( 
        /* check the limits of the list of indices */

        if ( ( error = check_ind_list_limits( hBstr ) ) != IVAS_ERR_OK )

        {

#ifdef DEBUGGING

            return IVAS_ERROR( error, "Error occured in push_next_bits() while re-allocating the list of indices (frame %d) !\n", frame );

#else

            return IVAS_ERROR( error, "Error occured in push_next_bits() while re-allocating the list of indices!\n" );

#endif

        }

        ptr = &hBstr->ind_list[hBstr->nb_ind_tot];