Merge branch 'main' into 2186_change_object_editing_gain_limitation (b1dca187) · Commits · SA4 / Audio / IVAS BASOP

Makefile

+2 −2

Original line number	Diff line number	Diff line
		@@ -181,7 +181,7 @@ DEPS = $(addprefix $(OBJDIR)/,$(SRCS_LIBBASOP:.c=.P) $(SRCS_LIBCOM:.c=.P) $(SRCS

		.PHONY: all clean

		all: $(CLI_APIENC) $(CLI_APIDEC) $(CLI_APIREND) $(CLI_APIPOSTREND)
		all: $(CLI_APIENC) $(CLI_APIDEC) $(CLI_APIREND) $(CLI_APIPOSTREND) $(CLI_AMBICONVERT)

		$(OBJDIR):
		$(QUIET)mkdir -p $(OBJDIR)
		@@ -227,7 +227,7 @@ $(CLI_APIPOSTREND): $(OBJS_CLI_APPPOSTREND) $(LIB_LIBBASOP) $(LIB_LIBISAR) $(LIB
		$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APPPOSTREND) -L. -livasbasop -lisar -livasutil -livasdebug -livascom -llc3plus $(LDLIBS) -o $(CLI_APIPOSTREND)

		$(CLI_AMBICONVERT): $(OBJS_CLI_AMBICONVERT) $(OBJS_AMBICONVERT) $(LIB_LIBBASOP) $(LIB_LIBCOM)
		$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_AMBICONVERT) $(OBJS_AMBICONVERT) -L. -livascom -livasbasop $(LDLIBS) -o $(CLI_AMBICONVERT)
		$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_AMBICONVERT) $(OBJS_AMBICONVERT) -L. -livascom -livasbasop -livasdebug $(LDLIBS) -o $(CLI_AMBICONVERT)

		libs: $(LIB_LIBBASOP) $(LIB_LIBENC) $(LIB_LIBDEBUG) $(LIB_LIBCOM) $(LIB_LIBDEC) $(LIB_LIBREND) $(LIB_LIBISAR) $(LIB_LC3PLUS) $(LIB_LIBUTIL)

+3 −2

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@
		#include "../lib_util/tinywavein_c.h"
		#include "../lib_util/tinywaveout_c.h"
		#include "ambi_convert.h"
		#include "wmc_auto.h"

		/-------------------------------------------------------------------------------------
		* Ambisonics converter program
		@@ -78,8 +79,8 @@ int main( int argc, char *argv[] )
		if ( argc != 5 )
		{
		printf( "----------------------------------------------------------------------------------\n" );
		printf( "Usage:\n" );
		printf( "./ambi_converter input_file output_file input_convention output_convention\n" );
		printf( "\n" );
		printf( "Usage: ambi_converter input_file output_file input_convention output_convention\n" );
		printf( "\n" );
		printf( "input_convention and output convention must be an integer number in [0,5]\n" );
		printf( "the following conventions are supported:\n" );

+2 −0

Original line number	Diff line number	Diff line
		@@ -97,6 +97,7 @@
		#define FIX_2178_FL_TO_FX_WITH_OBJ_EDIT_FILE_INTERFACE /* Nokia: Fixes float to fx conversion in decoder app with object edit file interface */
		#define FIX_2070_JBM_TC_CHANNEL_RESCALING_ISSUE /* Eri/Orange: scale_sig32 problem on p_tc_fx[] */

		#define FIX_2173_UBSAN_IN_JBM_PCMDSP_APA /* FhG: Fix UBSAN problems in jbm_pcmdsp_apa_fx.c */
		#define FIX_1947_DEC_HIGH_MLD_FOR_STEREO2MONO /* FhG: Make Q-factor of synth_16_fx and output_16_fx dynamic to prevent overflow in HQ_CORE mode */
		/* ################### End FIXES switches ########################### */

		@@ -134,6 +135,7 @@
		#define NONBE_1362_FIX_OMASA_TO_MASA1_RENDERING /* Nokia: Fix OMASA to MASA1 rendering in IVAS_rend */
		#define FIX_1383_HEAD_TRACK_SANITIZER /* Nok: issue 1383: Fix head tracking struc values reading in renderer */
		#define FIX_1330_JBM_MEMORY /* VA: issue 1330: memory savings in the JBM decoder */
		#define FIX_1330_JBM_MEMORY_FIX /* VA: basop issue: 2179 fix non-BE difference in FIX_1330_JBM_MEMORY */
		#define FIX_1411_IGF_CRASH_BW_SWITCHING /* FhG: Fix for issue 1411: fixes crash that can happen for IGF with BW switching and DTX*/
		#define NONBE_MDCT_ST_DTX_FIX_SUBOPT_SPATIAL_CNG /* FhG: Fix MDCT-Stereo comfort noise for certain noise types */
		#define NONBE_1344_REND_MASA_LOW_FS /* Nokia: Issue 1344: Fix sanitizer errors when using IVAS_rend to render MASA with lower sampling rates */

+3 −0

Original line number	Diff line number	Diff line
		@@ -1576,6 +1576,9 @@ void ivas_jbm_dec_feed_tc_to_renderer_fx(
		FOR( ch = 0; ch < s_max( hTcBuffer->nchan_transport_jbm, hTcBuffer->nchan_buffer_full ); ch++ )
		{
		hTcBuffer->tc_fx[ch] = &hTcBuffer->tc_buffer_fx[offset];
		#ifdef FIX_1330_JBM_MEMORY_FIX
		st_ivas->p_output_fx[ch] = hTcBuffer->tc_fx[ch];
		#endif
		offset = add( offset, len_offset );
		}
		}

+9 −1

Original line number	Diff line number	Diff line
		@@ -127,7 +127,11 @@ struct apa_state_t
		UWord16 qualityred; /* quality reduction threshold */
		UWord16 qualityrise; /* quality rising for adaptive quality thresholds */

		#ifdef FIX_2173_UBSAN_IN_JBM_PCMDSP_APA
		Word16 last_pitch; /* last pitch/sync position */
		#else
		UWord16 last_pitch; /* last pitch/sync position */
		#endif
		UWord16 bad_frame_count; /* # frames before quality threshold is lowered */
		UWord16 good_frame_count; /* # scaled frames */

		@@ -1392,7 +1396,11 @@ static Word8 logarithmic_search_fx( const apa_state_t *ps,

		DO
		{
		#ifdef FIX_2173_UBSAN_IN_JBM_PCMDSP_APA
		coeff_max = INT32_MIN; /* will always be overwritten with result of first correlation */
		#else
		coeff_max = 0x80000000; /* will always be overwritten with result of first correlation */
		#endif
		move32();

		FOR( i = s_start; i < s_start + inlen; i += css * ps->num_channels )