address reviewer comments (b5fac54f) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_isar/isar_lcld_decoder.c

+14 −14

Original line number	Diff line number	Diff line
		@@ -769,19 +769,19 @@ static void InvQuantizeSpectrum( const int32_t iNumGroups, const int32_t *piGrou

		static void InvMSCoding( const int32_t iNumBlocks, const int32_t iNumBands, const int32_t piBandwidths, const int32_t iMSMode, const int32_t piMSFlags, const int32_t piLRPhaseDiffs, const int32_t piMSPredCoefs, float *pppfReal, float *pppfImag );

		static int32_t ReadHeaderInformation( int32_t *piNumBands, const ISAR_SPLIT_REND_BITS_HANDLE pBits );
		static int32_t ReadHeaderInformation( int32_t *piNumBands, ISAR_SPLIT_REND_BITS_HANDLE pBits );

		static int32_t ReadMSInformation( const int32_t iNumBands, int32_t piMSMode, int32_t piMSFlags, int32_t piLRPhaseDiffs, int32_t piMSPredCoefs, const ISAR_SPLIT_REND_BITS_HANDLE pBits );
		static int32_t ReadMSInformation( const int32_t iNumBands, int32_t piMSMode, int32_t piMSFlags, int32_t piLRPhaseDiffs, int32_t piMSPredCoefs, ISAR_SPLIT_REND_BITS_HANDLE pBits );

		static int32_t ReadGroupInformation( const int32_t iChannels, const int32_t iNumBlocks, int32_t piCommonGrouping, int32_t piNumGroups, int32_t **ppiGroupLengths, const ISAR_SPLIT_REND_BITS_HANDLE pBits );
		static int32_t ReadGroupInformation( const int32_t iChannels, const int32_t iNumBlocks, int32_t piCommonGrouping, int32_t piNumGroups, int32_t **ppiGroupLengths, ISAR_SPLIT_REND_BITS_HANDLE pBits );

		static int32_t ReadHuff( const uint32_t ( pauiHuffDecTable )[HUFF_DEC_TABLE_SIZE], int32_t piSymbol, const ISAR_SPLIT_REND_BITS_HANDLE pBits );
		static int32_t ReadHuff( const uint32_t ( pauiHuffDecTable )[HUFF_DEC_TABLE_SIZE], int32_t piSymbol, ISAR_SPLIT_REND_BITS_HANDLE pBits );

		static int32_t ReadRMSEnvelope( const int32_t iChannels, const int32_t piNumGroups, const int32_t iNumBands, int32_t **pppiRMSEnvelope, const ISAR_SPLIT_REND_BITS_HANDLE pBits );
		static int32_t ReadRMSEnvelope( const int32_t iChannels, const int32_t piNumGroups, const int32_t iNumBands, int32_t **pppiRMSEnvelope, ISAR_SPLIT_REND_BITS_HANDLE pBits );

		static int32_t ReadAllocInformation( int32_t *piAllocOffset, const ISAR_SPLIT_REND_BITS_HANDLE pBits );

		static int32_t ReadLCLDData( const int32_t piNumGroups, int32_t ppiGroupLengths, const int32_t iNumBands, const int32_t iNumChannels, int32_t ppiDecodingUnresolved, int32_t ppiPredEnable, const int32_t iNumSubSets, const int32_t iSubSetId, int32_t pppiAlloc, int32_t pppiSignReal, int32_t pppiSignImag, int32_t pppiQReal, int32_t pppiQImag, int32_t ppiDecodingFailed, const ISAR_SPLIT_REND_BITS_HANDLE pBits, uint32_t ( c_apauiHuffDecTables[2 ALLOC_TABLE_SIZE] )[HUFF_DEC_TABLE_SIZE] );
		static int32_t ReadLCLDData( const int32_t piNumGroups, int32_t ppiGroupLengths, const int32_t iNumBands, const int32_t iNumChannels, int32_t ppiDecodingUnresolved, int32_t ppiPredEnable, const int32_t iNumSubSets, const int32_t iSubSetId, int32_t pppiAlloc, int32_t pppiSignReal, int32_t pppiSignImag, int32_t pppiQReal, int32_t pppiQImag, int32_t ppiDecodingFailed, ISAR_SPLIT_REND_BITS_HANDLE pBits, uint32_t ( c_apauiHuffDecTables[2 ALLOC_TABLE_SIZE] )[HUFF_DEC_TABLE_SIZE] );

		static void ComputeAllocation( const int32_t iChannels, const int32_t piNumGroups, const int32_t iNumBands, int32_t pppiSMR, const int32_t iAllocOffset, int32_t *pppiAlloc );

		@@ -943,7 +943,7 @@ static void UnpackReal(

		int32_t DecodeLCLDFrame(
		LCLDDecoder *psLCLDDecoder,
		const ISAR_SPLIT_REND_BITS_HANDLE pBits, /* i : ISAR bits handle */
		ISAR_SPLIT_REND_BITS_HANDLE pBits, /* i/o: ISAR bits handle */
		float ***pppfLCLDReal,
		float ***pppfLCLDImag )
		{
		@@ -1305,7 +1305,7 @@ static void InvMSCoding(
		/* Currently only the number of bands in frame */
		static int32_t ReadHeaderInformation(
		int32_t *piNumBands,
		const ISAR_SPLIT_REND_BITS_HANDLE pBits )
		ISAR_SPLIT_REND_BITS_HANDLE pBits )
		{
		int32_t iBitsRead;

		@@ -1323,7 +1323,7 @@ static int32_t ReadMSInformation(
		int32_t *piMSFlags,
		int32_t *piLRPhaseDiffs,
		int32_t *piMSPredCoefs,
		const ISAR_SPLIT_REND_BITS_HANDLE pBits )
		ISAR_SPLIT_REND_BITS_HANDLE pBits )
		{
		int32_t iBitsRead;

		@@ -1450,7 +1450,7 @@ static int32_t ReadGroupInformation(
		int32_t *piCommonGrouping,
		int32_t *piNumGroups,
		int32_t **ppiGroupLengths,
		const ISAR_SPLIT_REND_BITS_HANDLE pBits )
		ISAR_SPLIT_REND_BITS_HANDLE pBits )
		{
		int32_t c, k, iBitsRead;

		@@ -1561,7 +1561,7 @@ static int32_t BSForceBack(
		static int32_t ReadHuff(
		const uint32_t ( *pauiHuffDecTable )[HUFF_DEC_TABLE_SIZE],
		int32_t *piSymbol,
		const ISAR_SPLIT_REND_BITS_HANDLE pBits )
		ISAR_SPLIT_REND_BITS_HANDLE pBits )
		{
		int32_t iBitsRead;
		int32_t iSymbol;
		@@ -1600,7 +1600,7 @@ static int32_t ReadRMSEnvelope(
		const int32_t *piNumGroups,
		const int32_t iNumBands,
		int32_t ***pppiRMSEnvelope,
		const ISAR_SPLIT_REND_BITS_HANDLE pBits )
		ISAR_SPLIT_REND_BITS_HANDLE pBits )
		{
		int32_t b, k, n;
		int32_t iBitsRead, iLastRMSVal;
		@@ -1634,7 +1634,7 @@ static int32_t ReadRMSEnvelope(

		static int32_t ReadAllocInformation(
		int32_t *piAllocOffset,
		const ISAR_SPLIT_REND_BITS_HANDLE pBits )
		ISAR_SPLIT_REND_BITS_HANDLE pBits )
		{
		int32_t iBitsRead;

		@@ -1662,7 +1662,7 @@ static int32_t ReadLCLDData(
		int32_t ***pppiQReal,
		int32_t ***pppiQImag,
		int32_t **ppiDecodingFailed,
		const ISAR_SPLIT_REND_BITS_HANDLE pBits,
		ISAR_SPLIT_REND_BITS_HANDLE pBits,
		uint32_t ( c_apauiHuffDecTables[2 ALLOC_TABLE_SIZE] )[HUFF_DEC_TABLE_SIZE] )
		{
		int32_t iBitsRead;

lib_isar/isar_lcld_prot.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -81,7 +81,7 @@ void DeleteLCLDDecoder(

		int32_t DecodeLCLDFrame(
		LCLDDecoder *psLCLDDecoder,
		const ISAR_SPLIT_REND_BITS_HANDLE pBits,
		ISAR_SPLIT_REND_BITS_HANDLE pBits,
		float ***pppfLCLDReal,
		float ***pppfLCLDImag
		);

lib_isar/isar_prot.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -246,7 +246,7 @@ void isar_split_rend_get_quant_params(
		);

		void isar_splitBinPostRendMdDec(
		const ISAR_SPLIT_REND_BITS_HANDLE pBits, /* i : ISAR bits handle */
		ISAR_SPLIT_REND_BITS_HANDLE pBits, /* i/o: ISAR bits handle */
		ISAR_BIN_HR_SPLIT_POST_REND_HANDLE hBinHrSplitPostRend, /* i/o: binaural post-renderer handle */
		MULTI_BIN_REND_POSE_DATA pMultiBinPoseData / i/o: pose correction data handle */
		#ifdef SPLIT_REND_WITH_HEAD_ROT_DEBUG
		@@ -287,7 +287,7 @@ void isar_rend_CldfbSplitPreRendProcess(
		MULTI_BIN_REND_POSE_DATA pMultiBinPoseData, / i/o: pose correction data handle */
		float Cldfb_In_BinReal[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i : Binaural signals, real part */
		float Cldfb_In_BinImag[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i : Binaural signals, imag. part */
		const ISAR_SPLIT_REND_BITS_HANDLE pBits, /* i : ISAR bits handle */
		ISAR_SPLIT_REND_BITS_HANDLE pBits, /* i/o: ISAR bits handle */
		const int32_t target_md_bits, /* i : ISAR MD bitrate */
		const int16_t low_res_pre_rend_rot, /* i : low time resolution pre-renderer flag */
		const int16_t ro_md_flag /* i : real only metadata for yaw flag */

lib_isar/isar_splitRendererPost.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -181,7 +181,7 @@ void isar_splitBinPostRendClose(

		static int16_t isar_split_rend_huffman_decode_opt(
		isar_split_rend_huffman_cfg_t *huff_cfg,
		const ISAR_SPLIT_REND_BITS_HANDLE pBits, /* i : ISAR bits handle */
		ISAR_SPLIT_REND_BITS_HANDLE pBits, /* i/o: ISAR bits handle */
		const int16_t *idx_trav_list )
		{
		int32_t i, ind, code, num_bits, code_b, num_bits_read;
		@@ -523,7 +523,7 @@ static void isar_splitBinPostRendMdBase2Dec(
		-----------------------------------------------------------------------------------------/

		static void isar_splitBinPostRendMdHuffDec(
		const ISAR_SPLIT_REND_BITS_HANDLE pBits, /* i : ISAR bits handle */
		ISAR_SPLIT_REND_BITS_HANDLE pBits, /* i/o: ISAR bits handle */
		ISAR_BIN_HR_SPLIT_POST_REND_HANDLE hBinHrSplitPostRend, /* i/o: binaural post-renderer handle */
		MULTI_BIN_REND_POSE_DATA pMultiBinPoseData, / i/o: pose correction data handle */
		const int16_t num_subframes,
		@@ -718,7 +718,7 @@ static void isar_splitBinPostRendMdHuffDec(
		-----------------------------------------------------------------------------------------/

		void isar_splitBinPostRendMdDec(
		const ISAR_SPLIT_REND_BITS_HANDLE pBits, /* i : ISAR bits handle */
		ISAR_SPLIT_REND_BITS_HANDLE pBits, /* i/o: ISAR bits handle */
		ISAR_BIN_HR_SPLIT_POST_REND_HANDLE hBinHrSplitPostRend, /* i/o: binaural post-renderer handle */
		MULTI_BIN_REND_POSE_DATA pMultiBinPoseData / i/o: pose correction data handle */
		#ifdef SPLIT_REND_WITH_HEAD_ROT_DEBUG

lib_isar/isar_splitRendererPre.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -850,7 +850,7 @@ static void isar_SplitRenderer_code_md_base2(
		const int16_t bands_pitch,
		const int16_t pred_real_bands_roll,
		const int16_t pred_imag_bands_roll,
		const ISAR_SPLIT_REND_BITS_HANDLE pBits /* i/o: ISAR bits handle */
		ISAR_SPLIT_REND_BITS_HANDLE pBits /* i/o: ISAR bits handle */
		)
		{
		int16_t pos_idx, b, ch1, ch2, sf_idx;
		@@ -1065,7 +1065,7 @@ static void isar_SplitRenderer_code_md_huff(
		const int16_t bands_pitch,
		const int16_t pred_real_bands_roll,
		const int16_t pred_imag_bands_roll,
		const ISAR_SPLIT_REND_BITS_HANDLE pBits /* i/o: ISAR bits handle */
		ISAR_SPLIT_REND_BITS_HANDLE pBits /* i/o: ISAR bits handle */
		)
		{
		int16_t pos_idx, b, ch1, ch2, sf_idx, num_poses;
		@@ -1279,7 +1279,7 @@ static void isar_SplitRenderer_quant_code(
		const ISAR_BIN_HR_SPLIT_PRE_REND_HANDLE hBinHrSplitPreRend, /* i : binaural pre-renderer handle */
		const IVAS_QUATERNION headPosition, /* i : head rotation QUATERNION */
		MULTI_BIN_REND_POSE_DATA pMultiBinPoseData, / i/o: pose correction data handle */
		const ISAR_SPLIT_REND_BITS_HANDLE pBits, /* i/o: ISAR bits handle */
		ISAR_SPLIT_REND_BITS_HANDLE pBits, /* i/o: ISAR bits handle */
		const int16_t low_res_pre_rend_rot, /* i : low time resolution pre-renderer flag */
		#ifdef SPLIT_REND_POSE_CORRECTION_UNUSED_BITS
		const int16_t ro_md_flag, /* i : real only metadata for yaw flag */
		@@ -1639,7 +1639,7 @@ void isar_rend_CldfbSplitPreRendProcess(
		MULTI_BIN_REND_POSE_DATA pMultiBinPoseData, / i/o: pose correction data handle */
		float Cldfb_In_BinReal[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i : Binaural signals, real part */
		float Cldfb_In_BinImag[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i : Binaural signals, imag. part */
		const ISAR_SPLIT_REND_BITS_HANDLE pBits, /* i : ISAR bits handle */
		ISAR_SPLIT_REND_BITS_HANDLE pBits, /* i/o: ISAR bits handle */
		const int32_t target_md_bits, /* i : ISAR MD bitrate */
		const int16_t low_res_pre_rend_rot, /* i : low time resolution pre-renderer flag */
		const int16_t ro_md_flag /* i : real only metadata for yaw flag */