Merge branch 'main' into 624-msan-use-of-uninitialized-value-in-planarsba-wb-encoder (1809488b) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -2352,7 +2352,6 @@ static ivas_error decodeVoIP(
		uint32_t nextPacketRcvTime_ms = 0;
		uint32_t systemTime_ms = 0;
		uint32_t systemTimeInc_ms = (uint32_t) JBM_FRONTEND_FETCH_FRAMESIZE_MS;
		int32_t nFramesWritten = 0;
		int32_t nFramesFed = 0;


		@@ -2710,7 +2709,6 @@ static ivas_error decodeVoIP(

		frame++;
		systemTime_ms += systemTimeInc_ms;
		nFramesWritten++;

		#ifdef WMOPS
		update_mem();

apps/renderer.c

+38 −1

Original line number	Diff line number	Diff line
		@@ -175,6 +175,9 @@ typedef struct
		float lfeConfigElevation;
		bool lfeCustomRoutingEnabled;
		char inLfePanningMatrixFile[RENDERER_MAX_CLI_ARG_LENGTH];
		#ifdef FIX_488_SYNC_DELAY
		float syncMdDelay;
		#endif
		} CmdlnArgs;

		typedef enum
		@@ -203,6 +206,9 @@ typedef enum
		#endif
		CmdLnOptionId_referenceVectorFile,
		CmdLnOptionId_exteriorOrientationFile,
		#ifdef FIX_488_SYNC_DELAY
		CmdLnOptionId_syncMdDelay,
		#endif
		} CmdLnOptionId;

		static const CmdLnParser_Option cliOptions[] = {
		@@ -342,6 +348,14 @@ static const CmdLnParser_Option cliOptions[] = {
		.matchShort = "exof",
		.description = "External orientation trajectory file for simulation of external orientations",
		},
		#ifdef FIX_488_SYNC_DELAY
		{
		.id = CmdLnOptionId_syncMdDelay,
		.match = "sync_md_delay",
		.matchShort = "smd",
		.description = "Metadata Synchronization Delay in ms, Default is 0. Quantized by 5ms subframes for TDRenderer (13ms -> 10ms -> 2subframes)",
		},
		#endif
		};


		@@ -1113,6 +1127,9 @@ int main(
		if ( args.inConfig.numAudioObjects > 0 )
		{
		IVAS_REND_SetTotalNumberOfObjects( hIvasRend, args.inConfig.numAudioObjects );
		#ifdef FIX_488_SYNC_DELAY
		IVAS_REND_SetIsmMetadataDelay( hIvasRend, args.syncMdDelay );
		#endif
		}

		IVAS_REND_LfePanMtx lfePanMatrix;
		@@ -1687,6 +1704,8 @@ int main(
		}
		}
		}


		#ifdef SPLIT_REND_WITH_HEAD_ROT
		for ( i = 0; i < args.inConfig.numBinBuses; ++i )
		{
		@@ -1897,6 +1916,13 @@ int main(
		}
		#endif

		#ifdef FIX_488_SYNC_DELAY
		if ( args.inConfig.numAudioObjects != 0 && ( args.outConfig.audioConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL \|\| args.outConfig.audioConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )
		{
		fprintf( stdout, "\n\nMetadata delayed %d subframes\n\n", (int16_t) round( args.syncMdDelay / ( 1000 / FRAMES_PER_SEC / MAX_PARAM_SPATIAL_SUBFRAMES ) ) );
		}
		#endif

		if ( !args.quietModeEnabled && args.delayCompensationEnabled )
		{
		fprintf( stdout, "\nRenderer delay: %-5u [samples] - Timescale: %5u\n", delayNumSamples_orig, delayTimeScale );
		@@ -2483,6 +2509,10 @@ static CmdlnArgs defaultArgs(

		args.lfeCustomRoutingEnabled = false;
		clearString( args.inLfePanningMatrixFile );

		#ifdef FIX_488_SYNC_DELAY
		args.syncMdDelay = 0;
		#endif
		return args;
		}

		@@ -2622,6 +2652,13 @@ static void parseOption(
		exit( -1 );
		}
		break;
		#ifdef FIX_488_SYNC_DELAY
		case CmdLnOptionId_syncMdDelay:
		assert( numOptionValues == 1 );
		/* Metadata Delay to sync with audio delay in ms */
		args->syncMdDelay = strtof( optionValues[0], NULL );
		break;
		#endif
		default:
		assert( 0 && "This should be unreachable - all command line options should be explicitly handled." );
		break;
		@@ -3485,7 +3522,7 @@ static void parseSceneDescriptionFile(
		return;
		}

		static void printSupportedAudioConfigs()
		static void printSupportedAudioConfigs( void )
		{
		uint16_t i;
		const char *supportedFormats[] = {

lib_com/ivas_cnst.h

+0 −10

Original line number	Diff line number	Diff line
		@@ -313,13 +313,7 @@ typedef enum
		#define MIN_BRATE_SWB_SCE ACELP_9k60 /* min. SCE bitrate where SWB is supported */
		#define MIN_BRATE_SWB_STEREO IVAS_13k2 /* min. stereo bitrate where SWB is supported */
		#define MIN_BRATE_FB_STEREO IVAS_32k /* min. SCE and stereo bitrate where FB is supported */
		#ifdef ISM_FB
		#ifdef ISM_FB_16k4
		#define MIN_BRATE_FB_ISM 16000 /* min. SCE bitrate where FB is supported in ISM format */
		#else
		#define MIN_BRATE_FB_ISM 24000 /* min. SCE bitrate where FB is supported in ISM format */
		#endif
		#endif

		#define MIN_TDM_BRATE_WB_TBE_1k05 12000 /* min. per channel bitrate where WB TBE @1.05 kbps is supported (0.35kbs at lower bitrates) */
		#define MIN_BRATE_WB_TBE_1k05 9650 /* min. per channel bitrate where WB TBE @1.05 kbps is supported (0.35kbs at lower bitrates) */
		@@ -1432,12 +1426,8 @@ typedef enum
		#define PARAM_MC_MAX_BAND_ABS_COV_DEC 10
		#define PARAM_MC_ENER_LIMIT_INTRAFRAME (1.5f)
		#define PARAM_MC_ENER_LIMIT_INTERFRAME (2.0f)
		#ifdef FIX_563_PARAMMC_LIMITER
		#define PARAM_MC_ENER_LIMIT_MAX_DELTA_FAC (15.0f)
		#endif
		#ifdef FIX_580_PARAMMC_ENER_BURSTS
		#define PARAM_MC_NUM_ATTACK_ILD_THRESH (3)
		#endif
		#define PARAM_MC_LFE_ON_THRESH (8000.0f)
		#define PARAM_MC_BAND_TO_MDCT_BAND_RATIO 16 /* Ratio of resolution of CLDFB Bands to MDCT Bands */
		#define PARAM_MC_SLOT_ENC_NS 2500000L

lib_com/ivas_ism_com.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -54,9 +54,7 @@
		#define BETA_ISM_LOW_IMP 0.6f
		#define BETA_ISM_MEDIUM_IMP 0.8f

		#ifdef FIX_562_ISM2_64KBPS
		#define MAX_BRATE_TCX_32k 48000
		#endif


		/-------------------------------------------------------------------
		@@ -292,7 +290,6 @@ ivas_error ivas_ism_config(
		bits_CoreCoder[ch] = tmp;
		}

		#ifdef FIX_562_ISM2_64KBPS
		/* limitaton to avoid too high bitrate in one active TCX channel */
		if ( element_brate[0] >= SCE_CORE_16k_LOW_LIMIT && element_brate[0] <= IVAS_32k )
		{
		@@ -307,7 +304,6 @@ ivas_error ivas_ism_config(
		bits_CoreCoder[ch] = tmp;
		}
		}
		#endif

		if ( diff > 0 )
		{
		@@ -510,10 +506,8 @@ void ivas_param_ism_config(
		hParamIsm->last_el_sgn[i] = 1;
		}

		#ifdef FIX_549_DMX_GAIN
		hParamIsm->last_dmx_gain = 1.0f;
		set_f( hParamIsm->last_cardioid_left, 1.0f, MAX_NUM_OBJECTS );
		#endif
		return;
		}

lib_com/ivas_prot.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -5372,7 +5372,6 @@ void ivas_lfe_synth_with_filters(
		);


		#ifdef FIX_572_LFE_LPF_ENC
		/----------------------------------------------------------------------------------
		* LFE encoder low pass filter prototypes
		----------------------------------------------------------------------------------/
		@@ -5391,7 +5390,6 @@ void ivas_lfe_lpf_enc_apply(
		float data_lfe_ch[], /* i/o: LFE signal */
		const int16_t input_frame /* i : input frame length per channel */
		);
		#endif


		/----------------------------------------------------------------------------------