Commit 391151b1 authored by vaclav's avatar vaclav
Browse files

- Merge remote-tracking branch 'remotes/origin/main' into maintenance

parents cbd669c6 32aa5004

Workspace_msvc/lib_dec.vcxproj.filters

+2 −6
Original line number Diff line number Diff line
@@ -439,9 +439,6 @@ 
    <ClCompile Include="..\lib_dec\lead_deindexing.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>

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

      <Filter>decoder_all_c</Filter>

    </ClCompile>

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

      <Filter>decoder_all_c</Filter>

    </ClCompile>
@@ -520,6 +517,7 @@ 
    <ClCompile Include="..\lib_dec\waveadjust_fec_dec.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>

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

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_dec\ivas_stat_dec.h">
@@ -558,9 +556,7 @@ 
    <ClInclude Include="..\lib_dec\rom_dec.h">

      <Filter>decoder_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_dec\lib_dec.h">

      <Filter>decoder_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_dec\lib_dec.h" />

  </ItemGroup>

  <ItemGroup>

    <Filter Include="decoder_all_c">

apps/decoder.c

+106 −81

File changed.

Preview size limit exceeded, changes collapsed.

apps/renderer.c

+101 −88

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/bitstream.c

+1 −1
Original line number Diff line number Diff line
@@ -2712,7 +2712,7 @@ ivas_error preview_indices( 
                st_ivas->nchan_transport++;

                k--;

            }

            st_ivas->transport_config = AUDIO_CONFIG_EXTERNAL + st_ivas->nchan_transport;

            st_ivas->transport_config = IVAS_AUDIO_CONFIG_EXTERNAL + st_ivas->nchan_transport;



            st_ivas->ism_mode = ivas_ism_mode_select( st_ivas->nchan_transport, total_brate );

            st_ivas->nSCE = st_ivas->nchan_transport;

lib_com/cnst.h

+3 −3
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ 
#define PCM16_TO_FLT_FAC                32768.0f

#define MDFT_NORM_SCALING               ( 1.0f / PCM16_TO_FLT_FAC )

#define MAX_FRAME_COUNTER               200

#define MAX_BITS_PER_FRAME              10240           /* Bits per frame for max. bitrate 512kbps */

#define MAX_BITS_PER_FRAME              10240           /* Bits per frame for max. bitrate 512kbps, == IVAS_MAX_BITS_PER_FRAME */



#define ENC                             0               /* Index for "encoder" */

#define DEC                             1               /* Index for "decoder" */
@@ -621,8 +621,8 @@ enum 


#define L_HP20_MEM                          4                      /* HP20 filter memory length */



#define CLDFB_NO_CHANNELS_MAX               60                     /* CLDFB resampling - max number of CLDFB channels */

#define CLDFB_NO_COL_MAX                    16                     /* CLDFB resampling - max number of CLDFB col. */

#define CLDFB_NO_CHANNELS_MAX               60                     /* CLDFB resampling - max number of CLDFB channels, == IVAS_CLDFB_NO_CHANNELS_MAX */

#define CLDFB_NO_COL_MAX                    16                     /* CLDFB resampling - max number of CLDFB col., == IVAS_CLDFB_NO_COL_MAX */

#define CLDFB_NO_COL_MAX_SWITCH             6                      /* CLDFB resampling - max number of CLDFB col. for switching */

#define CLDFB_NO_COL_MAX_SWITCH_BFI         10                     /* CLDFB resampling - max number of CLDFB col. for switching, BFI */

#define CLDFB_OVRLP_MIN_SLOTS               3                      /* CLDFB resampling - minimize processing to minimum required for transition frame ACELP->TCX/HQ */