Rename FLOAT_INTERFACE -> FLOAT_INTERFACE_ENC (27f028b4) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/encoder.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -695,7 +695,7 @@ int main(
		}
		}

		#ifdef FLOAT_INTERFACE
		#ifdef FLOAT_INTERFACE_ENC
		float *tmpFloatBuf = NULL;
		bool useFloat = true; /* TODO(sgi): get from input file type or command line flag */
		if (useFloat)
		@@ -724,7 +724,7 @@ int main(

		/* * Encode one frame * */
		if ( ( error = IVAS_ENC_EncodeFrameToSerial( hIvasEnc,
		#ifndef FLOAT_INTERFACE
		#ifndef FLOAT_INTERFACE_ENC
		pcmBuf, pcmBufSize,
		#endif
		bitStream, &numBits ) ) != IVAS_ERR_OK )
		@@ -733,7 +733,7 @@ int main(
		goto cleanup;
		}

		#ifdef FLOAT_INTERFACE
		#ifdef FLOAT_INTERFACE_ENC
		if (tmpFloatBuf != NULL)
		{
		free(tmpFloatBuf);

lib_com/ivas_fb_mixer.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -462,7 +462,7 @@ void ivas_FB_mixer_close(

		void ivas_fb_mixer_pcm_ingest(
		IVAS_FB_MIXER_HANDLE hFbMixer, /* i/o: FB mixer handle */
		#ifdef FLOAT_INTERFACE
		#ifdef FLOAT_INTERFACE_ENC
		float* pcm_in[], /* i : input audio channels */
		#else
		float pcm_in[][L_FRAME48k], /* i : input audio channels */

lib_com/ivas_prot.h

+23 −23

Original line number	Diff line number	Diff line
		@@ -57,7 +57,7 @@

		ivas_error ivas_enc(
		Encoder_Struct st_ivas, / i : IVAS encoder structure */
		#ifdef FLOAT_INTERFACE
		#ifdef FLOAT_INTERFACE_ENC
		float data, / i : input signal */
		#else
		const int16_t data, / i : input signal */
		@@ -68,7 +68,7 @@ ivas_error ivas_enc(
		void stereo_dmx_evs_enc(
		STEREO_DMX_EVS_ENC_HANDLE hStereoDmxEVS, /* i/o: Stereo downmix for EVS encoder handle */
		const int32_t input_Fs, /* i : input sampling rate */
		#ifdef FLOAT_INTERFACE
		#ifdef FLOAT_INTERFACE_ENC
		float data[CPE_CHANNELS], /* i/o: input signal */
		#else
		int16_t data[CPE_CHANNELS * L_FRAME48k], /* i/o: input signal */
		@@ -186,7 +186,7 @@ ivas_error ivas_cpe_enc(

		ivas_error ivas_mct_enc(
		Encoder_Struct st_ivas, / i/o: IVAS encoder structure */
		#ifdef FLOAT_INTERFACE
		#ifdef FLOAT_INTERFACE_ENC
		float* data[MCT_MAX_CHANNELS], /* i : input signals */
		#else
		float data[MCT_MAX_CHANNELS][L_FRAME48k], /* i : input signals */
		@@ -857,7 +857,7 @@ ivas_error create_ism_metadata_dec(

		ivas_error ivas_ism_enc(
		Encoder_Struct st_ivas, / i/o: IVAS encoder structure */
		#ifdef FLOAT_INTERFACE
		#ifdef FLOAT_INTERFACE_ENC
		float* data[MAX_NUM_OBJECTS], /* i : input signal */
		#else
		float data[MAX_NUM_OBJECTS][L_FRAME48k], /* i : input signal */
		@@ -906,7 +906,7 @@ ivas_error ivas_param_ism_enc_open(

		void ivas_param_ism_enc(
		Encoder_Struct st_ivas, / i/o: IVAS encoder structure */
		#ifdef FLOAT_INTERFACE
		#ifdef FLOAT_INTERFACE_ENC
		float* data[MAX_NUM_OBJECTS], /* i : input signal */
		#else
		float data[MAX_NUM_OBJECTS][L_FRAME48k], /* i : input signal */
		@@ -921,7 +921,7 @@ void ivas_param_ism_enc_close(

		void ivas_param_ism_stereo_dmx(
		Encoder_Struct st_ivas, / i : IVAS encoder structure */
		#ifdef FLOAT_INTERFACE
		#ifdef FLOAT_INTERFACE_ENC
		float* data[MAX_NUM_OBJECTS], /* i/o: input signal/stereo dmx */
		#else
		float data[MAX_NUM_OBJECTS][L_FRAME48k], /* i/o: input signal/stereo dmx */
		@@ -3115,7 +3115,7 @@ void ivas_dirac_param_est_enc(
		DIRAC_ENC_HANDLE hDirAC,
		IVAS_QDIRECTION *q_direction,
		const uint8_t useLowerRes,
		#ifdef FLOAT_INTERFACE
		#ifdef FLOAT_INTERFACE_ENC
		float* data_f[],
		#else
		float data_f[][L_FRAME48k],
		@@ -3199,7 +3199,7 @@ int16_t ivas_sba_get_spar_hoa_md_flag(
		);

		void ivas_sba_zero_vert_comp(
		#ifdef FLOAT_INTERFACE
		#ifdef FLOAT_INTERFACE_ENC
		float* sba_data[], /* i/o: SBA data frame */
		#else
		float sba_data[][L_FRAME48k], /* i/o: SBA data frame */
		@@ -3209,8 +3209,8 @@ void ivas_sba_zero_vert_comp(
		const int16_t input_frame /* i : input frame length */
		);

		#ifdef FLOAT_INTERFACE
		/* TODO(sgi): tmp function, remove when FLOAT_INTERFACE is done */
		#ifdef FLOAT_INTERFACE_ENC
		/* TODO(sgi): tmp function, remove when FLOAT_INTERFACE_ENC is done */
		void ivas_sba_zero_vert_comp_old(
		float sba_data[][L_FRAME48k], /* i/o: SBA data frame */
		const int16_t sba_order, /* i : Ambisonic (SBA) order */
		@@ -3220,7 +3220,7 @@ void ivas_sba_zero_vert_comp_old(
		#endif

		void ivas_sba_getTCs(
		#ifdef FLOAT_INTERFACE
		#ifdef FLOAT_INTERFACE_ENC
		float* sba_data[], /* i : SBA signals */
		#else
		float sba_data[][L_FRAME48k], /* i : SBA signals */
		@@ -3239,7 +3239,7 @@ ivas_error ivas_sba_linear_renderer(
		);

		int16_t ivas_sba_remapTCs(
		#ifdef FLOAT_INTERFACE
		#ifdef FLOAT_INTERFACE_ENC
		float* sba_data[], /* i/o: SBA signals */
		#else
		float sba_data[][L_FRAME48k], /* i/o: SBA signals */
		@@ -3248,8 +3248,8 @@ int16_t ivas_sba_remapTCs(
		const int16_t output_frame /* i : frame length */
		);

		#ifdef FLOAT_INTERFACE
		/* TODO(sgi): tmp function, remove when FLOAT_INTERFACE is done */
		#ifdef FLOAT_INTERFACE_ENC
		/* TODO(sgi): tmp function, remove when FLOAT_INTERFACE_ENC is done */
		int16_t ivas_sba_remapTCs_old(
		float sba_data[][L_FRAME48k], /* i/o: SBA signals */
		Decoder_Struct st_ivas, / i/o: decoder struct */
		@@ -3308,7 +3308,7 @@ void ivas_dirac_enc(
		BSTR_ENC_HANDLE hMetaData, /* i/o: Metadata bitstream handle */
		int16_t nb_bits_metadata, / o : number of metadata bits written */
		const int16_t Opt_DTX_ON, /* i : flag signaling DTX on */
		#ifdef FLOAT_INTERFACE
		#ifdef FLOAT_INTERFACE_ENC
		float* data_f[], /* i/o: SBA channels */
		#else
		float data_f[][L_FRAME48k], /* i/o: SBA channels */
		@@ -3652,7 +3652,7 @@ void ivas_param_mc_enc_close(
		void ivas_param_mc_enc(
		Encoder_Struct st_ivas, / i/o: IVAS Encoder handle */
		BSTR_ENC_HANDLE hMetaData, /* i/o: IVAS Metadata bitstream handle */
		#ifdef FLOAT_INTERFACE
		#ifdef FLOAT_INTERFACE_ENC
		float* data_f[], /* i/o: input: CICP6, CICP12, CICP14, CICP16 or CICP19 MC data */
		#else
		float data_f[][L_FRAME48k], /* i/o: input: CICP6, CICP12, CICP14, CICP16 or CICP19 MC data */
		@@ -3889,7 +3889,7 @@ void ivas_spar_enc_close(

		ivas_error ivas_spar_enc(
		Encoder_Struct st_ivas, / i/o: IVAS encoder structure */
		#ifdef FLOAT_INTERFACE
		#ifdef FLOAT_INTERFACE_ENC
		float* data_f[], /* i/o: input/transport audio channels */
		#else
		float data_f[][L_FRAME48k], /* i/o: input/transport audio channels */
		@@ -4565,7 +4565,7 @@ void ivas_masa_encode(

		void ivas_masa_estimate_energy(
		MASA_ENCODER_HANDLE hMasa, /* i/o: MASA encoder structure */
		#ifdef FLOAT_INTERFACE
		#ifdef FLOAT_INTERFACE_ENC
		float* data_f[], /* i : Input audio channels */
		#else
		float data_f[][L_FRAME48k], /* i : Input audio channels */
		@@ -4999,7 +4999,7 @@ void ivas_mcmasa_enc(
		MCMASA_ENC_HANDLE hMcMasa, /* i/o: Encoder McMASA handle */
		IVAS_QMETADATA_HANDLE hQMeta, /* o : Qmetadata handle */
		MASA_ENCODER_HANDLE hMasa, /* i/o: Encoder MASA handle */
		#ifdef FLOAT_INTERFACE
		#ifdef FLOAT_INTERFACE_ENC
		float* data_f[], /* i : Input frame of audio */
		#else
		float data_f[][L_FRAME48k], /* i : Input frame of audio */
		@@ -5012,7 +5012,7 @@ void ivas_mcmasa_enc(
		void ivas_mcmasa_param_est_enc(
		MCMASA_ENC_HANDLE hMcMasa, /* i/o: Encoder McMASA handle */
		MASA_ENCODER_HANDLE hMasa, /* i/o: Encoder MASA handle */
		#ifdef FLOAT_INTERFACE
		#ifdef FLOAT_INTERFACE_ENC
		float* data_f[], /* i : Input frame of audio */
		#else
		float data_f[][L_FRAME48k], /* i : Input frame of audio */
		@@ -5401,7 +5401,7 @@ void ivas_FB_mixer_close(

		void ivas_fb_mixer_pcm_ingest(
		IVAS_FB_MIXER_HANDLE hFbMixer, /* i/o: FB mixer handle */
		#ifdef FLOAT_INTERFACE
		#ifdef FLOAT_INTERFACE_ENC
		float* pcm_in[], /* i : input audio channels */
		#else
		float pcm_in[][L_FRAME48k], /* i : input audio channels */
		@@ -5413,7 +5413,7 @@ void ivas_fb_mixer_pcm_ingest(
		void ivas_dirac_enc_spar_delay_synchro(
		Encoder_Struct st_ivas, / i/o: IVAS encoder structure */
		const int16_t input_frame, /* i : input frame length */
		#ifdef FLOAT_INTERFACE
		#ifdef FLOAT_INTERFACE_ENC
		float* data_f[] /* i/o: SBA channels (ACN / SN3D) */
		#else
		float data_f[][L_FRAME48k] /* i/o: SBA channels (ACN / SN3D) */
		@@ -5809,7 +5809,7 @@ ivas_error ivas_orient_trk_GetTrackedOrientation(
		float *roll
		);

		#ifdef FLOAT_INTERFACE
		#ifdef FLOAT_INTERFACE_ENC
		/----------------------------------------------------------------------------------
		* Audio buffer handling
		----------------------------------------------------------------------------------/

lib_com/ivas_sba_config.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -321,7 +321,7 @@ int16_t ivas_sba_get_spar_hoa_md_flag(
		-------------------------------------------------------------------/

		void ivas_sba_zero_vert_comp(
		#ifdef FLOAT_INTERFACE
		#ifdef FLOAT_INTERFACE_ENC
		float* sba_data[], /* i : SBA signals */
		#else
		float sba_data[][L_FRAME48k], /* i : SBA signals */
		@@ -351,7 +351,7 @@ void ivas_sba_zero_vert_comp(
		return;
		}

		#ifdef FLOAT_INTERFACE
		#ifdef FLOAT_INTERFACE_ENC
		void ivas_sba_zero_vert_comp_old(
		float sba_data[][L_FRAME48k], /* i : SBA signals */
		const int16_t sba_order, /* i : SBA order */

lib_com/ivas_tools.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1219,7 +1219,7 @@ float rand_triangular_signed(
		}
		}

		#ifdef FLOAT_INTERFACE
		#ifdef FLOAT_INTERFACE_ENC

		void save_channel_pointers(
		float* linearBuffer,