Commit dd5266b0 authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

Merge branch 'main' into 2226-segmentation-fault-in-isar-pre-renderer

parents 45e07305 b64c6536

Workspace_msvc/lib_com.vcxproj

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

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

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

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

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

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

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

Workspace_msvc/lib_com.vcxproj.filters

+0 −3
Original line number Diff line number Diff line
@@ -256,9 +256,6 @@ 
    <ClCompile Include="..\lib_com\fine_gain_bits_fx.c">

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

Workspace_msvc/lib_util.vcxproj

+3 −1
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ 
    <ClCompile Include="..\lib_util\cmdln_parser.c" />

    <ClCompile Include="..\lib_util\cmdl_tools.c" />

    <ClCompile Include="..\lib_util\evs_rtp_payload.c" />

    <ClCompile Include="..\lib_util\float_to_fix_ops.c" />

    <ClCompile Include="..\lib_util\g192.c" />

    <ClCompile Include="..\lib_util\ivas_bpool.c" />

    <ClCompile Include="..\lib_util\ivas_queue.c" />
@@ -141,6 +142,7 @@ 
    <ClInclude Include="..\lib_util\cmdln_parser.h" />

    <ClInclude Include="..\lib_util\cmdl_tools.h" />

    <ClInclude Include="..\lib_util\evs_rtp_payload.h" />

    <ClInclude Include="..\lib_util\float_to_fix_ops.h" />

    <ClInclude Include="..\lib_util\g192.h" />

    <ClInclude Include="..\lib_util\ivas_bpool.h" />

    <ClInclude Include="..\lib_util\ivas_queue.h" />

apps/decoder.c

+2 −3
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
*******************************************************************************************************/



#include "lib_dec.h"

#include "options.h"

#include <string.h>

#include "cmdl_tools.h"

#include "audio_file_writer.h"
@@ -50,7 +51,6 @@ 
#include "obj_edit_file_reader.h"

#include "vector3_pair_file_reader.h"

#include "wmc_auto.h"

#include "options.h"

#include "stl.h"

#ifdef IVAS_RTPDUMP

#include "ivas_rtp_file.h"
@@ -1787,12 +1787,11 @@ static void usage_dec( void ) 
    fprintf( stdout, "                      ID and duration pairs, where duration is specified in frames\n" );

    fprintf( stdout, "                      for BINAURAL_ROOM_REVERB output configuration.\n" );

    fprintf( stdout, "-obj_edit File      : Object editing instructions file or NULL for built-in example\n" );



    fprintf( stdout, "-level level        : Complexity level, level = (1, 2, 3), will be defined after characterisation. \n" );

    fprintf( stdout, "                      Currently, all values default to level 3 (full functionality).\n" );

#ifdef FIX_1318_ROOM_SIZE_CMD_LINE

    fprintf( stdout, "-room_size (S|M|L)  : Selects default reverb based on a room size (S - small | M - medium | L - large)\n" );

    fprintf( stdout, "                      for BINAURAL_ROOM_REVERB output configuration,\n" );

    fprintf( stdout, "                      for BINAURAL_ROOM_REVERB output configuration\n" );

#endif

    fprintf( stdout, "-q                  : Quiet mode, no frame counter\n" );

    fprintf( stdout, "                      default is deactivated\n" );

lib_basop/enh32.c

+0 −6
Original line number Diff line number Diff line
@@ -71,9 +71,7 @@ Word32 Mpy_32_32( Word32 L_var1, Word32 L_var2 ) 
{

    Word32 L_var_out;

    Word64 L64_var1;

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

#endif



    L64_var1 = ( (Word64) L_var1 * L_var2 );

    L64_var1 = W_shl_o( L64_var1, 1, &Overflow );
@@ -105,9 +103,7 @@ Word32 Mpy_32_32_r( Word32 L_var1, Word32 L_var2 ) 
Word32 Madd_32_16( Word32 L_var3, Word32 L_var1, Word16 var2 )

{

    Word32 L_var_out;

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

#endif



    L_var_out = Mpy_32_16_1( L_var1, var2 );

    L_var_out = L_add_o( L_var3, L_var_out, &Overflow );
@@ -138,9 +134,7 @@ Word32 Madd_32_16_r( Word32 L_var3, Word32 L_var1, Word16 var2 ) 
Word32 Msub_32_16( Word32 L_var3, Word32 L_var1, Word16 var2 )

{

    Word32 L_var_out;

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

#endif



    L_var_out = Mpy_32_16_1( L_var1, var2 );

    L_var_out = L_sub_o( L_var3, L_var_out, &Overflow );