Remove NOTE comments (cbe5b095) · Commits · SA4 / Audio / IVAS BASOP

lib_dec/ivas_jbm_dec_fx.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -2460,7 +2460,7 @@ ivas_error ivas_jbm_dec_render_fx(

		IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) \|\| EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )
		{
		#ifdef FIX_1119_SPLIT_RENDERING_VOIP /* NOTE(sgi): BASOP special - not in float version */
		#ifdef FIX_1119_SPLIT_RENDERING_VOIP
		const Word32 *p_output_fx_const[MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS];

		nchan_out_syn_output = BINAURAL_CHANNELS * st_ivas->hSplitBinRend->splitrend.multiBinPoseData.num_poses;
		@@ -2475,7 +2475,7 @@ ivas_error ivas_jbm_dec_render_fx(
		ivas_TD_RINGBUF_PushChannels( st_ivas->hSplitBinRend->hMultiBinTdData, p_output_fx_const, *nSamplesRendered );
		}

		#ifdef TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR // TODO(sgi): verify if this is needed in BASOP
		#ifdef TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR
		IF ( st_ivas->flushing )
		{
		nchan_out_syn_output = BINAURAL_CHANNELS;
		@@ -2488,13 +2488,13 @@ ivas_error ivas_jbm_dec_render_fx(
		}
		#endif
		}
		#ifdef FIX_1119_SPLIT_RENDERING_VOIP /* NOTE(sgi): BASOP special - not in float version */
		#ifdef FIX_1119_SPLIT_RENDERING_VOIP
		ELSE
		{
		#endif
		nchan_out_syn_output = nchan_out;
		move16();
		#ifdef FIX_1119_SPLIT_RENDERING_VOIP /* NOTE(sgi): BASOP special - not in float version */
		#ifdef FIX_1119_SPLIT_RENDERING_VOIP
		}
		#endif

lib_dec/lib_dec_fx.c

+3 −6

Original line number	Diff line number	Diff line
		@@ -783,7 +783,6 @@ static int16_t get_render_frame_size_samples(
		Word16 tmp;
		tmp = (Word16) Mpy_32_16_1( hDecoderConfig->output_Fs, INV_FR_P_S_MX_PRM_SPL_SBFR_Q15 );

		/* NOTE(sgi): BASOP special - not in float version */
		IF( EQ_16( hDecoderConfig->render_framesize, IVAS_RENDER_FRAMESIZE_5MS ) )
		{
		/* correct value already in tmp */
		@@ -815,7 +814,7 @@ ivas_error IVAS_DEC_GetRenderFramesizeSamples(
		Word16 render_framesize / o : render framesize in samples Q0 */
		)
		{
		#ifndef FIX_1119_SPLIT_RENDERING_VOIP /* NOTE(sgi): BASOP special - not in float version */
		#ifndef FIX_1119_SPLIT_RENDERING_VOIP
		Word16 tmp;
		#endif

		@@ -1294,7 +1293,6 @@ static ivas_error isar_generate_metadata_and_bitstream(
		pcm_out_flag = ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ? 1 : 0;
		cldfb_in_flag = ivas_dec_split_rend_cldfb_in( st_ivas->renderer_type );

		// NOTE(sgi): BASOP special - not in float version
		n_samples_in_cldfb_slot = NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS );
		assert( nSamples % n_samples_in_cldfb_slot == 0 );
		num_cldfb_slots = int_div_s_x( nSamples, n_samples_in_cldfb_slot );
		@@ -1347,7 +1345,6 @@ static ivas_error isar_generate_metadata_and_bitstream(
		Quaternion.y_fx = 0;
		Quaternion.z_fx = 0;
		}
		// NOTE(sgi): BASOP special - not in float version
		Word16 q1 = 31, q2 = 31, Q_buff;
		Q_out[0] = 31;

		@@ -1625,7 +1622,7 @@ ivas_error IVAS_DEC_GetSplitBinauralBitstream(
		ivas_limiter_dec_fx( st_ivas->hLimiter, p_head_pose_buf, st_ivas->hDecoderConfig->nchan_out, numSamplesPerChannelToOutput, st_ivas->BER_detect, Q11 );
		#endif
		}
		else
		ELSE
		{
		ivas_limiter_dec_fx( st_ivas->hLimiter, p_head_pose_buf, st_ivas->hDecoderConfig->nchan_out, numSamplesPerChannelToOutput, st_ivas->BER_detect, Q11 );
		}
		@@ -4606,7 +4603,7 @@ ivas_error IVAS_DEC_VoIP_GetSamples
		EQ_32( hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) ) &&
		splitRendBits == NULL )
		{
		return IVAS_ERR_UNEXPECTED_NULL_POINTER; // NOTE(sgi): BASOP special - not in float version
		return IVAS_ERR_UNEXPECTED_NULL_POINTER;
		}
		#endif

lib_isar/isar_splitRendererPre.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3211,7 +3211,7 @@ void lc3plusTimeAlignCldfbPoseCorr(
		}
		ELSE
		{
		#ifdef FIX_1119_SPLIT_RENDERING_VOIP // NOTE(sgi): BASOP special - not in float version
		#ifdef FIX_1119_SPLIT_RENDERING_VOIP
		FOR( Word16 i = 0; i < i_mult( hSplitBin->multiBinPoseData.num_poses, BINAURAL_CHANNELS ); i++ )
		#else
		FOR( Word16 i = 0; i < CLDFB_NO_COL_MAX; i++ )

lib_isar/lib_isar_pre_rend.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -420,7 +420,7 @@ ivas_error ISAR_PRE_REND_MultiBinToSplitBinaural(
		move16();
		FOR( ch = 0; ch < BINAURAL_CHANNELS; ch++ )
		{
		#ifdef FIX_1119_SPLIT_RENDERING_VOIP /* NOTE(sgi): BASOP special - not in float version */
		#ifdef FIX_1119_SPLIT_RENDERING_VOIP
		FOR( j = 0; j < num_slots; j++ )
		#else
		FOR( j = 0; j < CLDFB_NO_COL_MAX; j++ )
		@@ -438,7 +438,7 @@ ivas_error ISAR_PRE_REND_MultiBinToSplitBinaural(

		FOR( ch = 0; ch < BINAURAL_CHANNELS; ch++ )
		{
		#ifdef FIX_1119_SPLIT_RENDERING_VOIP /* NOTE(sgi): BASOP special - not in float version */
		#ifdef FIX_1119_SPLIT_RENDERING_VOIP
		FOR( j = 0; j < num_slots; j++ )
		#else
		FOR( j = 0; j < CLDFB_NO_COL_MAX; j++ )
		@@ -505,7 +505,7 @@ ivas_error ISAR_PRE_REND_MultiBinToSplitBinaural(
		move16();
		q2 = 31;
		move16();
		#ifdef FIX_1119_SPLIT_RENDERING_VOIP // NOTE(sgi): BASOP special - not in float version
		#ifdef FIX_1119_SPLIT_RENDERING_VOIP
		FOR( j = 0; j < num_slots; j++ )
		#else
		FOR( j = 0; j < CLDFB_NO_COL_MAX; j++ )
		@@ -518,7 +518,7 @@ ivas_error ISAR_PRE_REND_MultiBinToSplitBinaural(
		q_final = s_min( add( Q_buff_re, q_final ), add( Q_buff_im, q_final ) );
		q_final = sub( q_final, 6 ); // guard bits
		q_final = s_min( q_final, Q25 );
		#ifdef FIX_1119_SPLIT_RENDERING_VOIP // NOTE(sgi): BASOP special - not in float version
		#ifdef FIX_1119_SPLIT_RENDERING_VOIP
		FOR( j = 0; j < num_slots; j++ )
		#else
		FOR( j = 0; j < CLDFB_NO_COL_MAX; j++ )

lib_rend/lib_rend_fx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -9042,7 +9042,7 @@ static ivas_error getSamplesInternal(
		Q_out[0] = Q_out[0] + *outAudio.pq_fact;
		}

		#ifdef FIX_1119_SPLIT_RENDERING_VOIP /* NOTE(sgi): BASOP special - not in float version */
		#ifdef FIX_1119_SPLIT_RENDERING_VOIP
		IF( ( error = ISAR_PRE_REND_MultiBinToSplitBinaural( hIvasRend->splitRendWrapper, hIvasRend->headRotData.headPositions[0], hIvasRend->hRendererConfig->split_rend_config.splitRendBitRate, hIvasRend->hRendererConfig->split_rend_config.codec,
		hIvasRend->hRendererConfig->split_rend_config.isar_frame_size_ms,
		hIvasRend->hRendererConfig->split_rend_config.codec_frame_size_ms,