formatting around recent switches (cbd669c6) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_dec/ivas_dec.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -890,6 +890,7 @@ ivas_error ivas_dec(
		}
		}
		}

		#ifndef NONBE_FIX_727_MC_PARAMUPMIX_HEADROTATION
		if ( st_ivas->transport_config != st_ivas->intern_config && ( st_ivas->intern_config == AUDIO_CONFIG_FOA \|\| st_ivas->intern_config == AUDIO_CONFIG_HOA2 \|\| st_ivas->intern_config == AUDIO_CONFIG_HOA3 ) )
		{

lib_dec/ivas_jbm_dec.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -162,16 +162,14 @@ ivas_error ivas_jbm_dec_tc(
		}
		else if ( st_ivas->ism_mode == ISM_MODE_PARAM )
		{
		if ( ( error = ivas_ism_metadata_dec( ivas_total_brate, st_ivas->nchan_ism, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hISMDTX, st_ivas->hDirAC->hParamIsm, &st_ivas->ism_extmeta_active, &st_ivas->ism_extmeta_cnt,
		st_ivas->hSCE[0]->hCoreCoder[0] ) ) != IVAS_ERR_OK )
		if ( ( error = ivas_ism_metadata_dec( ivas_total_brate, st_ivas->nchan_ism, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hISMDTX, st_ivas->hDirAC->hParamIsm, &st_ivas->ism_extmeta_active, &st_ivas->ism_extmeta_cnt, st_ivas->hSCE[0]->hCoreCoder[0] ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		}
		else /* ISM_MODE_DISC */
		{
		if ( ( error = ivas_ism_metadata_dec( ivas_total_brate, st_ivas->nchan_ism, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hISMDTX, NULL, &st_ivas->ism_extmeta_active, &st_ivas->ism_extmeta_cnt,
		st_ivas->hSCE[0]->hCoreCoder[0] ) ) != IVAS_ERR_OK )
		if ( ( error = ivas_ism_metadata_dec( ivas_total_brate, st_ivas->nchan_ism, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hISMDTX, NULL, &st_ivas->ism_extmeta_active, &st_ivas->ism_extmeta_cnt, st_ivas->hSCE[0]->hCoreCoder[0] ) ) != IVAS_ERR_OK )
		{
		return error;
		}

lib_dec/ivas_mc_param_dec.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -100,6 +100,7 @@ static ivas_error param_mc_get_diff_proto_info( const float *proto_mtx, const ui
		#ifndef NONBE_FIX_727_MC_PARAMUPMIX_HEADROTATION
		static void ivas_param_mc_mc2sba_cldfb( IVAS_OUTPUT_SETUP hTransSetup, float *hoa_encoder, const int16_t slot_idx, float Cldfb_RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], float Cldfb_ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], const int16_t nBands, const float gain_lfe );
		#endif

		static void ivas_param_mc_get_param_band_mapping( const int16_t n_target_bands, const int16_t target_band_grouping, const int16_t n_source_bands, const int16_t source_band_grouping, PARAM_MC_PARAMETER_BAND_MAPPING *parameter_band_mapping );

		static void ivas_param_mc_bs_decode_parameter_values( uint16_t bit_buffer[], int16_t bit_pos, const int16_t max_bits, int16_t BER_detect, HANDLE_IVAS_PARAM_MC_METADATA hMetadataPMC, HANDLE_PARAM_MC_PARAMETER_CODING_INFO hParamCodingInfo, const int16_t map_size_wo_lfe, const int16_t map_size, const int16_t num_lfe_bands, const int16_t band_step, const int16_t num_param_bands, float *value_buffer );

lib_dec/ivas_mc_paramupmix_dec.c

+10 −1

Original line number	Diff line number	Diff line
		@@ -319,6 +319,7 @@ void ivas_mc_paramupmix_dec(
		}
		idx_in += 2;
		}

		#ifdef NONBE_FIX_727_MC_PARAMUPMIX_HEADROTATION
		if ( st_ivas->hCombinedOrientationData && st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV )
		{
		@@ -328,6 +329,7 @@ void ivas_mc_paramupmix_dec(
		}
		}
		#endif

		#ifdef SPLIT_REND_WITH_HEAD_ROT
		/LFE handling for split rendering cases/
		if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
		@@ -396,6 +398,7 @@ void ivas_mc_paramupmix_dec(
		}
		}
		#endif

		for ( pos_idx = 0; pos_idx < st_ivas->hBinRenderer->numPoses; pos_idx++ )
		{
		for ( slot_idx = 0; slot_idx < JBM_CLDFB_SLOTS_IN_SUBFRAME; slot_idx++ )
		@@ -661,9 +664,11 @@ ivas_error ivas_mc_paramupmix_dec_open(
		assert( 0 && "Number of TC not supported for MC ParamUpmix!" );
		#endif
		}

		#ifdef NONBE_FIX_727_MC_PARAMUPMIX_HEADROTATION
		hMCParamUpmix->hoa_encoder = NULL;
		#endif

		/-----------------------------------------------------------------
		* set input parameters
		-----------------------------------------------------------------/
		@@ -787,11 +792,14 @@ void ivas_mc_paramupmix_dec_close(

		return;
		}


		/*-------------------------------------------------------------------------
		* ivas_param_upmix_dec_decorr_subframes()
		*
		*
		------------------------------------------------------------------------/

		static void paramupmix_td_decorr_process_jbm(
		ivas_td_decorr_state_t hTdDecorr[], / i/o: SPAR Covar. decoder handle */
		float pcm_in[], / i : input audio channels */
		@@ -838,6 +846,7 @@ static void paramupmix_td_decorr_process_jbm(
		return;
		}


		static void ivas_param_upmix_dec_decorr_subframes(
		Decoder_Struct st_ivas, / i/o: IVAS decoder handle */
		const int16_t nSamplesForRendering )

lib_dec/ivas_sba_rendering_internal.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -212,6 +212,7 @@ void ivas_mc2sba(
		return;
		}


		#ifdef NONBE_FIX_727_MC_PARAMUPMIX_HEADROTATION
		/-------------------------------------------------------------------------
		* ivas_param_mc_mc2sba_cldfb()
		@@ -289,6 +290,7 @@ void ivas_param_mc_mc2sba_cldfb(
		}
		#endif


		/-------------------------------------------------------------------
		* ivas_sba_remapTCs()
		*