Minor changes (c82422c1) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_rend/ivas_splitRendererPost.c

+6 −15

Original line number	Diff line number	Diff line
		@@ -803,8 +803,7 @@ void ivas_splitBinPostRendMdDec(
		for ( ; b < pred_real_bands_yaw[quant_strat]; b++ )
		{
		hMd = &hBinHrSplitPostRend->rot_md[pos_idx][sf_idx][b];
		ivas_split_rend_unquant_md( hMd, PRED_ONLY, 1, hBinHrSplitPostRend->fix_pos_rot_mat[pos_idx],
		pred_quantstep_yaw[quant_strat] );
		ivas_split_rend_unquant_md( hMd, PRED_ONLY, 1, hBinHrSplitPostRend->fix_pos_rot_mat[pos_idx], pred_quantstep_yaw[quant_strat] );
		}
		for ( ; b < MAX_SPLIT_REND_MD_BANDS; b++ )
		{
		@@ -819,8 +818,7 @@ void ivas_splitBinPostRendMdDec(
		for ( b = 0; b < d_bands_yaw[quant_strat]; b++ )
		{
		hMd = &hBinHrSplitPostRend->rot_md[pos_idx][sf_idx][b];
		ivas_split_rend_unquant_md( hMd, COM_GAIN_ONLY, 1, hBinHrSplitPostRend->fix_pos_rot_mat[pos_idx],
		0 );
		ivas_split_rend_unquant_md( hMd, COM_GAIN_ONLY, 1, hBinHrSplitPostRend->fix_pos_rot_mat[pos_idx], 0 );
		}
		for ( ; b < MAX_SPLIT_REND_MD_BANDS; b++ )
		{
		@@ -833,8 +831,7 @@ void ivas_splitBinPostRendMdDec(
		for ( b = 0; b < bands_pitch[quant_strat]; b++ )
		{
		hMd = &hBinHrSplitPostRend->rot_md[pos_idx][sf_idx][b];
		ivas_split_rend_unquant_md( hMd, LR_GAIN_ONLY, 1, hBinHrSplitPostRend->fix_pos_rot_mat[pos_idx],
		0 );
		ivas_split_rend_unquant_md( hMd, LR_GAIN_ONLY, 1, hBinHrSplitPostRend->fix_pos_rot_mat[pos_idx], 0 );
		}
		for ( ; b < MAX_SPLIT_REND_MD_BANDS; b++ )
		{
		@@ -848,18 +845,12 @@ void ivas_splitBinPostRendMdDec(
		for ( b = 0; b < pred_imag_bands_roll[quant_strat]; b++ )
		{
		hMd = &hBinHrSplitPostRend->rot_md[pos_idx][sf_idx][b];
		ivas_split_rend_unquant_md( hMd,
		PRED_ROLL_ONLY,
		0, hBinHrSplitPostRend->fix_pos_rot_mat[pos_idx],
		IVAS_SPLIT_REND_PRED_ROLL_Q_STEP );
		ivas_split_rend_unquant_md( hMd, PRED_ROLL_ONLY, 0, hBinHrSplitPostRend->fix_pos_rot_mat[pos_idx], IVAS_SPLIT_REND_PRED_ROLL_Q_STEP );
		}
		for ( ; b < pred_real_bands_roll[quant_strat]; b++ )
		{
		hMd = &hBinHrSplitPostRend->rot_md[pos_idx][sf_idx][b];
		ivas_split_rend_unquant_md( hMd,
		PRED_ROLL_ONLY,
		1, hBinHrSplitPostRend->fix_pos_rot_mat[pos_idx],
		IVAS_SPLIT_REND_PRED_ROLL_Q_STEP );
		ivas_split_rend_unquant_md( hMd, PRED_ROLL_ONLY, 1, hBinHrSplitPostRend->fix_pos_rot_mat[pos_idx], IVAS_SPLIT_REND_PRED_ROLL_Q_STEP );
		}
		for ( ; b < MAX_SPLIT_REND_MD_BANDS; b++ )
		{

lib_rend/ivas_splitRendererPre.c

+7 −17

Original line number	Diff line number	Diff line
		@@ -1155,23 +1155,20 @@ static void ivas_SplitRenderer_quant_code(
		{
		hMd = &hBinHrSplitPreRend->rot_md[pos_idx][sf_idx][b];

		ivas_split_rend_quant_md( hMd, PRED_ONLY, 0, hBinHrSplitPreRend->fix_pos_rot_mat[pos_idx],
		pred_1byquantstep_yaw[q] );
		ivas_split_rend_quant_md( hMd, PRED_ONLY, 0, hBinHrSplitPreRend->fix_pos_rot_mat[pos_idx], pred_1byquantstep_yaw[q] );
		}
		for ( ; b < pred_real_bands_yaw[q]; b++ )
		{
		hMd = &hBinHrSplitPreRend->rot_md[pos_idx][sf_idx][b];

		ivas_split_rend_quant_md( hMd, PRED_ONLY, 1, hBinHrSplitPreRend->fix_pos_rot_mat[pos_idx],
		pred_1byquantstep_yaw[q] );
		ivas_split_rend_quant_md( hMd, PRED_ONLY, 1, hBinHrSplitPreRend->fix_pos_rot_mat[pos_idx], pred_1byquantstep_yaw[q] );
		}

		for ( b = 0; b < d_bands_yaw[q]; b++ )
		{
		hMd = &hBinHrSplitPreRend->rot_md[pos_idx][sf_idx][b];

		ivas_split_rend_quant_md( hMd, COM_GAIN_ONLY, 1, hBinHrSplitPreRend->fix_pos_rot_mat[pos_idx],
		0 );
		ivas_split_rend_quant_md( hMd, COM_GAIN_ONLY, 1, hBinHrSplitPreRend->fix_pos_rot_mat[pos_idx], 0 );
		}
		}
		else if ( hBinHrSplitPreRend->pose_type[pos_idx] == PITCH_ONLY )
		@@ -1179,8 +1176,7 @@ static void ivas_SplitRenderer_quant_code(
		for ( b = 0; b < bands_pitch[q]; b++ )
		{
		hMd = &hBinHrSplitPreRend->rot_md[pos_idx][sf_idx][b];
		ivas_split_rend_quant_md( hMd, LR_GAIN_ONLY, 1, hBinHrSplitPreRend->fix_pos_rot_mat[pos_idx],
		0 );
		ivas_split_rend_quant_md( hMd, LR_GAIN_ONLY, 1, hBinHrSplitPreRend->fix_pos_rot_mat[pos_idx], 0 );
		}
		}
		else
		@@ -1188,18 +1184,12 @@ static void ivas_SplitRenderer_quant_code(
		for ( b = 0; b < pred_imag_bands_roll[q]; b++ )
		{
		hMd = &hBinHrSplitPreRend->rot_md[pos_idx][sf_idx][b];
		ivas_split_rend_quant_md( hMd,
		PRED_ROLL_ONLY,
		0, hBinHrSplitPreRend->fix_pos_rot_mat[pos_idx],
		IVAS_SPLIT_REND_PRED_ROLL_1BYQ_STEP );
		ivas_split_rend_quant_md( hMd, PRED_ROLL_ONLY, 0, hBinHrSplitPreRend->fix_pos_rot_mat[pos_idx], IVAS_SPLIT_REND_PRED_ROLL_1BYQ_STEP );
		}
		for ( ; b < pred_real_bands_roll[q]; b++ )
		{
		hMd = &hBinHrSplitPreRend->rot_md[pos_idx][sf_idx][b];
		ivas_split_rend_quant_md( hMd,
		PRED_ROLL_ONLY,
		1, hBinHrSplitPreRend->fix_pos_rot_mat[pos_idx],
		IVAS_SPLIT_REND_PRED_ROLL_1BYQ_STEP );
		ivas_split_rend_quant_md( hMd, PRED_ROLL_ONLY, 1, hBinHrSplitPreRend->fix_pos_rot_mat[pos_idx], IVAS_SPLIT_REND_PRED_ROLL_1BYQ_STEP );
		}
		}
		}

lib_rend/ivas_stat_rend.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -1437,9 +1437,7 @@ typedef struct
		#else
		HANDLE_CLDFB_FILTER_BANK cldfbAna[MAX_HEAD_ROT_POSES * BINAURAL_CHANNELS];
		#endif
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		HANDLE_CLDFB_FILTER_BANK cldfbSyn[BINAURAL_CHANNELS];
		#endif

		} CLDFB_HANDLES_WRAPPER, *CLDFB_HANDLES_WRAPPER_HANDLE;

lib_rend/lib_rend.c

+3 −29

Original line number	Diff line number	Diff line
		@@ -3238,11 +3238,7 @@ static DecoderDummy *initDecoderDummy(
		ivas_init_split_rend_handles( &decDummy->hSplitBinRend.splitrend );
		decDummy->hSplitBinRend.splitrend = *pSplitRendWrapper;

		#ifdef SPLIT_REND_WITH_HEAD_ROT
		if ( outConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| outConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
		#else
		if ( decDummy->splitBinRend.splitrend.multiBinPoseData.num_poses > 1 )
		#endif
		{
		if ( ( decDummy->hSplitBinRend.hMultiBinCldfbData = (IVAS_DEC_SPLIT_REND_MULTI_BIN_CLDFB_DATA_HANDLE) malloc( sizeof( IVAS_DEC_SPLIT_REND_MULTI_BIN_CLDFB_DATA ) ) ) == NULL )
		{
		@@ -5110,10 +5106,8 @@ int16_t IVAS_REND_FeedRenderConfig(
		}

		/* Must re-initialize split rendering config in case renderer config is updated after adding renderer inputs */
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		/* if its not initialized yet then no need to re-initialize, initialization will happen while adding inputs*/
		if ( hIvasRend->splitRendEncBuffer.data != NULL && hIvasRend->hRendererConfig != NULL )
		#endif
		{
		int16_t cldfb_in_flag;
		cldfb_in_flag = getCldfbRendFlag( hIvasRend, IVAS_REND_AUDIO_CONFIG_TYPE_UNKNOWN );
		@@ -7049,10 +7043,8 @@ static ivas_error renderMcToSplitBinaural(
		/* copy input to tdrend input/output buffer */
		copyBufferTo2dArray( mcInput->base.inputBuffer, tmpRendBuffer );

		#ifdef SPLIT_REND_WITH_HEAD_ROT
		/* perform rotation in source format to tmpRotBuffer */
		pCombinedOrientationDataLocal = &combinedOrientationDataLocal;
		#endif

		/* Render */
		if ( ( error = ivas_td_binaural_renderer_ext( ( pos_idx == 0 ) ? &mcInput->tdRendWrapper : &mcInput->splitTdRendWrappers[pos_idx - 1], mcInput->base.inConfig, &mcInput->customLsInput, &pCombinedOrientationDataLocal,
		@@ -7081,13 +7073,7 @@ static ivas_error renderMcToSplitBinaural(

		/* perform rotation in source format to tmpRotBuffer */
		pCombinedOrientationDataLocal = &combinedOrientationDataLocal;
		if ( ( error = rotateFrameMc( mcInput->base.inputBuffer, mcInput->base.inConfig, &mcInput->customLsInput, mcInput->base.ctx.pHeadRotData, &pCombinedOrientationDataLocal,
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		mcInput->rot_gains_prev[pos_idx],
		#else
		mcInput->rot_gains_prev,
		#endif
		mcInput->efapInWrapper.hEfap, tmpRotBuffer ) ) != IVAS_ERR_OK )
		if ( ( error = rotateFrameMc( mcInput->base.inputBuffer, mcInput->base.inConfig, &mcInput->customLsInput, mcInput->base.ctx.pHeadRotData, &pCombinedOrientationDataLocal, mcInput->rot_gains_prev[pos_idx],mcInput->efapInWrapper.hEfap, tmpRotBuffer ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		@@ -7096,11 +7082,7 @@ static ivas_error renderMcToSplitBinaural(

		/* call CREND (rotation already performed) */
		if ( ( error = ivas_rend_crendProcess( mcInput->crendWrapper, mcInput->base.inConfig, outConfig, NULL, NULL, NULL, NULL, p_tmpRendBuffer, *mcInput->base.ctx.pOutSampleRate,
		getNumSubframesInBuffer( &mcInput->base.inputBuffer, *mcInput->base.ctx.pOutSampleRate ),
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		pos_idx
		#endif
		) ) != IVAS_ERR_OK )
		getNumSubframesInBuffer( &mcInput->base.inputBuffer, *mcInput->base.ctx.pOutSampleRate ), pos_idx) ) != IVAS_ERR_OK )
		{
		return error;
		}
		@@ -8053,11 +8035,7 @@ static ivas_error renderInputSba(
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		case IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED:
		case IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM:
		error = renderSbaToSplitBinaural( sbaInput,
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		outConfig,
		#endif
		outAudio );
		error = renderSbaToSplitBinaural( sbaInput,outConfig,outAudio );
		break;
		#endif
		case IVAS_AUDIO_CONFIG_BINAURAL:
		@@ -8483,11 +8461,7 @@ static ivas_error renderInputMasa(
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		case IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED:
		case IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM:
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		renderMasaToBinaural( masaInput, outAudio, 1 );
		#else
		renderMasaToBinaural( masaInput, outAudio );
		#endif
		break;
		#endif
		default: