Merge with main (80d4a6dc) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -687,7 +687,9 @@ int main(
		fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", aeID );
		goto cleanup;
		}
		#ifndef FIX_587_DEFAULT_REVERB
		renderConfig.roomAcoustics.override = true;
		#endif
		}

		/* ISAR frame size is set from command line, not renderer config file.

apps/renderer.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1044,7 +1044,9 @@ int main(
		fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", aeID );
		exit( -1 );
		}
		#ifndef FIX_587_DEFAULT_REVERB
		renderConfig.roomAcoustics.override = 1;
		#endif
		}

		/* ISAR frame size is set from command line, not renderer config file.

lib_com/bitstream.c

+14 −14

Original line number	Diff line number	Diff line
		@@ -1428,7 +1428,6 @@ uint16_t get_indice_1(
		return st->bit_stream[pos];
		}

		#define WMC_TOOL_SKIP

		/-------------------------------------------------------------------
		* reset_indices_enc()
		@@ -1468,6 +1467,7 @@ void reset_indices_dec(
		return;
		}


		/-------------------------------------------------------------------
		* write_indices_to_stream()
		*
		@@ -1838,6 +1838,7 @@ void convertBytestreamToSerial(
		}
		}


		/-------------------------------------------------------------------
		* decoder_selectCodec()
		*
		@@ -2515,8 +2516,8 @@ void ivas_set_bitstream_pointers(
		return;
		}


		#ifdef DEBUGGING

		/-------------------------------------------------------------------
		* preview_indices()
		*
		@@ -2786,14 +2787,15 @@ ivas_error preview_indices(

		return error;
		}
		#endif

		#endif

		/-------------------------------------------------------------------
		* read_indices()
		*
		* Read indices from an ITU-T G.192 bitstream to the buffer
		* Simulate packet losses by inserting frame erasures
		* Detect SID, NO_DATA, BFI, etc. and set bitstream pointers
		* Set ivas_total_brate
		* Note: each bit is represented in bitsream buffer as a uint16_t of value 0 or 1
		-------------------------------------------------------------------/

		/! r: 1 = reading OK, 0 = problem /
		@@ -2838,8 +2840,8 @@ ivas_error read_indices(
		/* convert the frame length to total bitrate */
		total_brate = (int32_t) ( num_bits * FRAMES_PER_SEC );

		/* verify that a valid num bits value is present in the G.192 file */
		/* only AMRWB, EVS or IVAS bitrates or 0(NO DATA) are allowed in G.192 file frame reading */
		/* verify that a valid num bits value is present */
		/* only AMRWB, EVS or IVAS bitrates or 0(NO DATA) are allowed */
		if ( st_ivas->ivas_format != MONO_FORMAT )
		{
		k = 0;
		@@ -2858,7 +2860,7 @@ ivas_error read_indices(
		}
		else if ( k == SIZE_IVAS_BRATE_TBL )
		{
		return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Error, illegal bitrate (%d) in the G.192 frame ! Exiting ! \n", total_brate );
		return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Error, illegal bitrate (%d) detected! Exiting ! \n", total_brate );
		}
		else
		{
		@@ -2871,12 +2873,12 @@ ivas_error read_indices(

		if ( rate2EVSmode( total_brate, NULL ) < 0 ) /* negative value means that a valid rate was not found */
		{
		return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Error, illegal bitrate (%d) in the G.192 frame ! Exiting ! \n", total_brate );
		return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Error, illegal bitrate (%d) detected! Exiting ! \n", total_brate );
		}
		}

		/* G.192 RX DTX handler*/
		/* handle SID_FIRST, SID_BAD, SPEECH_LOST, NO_DATA as properly as possible for the ITU-T G.192 format */
		/* RX DTX handler*/
		/* handle SID_FIRST, SID_BAD, SPEECH_LOST, NO_DATA */
		/* (total_brate, bfi , st_CNG) = rx_handler(received frame type, [previous frame type], past CNG state, past core) */
		curr_ft_good_sp = 0;
		curr_ft_bad_sp = 0;
		@@ -3036,7 +3038,6 @@ ivas_error read_indices(
		/* GOOD frame */
		if ( st_ivas->bfi == 0 \|\| st_ivas->bfi == FRAMEMODE_FUTURE )
		{
		/* GOOD frame - convert ITU-T G.192 words to short values */
		st_ivas->hDecoderConfig->ivas_total_brate = total_brate;
		}

		@@ -3050,6 +3051,7 @@ ivas_error read_indices(
		return error;
		}


		/-------------------------------------------------------------------
		* get_rfFrameType()
		*
		@@ -3467,5 +3469,3 @@ void dtx_read_padding_bits(

		return;
		}

		#undef WMC_TOOL_SKIP

lib_com/common_api_types.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -312,7 +312,9 @@ typedef enum

		typedef struct _IVAS_ROOM_ACOUSTICS_CONFIG
		{
		#ifndef FIX_587_DEFAULT_REVERB
		int16_t override;
		#endif
		int16_t nBands; /* Number of frequency bands for which reverb properties are provided, integer, range [2..256] */
		float pFc_input[IVAS_CLDFB_NO_CHANNELS_MAX]; /* Center frequencies for which following values are provided: */
		float pAcoustic_rt60[IVAS_CLDFB_NO_CHANNELS_MAX]; /* - The room's T60 per center frequency */

lib_com/options.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -170,6 +170,7 @@
		#define TMP_FIX_1119_SPLIT_RENDERING_VOIP /* FhG: Add error check for unsupported config: split rendering with VoIP mode */

		#define FIX_1158_FASTCONV_REVERB_HRTF /* Philips: issue 1158: Rendering with FastConv to BINAURAL_ROOM_REVERB uses BRIR convolution instead of HRTF */
		#define FIX_587_DEFAULT_REVERB /* Philips: issue 587: inconsistent default reverb parameters across renderers */
		#define FIX_VOIP_FUNCTIONS /* VA: fix data type mismatch in IVAS_DEC_VoIP_SetScale() + add sanity checks to API functions */

		/* #################### End BE switches ################################## */