Commit 6ccf3303 authored by Mohammadreza Naghibzadeh's avatar Mohammadreza Naghibzadeh
Browse files

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

Merge remote-tracking branch 'origin/main' into 1826-improve-wmops-performance-of-householderreduction_fx-in-ivas_svd_dec_fx-c
parents 552b9ed0 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_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" />

lib_com/bitstream.c

+20 −29
Original line number Diff line number Diff line
@@ -893,7 +893,11 @@ ivas_error check_ind_list_limits( 
        }

        ELSE

        {

            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", 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 );

#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

        }

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

    IF( NE_32( ( error = check_ind_list_limits( hBstr ) ), IVAS_ERR_OK ) )

    {

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

#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 */
@@ -2957,7 +2965,11 @@ ivas_error push_next_bits( 
        /* check the limits of the list of indices */

        IF( NE_32( ( error = check_ind_list_limits( hBstr ) ), IVAS_ERR_OK ) )

        {

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

#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];
@@ -2981,7 +2993,11 @@ ivas_error push_next_bits( 
        /* check the limits of the list of indices */

        IF( NE_32( ( error = check_ind_list_limits( hBstr ) ), IVAS_ERR_OK ) )

        {

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

#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];
@@ -3127,31 +3143,6 @@ UWord16 get_next_indice( 
    return value;

}



/*-------------------------------------------------------------------*

 * get_next_indice_1()

 *

 * Get the next 1-bit indice from the buffer

 *-------------------------------------------------------------------*/



/*! r: value of the indice */

UWord16 get_next_indice_1(

    Decoder_State *st /* i/o: decoder state structure   */

)

{

    Word32 nbits_total;

    nbits_total = st->total_brate / FRAMES_PER_SEC;

    /* detect corrupted bitstream */

    if ( ( st->next_bit_pos + 1 > nbits_total && st->codec_mode == MODE1 ) ||

         ( ( st->next_bit_pos + 1 > nbits_total + ( 2 * 8 ) ) && st->codec_mode == MODE2 ) /* add two zero bytes for arithmetic coder flush */

    )

    {

        st->BER_detect = 1;

        return ( 0 );

    }



    return st->bit_stream[st->next_bit_pos++];

}



/*-------------------------------------------------------------------*

 * get_next_indice_tmp()

 *