harmonize comments: use consistently "signaling" instead of "signaling/signalling" (4ca335c9) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/bits_alloc.c

+14 −14

Original line number	Diff line number	Diff line
		@@ -525,7 +525,7 @@ ivas_error config_acelp1(
		const int16_t L_frame, /* i : frame length at internal Fs */
		const int16_t GSC_noisy_speech, /* i : GSC on SWB noisy speech flag */
		ACELP_config acelp_cfg, / i : ACELP bit-allocation */
		const int16_t signalling_bits, /* i : number of signalling bits */
		const int16_t signaling_bits, /* i : number of signaling bits */
		const int16_t coder_type, /* i : coder type */
		const int16_t tc_subfr, /* i : TC subfr ID */
		const int16_t tc_call, /* i : TC call number (0,1,2,3,5(DEC)) */
		@@ -663,7 +663,7 @@ ivas_error config_acelp1(
		bits += nBits_es_Pred; / equalize for 4th signaling bit estimated at the encoder in TC_0_192 */
		}

		/* Subtract signalling bits */
		/* Subtract signaling bits */
		if ( enc_dec == DEC && idchan == 1 && element_mode > EVS_MONO )
		{
		bits -= TDM_SIGNAL_BITS_READ_FROM_THE_END_OF_BS;
		@@ -681,13 +681,13 @@ ivas_error config_acelp1(
		}
		else
		{
		/* Subtract signalling bits */
		bits -= signalling_bits;
		/* Subtract signaling bits */
		bits -= signaling_bits;
		}

		if ( extl_brate > 0 && ( extl == WB_TBE \|\| extl == SWB_TBE \|\| extl == FB_TBE \|\| extl == WB_BWE \|\| extl == SWB_BWE \|\| extl == FB_BWE ) )
		{
		/* extension layer signalling bit is counted in the extension layer bitbudget */
		/* extension layer signaling bit is counted in the extension layer bitbudget */
		bits++;
		}

		@@ -896,14 +896,14 @@ ivas_error config_acelp1(
		fix_first = 1;
		}

		/* TC signalling */
		/* TC signaling */
		if ( L_frame == L_FRAME )
		{
		if ( tc_subfr == TC_0_0 )
		{
		if ( enc_dec == ENC )
		{
		bits -= 1; /* TC signalling */
		bits -= 1; /* TC signaling */
		}

		if ( acelp_cfg->ltf_mode == NORMAL_OPERATION )
		@@ -915,7 +915,7 @@ ivas_error config_acelp1(
		{
		if ( enc_dec == ENC )
		{
		bits -= 4; /* TC signalling */
		bits -= 4; /* TC signaling */
		}

		if ( acelp_cfg->ltf_mode == NORMAL_OPERATION )
		@@ -927,7 +927,7 @@ ivas_error config_acelp1(
		{
		if ( enc_dec == ENC )
		{
		bits -= 4; /* TC signalling */
		bits -= 4; /* TC signaling */
		}

		if ( acelp_cfg->ltf_mode == NORMAL_OPERATION )
		@@ -939,7 +939,7 @@ ivas_error config_acelp1(
		{
		if ( enc_dec == ENC )
		{
		bits -= 3; /* TC signalling */
		bits -= 3; /* TC signaling */
		}

		if ( acelp_cfg->ltf_mode == NORMAL_OPERATION )
		@@ -951,7 +951,7 @@ ivas_error config_acelp1(
		{
		if ( enc_dec == ENC )
		{
		bits -= 3; /* TC signalling */
		bits -= 3; /* TC signaling */
		}

		if ( acelp_cfg->ltf_mode == NORMAL_OPERATION )
		@@ -963,7 +963,7 @@ ivas_error config_acelp1(
		{
		if ( enc_dec == ENC )
		{
		bits -= 4; /* TC signalling */
		bits -= 4; /* TC signaling */
		}

		if ( acelp_cfg->ltf_mode == NORMAL_OPERATION )
		@@ -978,11 +978,11 @@ ivas_error config_acelp1(
		{
		if ( tc_subfr <= 2 * L_SUBFR )
		{
		bits -= 2; /* TC signalling */
		bits -= 2; /* TC signaling */
		}
		else
		{
		bits -= 3; /* TC signalling */
		bits -= 3; /* TC signaling */
		}
		}

lib_com/bitstream.c

+15 −15

Original line number	Diff line number	Diff line
		@@ -1244,7 +1244,7 @@ static void dec_prm_core(
		/-----------------------------------------------------------------
		* decision_matrix_core_dec()
		*
		* Read core signalling bits from the bitstream
		* Read core signaling bits from the bitstream
		* Set st->core, and st->bwidth if signalled together with the core.
		-----------------------------------------------------------------/

		@@ -1291,12 +1291,12 @@ static void decision_matrix_core_dec(
		}

		/-----------------------------------------------------------------
		* Read ACELP signalling bits from the bitstream
		* Read ACELP signaling bits from the bitstream
		-----------------------------------------------------------------/

		if ( st->core == ACELP_CORE )
		{
		/* find the section in the ACELP signalling table corresponding to bitrate */
		/* find the section in the ACELP signaling table corresponding to bitrate */
		start_idx = 0;
		while ( acelp_sig_tbl[start_idx] != st->total_brate )
		{
		@@ -1312,11 +1312,11 @@ static void decision_matrix_core_dec(
		/* retrieve the number of bits */
		nBits = (int16_t) acelp_sig_tbl[start_idx++];

		/* retrieve the signalling indice */
		/* retrieve the signaling indice */
		ind = acelp_sig_tbl[start_idx + get_next_indice( st, nBits )];
		st->bwidth = ( ind >> 3 ) & 0x7;

		/* convert signalling indice into signalling information */
		/* convert signaling indice into signaling information */
		if ( ( ind & 0x7 ) == LR_MDCT )
		{
		st->core = HQ_CORE;
		@@ -1324,7 +1324,7 @@ static void decision_matrix_core_dec(
		}

		/-----------------------------------------------------------------
		* Read HQ signalling bits from the bitstream
		* Read HQ signaling bits from the bitstream
		* Set HQ core type
		-----------------------------------------------------------------/

		@@ -1849,7 +1849,7 @@ ivas_error preview_indices(
		break;
		case SID_ISM:
		st_ivas->ivas_format = ISM_FORMAT;
		/* temporary hack to make mode signalling work with the current 1-object ISM DTX: read padding bits */
		/* temporary hack to make mode signaling work with the current 1-object ISM DTX: read padding bits */
		/* Todo: how to apply this here? maybe pt_stream += ... would work? */
		/* st->bit_stream += ( IVAS_SID_4k4 - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS; */
		break;
		@@ -2504,7 +2504,7 @@ static void get_rfFlag(
		/* check for rf_flag in the packet and extract the rf_frame_type and rf_fec_offset */
		if ( st->total_brate == ACELP_13k20 && ( st->bfi == FRAMEMODE_NORMAL \|\| st->bfi == FRAMEMODE_FUTURE ) )
		{
		/* find the section in the ACELP signalling table corresponding to bitrate */
		/* find the section in the ACELP signaling table corresponding to bitrate */
		start_idx = 0;
		while ( acelp_sig_tbl[start_idx] != st->total_brate )
		{
		@@ -2518,10 +2518,10 @@ static void get_rfFlag(
		/* retrieve the number of bits */
		nBits_tmp = (int16_t) acelp_sig_tbl[start_idx++];

		/* retrieve the signalling indice */
		/* retrieve the signaling indice */
		ind_tmp = acelp_sig_tbl[start_idx + get_indice( st, 0, nBits_tmp )];

		/* convert signalling indice into RF flag. */
		/* convert signaling indice into RF flag. */
		*rf_flag = ( ind_tmp >> 7 ) & 0x1;

		if ( ind )
		@@ -2624,7 +2624,7 @@ static void get_rfTargetBits(
		/-------------------------------------------------------------------
		* berCheck()
		*
		* Check for bit errors in channel aware signalling.
		* Check for bit errors in channel aware signaling.
		-------------------------------------------------------------------/

		static void berCheck(
		@@ -2747,7 +2747,7 @@ void get_NextCoderType(
		tmp += bit_stream[k];
		}

		/* retrieve the signalling indice */
		/* retrieve the signaling indice */
		*next_coder_type = acelp_sig_tbl[start_idx + tmp] & 0x7;

		return;
		@@ -2923,7 +2923,7 @@ void evs_dec_previewFrame(

		if ( total_brate == ACELP_13k20 )
		{
		/* find the section in the ACELP signalling table corresponding to bitrate */
		/* find the section in the ACELP signaling table corresponding to bitrate */
		start_idx = 0;
		while ( acelp_sig_tbl[start_idx] != total_brate )
		{
		@@ -2936,10 +2936,10 @@ void evs_dec_previewFrame(
		/* retrieve the number of bits */
		nBits = (int16_t) acelp_sig_tbl[start_idx++];

		/* retrieve the signalling indice */
		/* retrieve the signaling indice */
		ind = acelp_sig_tbl[start_idx + get_indice_preview( bitstream, bitstreamSize, 0, nBits )];

		/* convert signalling indice into RF flag. */
		/* convert signaling indice into RF flag. */
		rf_flag = ( ind >> 7 ) & 0x1;
		if ( rf_flag != 0 )
		{

lib_com/ivas_cnst.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -235,7 +235,7 @@ typedef enum
		#define NBITS_ELEMENT_MODE 1 /* number of bits to encode the stereo element mode */
		#define NBITS_BWIDTH 2 /* number of bits to encode all audio bandwidths */

		/* format signalling in SID frames */
		/* format signaling in SID frames */
		#define SID_FORMAT_NBITS 3 /* Bit 0 \| Bit 1 \| Bit 2 */
		/-------\|-------\|------ /
		#define SID_DFT_STEREO 0x0 /* 0\| 0\| 0 */
		@@ -755,7 +755,7 @@ enum fea_names

		#define TDM_L_NOVA_NS 5000000L /* mixing overlap length */

		#define TDM_SECONDARY_SIGNALLING 3 /* number of bits to code the signalling for secondary channel */
		#define TDM_SECONDARY_SIGNALLING 3 /* number of bits to code the signaling for secondary channel */
		#define TDM_RATIO_BITS 5 /* number of bits to code the correlation ratio */
		#define TDM_LP_REUSE_BITS 1 /* number of bits to code LP reuse flag for secondary channel */
		#define TDM_LR_CONTENT_BITS 1 /* number of bits to code flag when the content is LR or not */

lib_com/ivas_ism_config.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -128,7 +128,7 @@ ivas_error ivas_ism_config(
		bits_element[n_ISms - 1] += bits_ism % n_ISms;
		bitbudget_to_brate( bits_element, element_brate, n_ISms );

		/* count ISm common signalling bits */
		/* count ISm common signaling bits */
		if ( hIsmMeta != NULL )
		{
		nb_bits_metadata[0] += n_ISms * ISM_METADATA_FLAG_BITS + num_obj;

lib_com/ivas_prot.h

+5 −5

Original line number	Diff line number	Diff line
		@@ -161,7 +161,7 @@ ivas_error pre_proc_front_ivas(
		float lsp_new[M], /* o : LSPs at the end of the frame */
		float lsp_mid[M], /* o : LSPs in the middle of the frame */
		int16_t vad_hover_flag, / o : VAD hangover flag */
		int16_t attack_flag, / o : flag signalling attack */
		int16_t attack_flag, / o : flag signaling attack */
		float realBuffer[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i/o: real buffer */
		float imagBuffer[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i/o: imag buffer */
		float old_wsp[], /* o : weighted input signal buffer */
		@@ -521,7 +521,7 @@ void ivas_decision_matrix_enc(
		const int16_t last_element_mode /* i : last element mode */
		);

		void ivas_signalling_enc(
		void ivas_signaling_enc(
		Encoder_State st, / i/o: encoder state structure */
		const int16_t is_MCT, /* i : MCT enabled */
		const int32_t element_brate, /* i : element bitrate */
		@@ -1666,7 +1666,7 @@ void tdm_configure_enc(
		const int16_t nb_bits_metadata /* i : number of metadata bits */
		);

		ivas_error signalling_enc_secondary(
		ivas_error signaling_enc_secondary(
		Encoder_State st, / i/o: Encoder structure */
		const int16_t tdm_SM_flag, /* i : channel combination scheme flag */
		const int16_t tdm_Pitch_reuse_flag /* i : primary channel pitch reuse flag */
		@@ -2900,7 +2900,7 @@ int16_t quantize_phi_chan_compand(
		float phi, /* i : azimuth value */
		float phi_hat, / o : quantized azimuth */
		const int16_t n, /* i : azimuth codebook size */
		const int16_t theta_flag, /* i : flag signalling high elevation */
		const int16_t theta_flag, /* i : flag signaling high elevation */
		const MC_LS_SETUP mc_format /* i : channel format if in MC-mode */
		);

		@@ -3118,7 +3118,7 @@ void ivas_dirac_enc(
		IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: q_metadata handle */
		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 signalling DTX on */
		const int16_t Opt_DTX_ON, /* i : flag signaling DTX on */
		float data_f[][L_FRAME48k], /* i/o: input: ACN/SN3D, output: omni, stereo DMX or FOA */
		const int16_t input_frame, /* i : input frame length */
		const int16_t sba_planar /* i : SBA planar flag */