Merge remote-tracking branch... (2b93a4d5) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+1 −57

Original line number	Diff line number	Diff line
		@@ -156,12 +156,6 @@ typedef struct
		uint16_t frontendFetchSizeMs;
		#endif
		#endif
		#ifdef MASAISM_EDIT_OBJECTS
		bool editing_ism_enabled;
		int16_t index_of_edited_ism;
		int16_t azimuth_edited_ism;
		int16_t elevation_edited_ism;
		#endif

		} DecArguments;

		@@ -684,16 +678,6 @@ int main(
		}
		}

		#ifdef MASAISM_EDIT_OBJECTS
		/------------------------------------------------------------------------------------------
		* Set edited object positions
		------------------------------------------------------------------------------------------/

		if ( arg.editing_ism_enabled )
		{
		IVAS_DEC_SetEditedIsmPositions( hIvasDec, arg.index_of_edited_ism, arg.azimuth_edited_ism, arg.elevation_edited_ism );
		}
		#endif

		/-----------------------------------------------------------------
		* Decoding
		@@ -911,9 +895,7 @@ static bool parseCmdlIVAS_dec(
		{
		int16_t i;
		char argv_to_upper[FILENAME_MAX];
		#ifdef MASAISM_EDIT_OBJECTS
		int32_t tmp1;
		#endif

		#ifdef DEBUGGING
		float ftmp;

		@@ -983,12 +965,6 @@ static bool parseCmdlIVAS_dec(
		#endif
		#endif

		#ifdef MASAISM_EDIT_OBJECTS
		arg->editing_ism_enabled = false;
		arg->index_of_edited_ism = 0;
		arg->azimuth_edited_ism = 0;
		arg->elevation_edited_ism = 0;
		#endif

		/-----------------------------------------------------------------
		* Initialization
		@@ -1351,38 +1327,6 @@ static bool parseCmdlIVAS_dec(
		}
		}

		#ifdef MASAISM_EDIT_OBJECTS
		else if ( strcmp( argv_to_upper, "-EDIT_ISM" ) == 0 ) /* Edit ISM position: objectID, azimuth (deg), elevation (deg) */
		{
		arg->editing_ism_enabled = true;
		i++;

		if ( argc - i <= 6 \|\| argv[i][0] == '-' )
		{
		fprintf( stderr, "Error: Edited ISM position parameters not defined! \n\n" );
		usage_dec();
		return false;
		}

		if ( sscanf( argv[i], "%d", &tmp1 ) > 0 )
		{
		arg->index_of_edited_ism = (int16_t) tmp1;
		i++;
		}

		if ( sscanf( argv[i], "%d", &tmp1 ) > 0 )
		{
		arg->azimuth_edited_ism = (int16_t) tmp1;
		i++;
		}

		if ( sscanf( argv[i], "%d", &tmp1 ) > 0 )
		{
		arg->elevation_edited_ism = (int16_t) tmp1;
		i++;
		}
		}
		#endif

		/-----------------------------------------------------------------
		* Option not recognized

lib_com/bitstream.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -553,23 +553,23 @@ int16_t get_ivas_max_num_indices(
		}
		else if ( ivas_total_brate <= IVAS_160k )
		{
		return 850;
		return 1150;
		}
		else if ( ivas_total_brate <= IVAS_192k )
		{
		return 950;
		return 1250;
		}
		else if ( ivas_total_brate <= IVAS_256k )
		{
		return 1300;
		return 1400;
		}
		else if ( ivas_total_brate <= IVAS_384k )
		{
		return 1450;
		return 1650;
		}
		else
		{
		return 1650;
		return 1850;
		}
		}
		#endif

lib_com/ivas_cnst.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -1270,13 +1270,13 @@ enum
		#define MAXIMUM_OMASA_FREQ_BANDS 8 /* Corresponds to maximum number of coding bands at 32 kbps */
		#ifdef MASA_AND_OBJECTS
		#define OMASA_STEREO_SW_CNT_MAX 100
		#define OMASA_STEREO_SW_CNT_MAX2 5
		#endif
		#endif

		#define MASA_BIT_REDUCT_PARAM 10
		#define MASA_MAXIMUM_TWO_DIR_BANDS 24
		#define NBITS_HR_COH 4

		typedef enum
		{
		MASA_STEREO_NOT_DEFINED,

lib_com/ivas_prot.h

+25 −7

Original line number	Diff line number	Diff line
		@@ -5184,6 +5184,24 @@ void ivas_binRenderer_close(
		BINAURAL_RENDERER_HANDLE hBinRenderer / i/o: decoder binaural renderer handle */
		);

		#ifdef FIX_1720_HRTF_FASTCONV
		void ivas_binaural_hrtf_close(
		HRTFS_FASTCONV_HANDLE hHrtfFastConv / i/o: decoder binaural hrtf handle */
		);

		ivas_error ivas_init_binaural_hrtf(
		HRTFS_FASTCONV HrtfFastConv / i/o: FASTCONV HRTF structure */
		);

		ivas_error ivas_allocate_binaural_hrtf(
		HRTFS_FASTCONV HrtfFastConv, / i/o: FASTCONV HRTF structure */
		AUDIO_CONFIG input_config, /* i : input audio configuration */
		BINAURAL_INPUT_AUDIO_CONFIG bin_input_config, /* i : binaural input audio config */
		RENDERER_TYPE renderer_type, /* i : renderer type */
		int16_t allocate_init_flag /* i : Memory allocation flag */
		);
		#endif

		#ifdef JBM_PARAMUPMIX
		void ivas_binaural_cldfb(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */

lib_com/ivas_stereo_ica_com.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -77,7 +77,6 @@ static void interpTargetChannel(
		return;
		}

		/* IVAS-220: QCToDo: (check N for dependency on the inputFs) */
		N = L_shift_adapt;
		factor = ( (float) N ) / abs( d );
		interp_factor2 = factor / INTERP_FACTOR1;