remove the "_jbm_" from other function names (a9b3da8a) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_prot.h

+20 −20

Original line number	Diff line number	Diff line
		@@ -801,7 +801,7 @@ void ivas_apply_non_diegetic_panning(


		/----------------------------------------------------------------------------------
		* JBM prototypes
		* decoder->rendering TC buffer prototypes
		----------------------------------------------------------------------------------/

		#ifndef UNIFIED_DECODING_PATHS_FUNCTION_NAMES
		@@ -840,7 +840,7 @@ ivas_error ivas_jbm_dec_flush_renderer(
		#endif
		);

		void ivas_jbm_dec_feed_tc_to_renderer(
		void ivas_dec_feed_tc_to_renderer(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		const int16_t nSamplesForRendering, /* i : number of TC samples available for rendering */
		int16_t nSamplesResidual, / o : number of samples not fitting into the renderer grid and buffer for the next call*/
		@@ -851,19 +851,19 @@ ivas_error ivas_jbm_dec_set_discard_samples(
		Decoder_Struct st_ivas / i/o: main IVAS decoder structre */
		);

		void ivas_jbm_dec_get_adapted_linear_interpolator(
		void ivas_dec_get_adapted_linear_interpolator(
		const int16_t default_interp_length, /* i : default length of the (full-frame) interpolator */
		const int16_t interp_length, /* i : length of the interpolator to be created */
		float interpolator / o : the interpolator */
		);

		void ivas_jbm_dec_get_adapted_subframes(
		void ivas_dec_get_adapted_subframes(
		const int16_t nCldfbTs, /* i : number of time slots in the current frame */
		int16_t subframe_nbslots, / i/o: subframe grid */
		int16_t nb_subframes / i/o: number of subframes in the frame */
		);

		void ivas_jbm_dec_get_md_map(
		void ivas_dec_get_md_map(
		const int16_t default_len, /* i : default frame length in metadata slots */
		const int16_t len, /* i : length of the modfied frames in metadata slots */
		const int16_t subframe_len, /* i : default length of a subframe */
		@@ -872,17 +872,17 @@ void ivas_jbm_dec_get_md_map(
		int16_t map / o : metadata index map */
		);

		int16_t ivas_jbm_dec_get_num_tc_channels(
		int16_t ivas_dec_get_num_tc_channels(
		Decoder_Struct st_ivas / i : IVAS decoder handle */
		);

		void ivas_jbm_dec_copy_tc_no_tsm(
		void ivas_dec_copy_tc_to_tsm(
		Decoder_Struct st_ivas, / i/o: IVAS decoder handle */
		float tc[], / i : transport channels */
		const int16_t output_frame /* i : output frame size */
		);

		void ivas_jbm_dec_get_md_map_even_spacing(
		void ivas_dec_get_md_map_even_spacing(
		const int16_t len, /* i : length of the modfied frames in metadata slots */
		const int16_t subframe_len, /* i : default length of a subframe */
		const int16_t offset, /* i : current read offset into the md buffer */
		@@ -890,19 +890,19 @@ void ivas_jbm_dec_get_md_map_even_spacing(
		int16_t map / o : metadata index map */
		);

		TC_BUFFER_MODE ivas_jbm_dec_get_tc_buffer_mode(
		TC_BUFFER_MODE ivas_dec_get_tc_buffer_mode(
		Decoder_Struct st_ivas / i : IVAS decoder handle */
		);

		/! r: render granularity /
		int16_t ivas_jbm_dec_get_render_granularity(
		int16_t ivas_dec_get_render_granularity(
		const RENDERER_TYPE rendererType, /* i : renderer type */
		const IVAS_FORMAT ivas_format, /* i : ivas format */
		const MC_MODE mc_mode, /* i : MC mode */
		const int32_t output_Fs /* i : sampling rate */
		);

		ivas_error ivas_jbm_dec_tc_buffer_open(
		ivas_error ivas_dec_tc_buffer_open(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		const TC_BUFFER_MODE tc_buffer_mode, /* i : buffer mode */
		const int16_t nchan_transport_jbm, /* i : number of real transport channels */
		@@ -911,7 +911,7 @@ ivas_error ivas_jbm_dec_tc_buffer_open(
		const int16_t n_samples_granularity /* i : granularity of the renderer/buffer */
		);

		ivas_error ivas_jbm_dec_tc_buffer_reconfigure(
		ivas_error ivas_dec_tc_buffer_reconfigure(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		const TC_BUFFER_MODE tc_buffer_mode, /* i : new buffer mode */
		const int16_t nchan_transport_jbm, /* i : new number of real transport channels */
		@@ -920,19 +920,19 @@ ivas_error ivas_jbm_dec_tc_buffer_reconfigure(
		const int16_t n_samples_granularity /* i : new granularity of the renderer/buffer */
		);

		void ivas_jbm_dec_tc_buffer_close(
		void ivas_dec_tc_buffer_close(
		DECODER_TC_BUFFER_HANDLE phTcBuffer / i/o: TC buffer handle */
		);

		void ivas_jbm_dec_td_renderers_adapt_subframes(
		void ivas_dec_td_renderers_adapt_subframes(
		Decoder_Struct st_ivas / i/o: IVAS decoder structure */
		);

		ivas_error ivas_jbm_dec_metadata_open(
		ivas_error ivas_dec_metadata_open(
		Decoder_Struct st_ivas / i/o: IVAS decoder structure */
		);

		void ivas_jbm_masa_sf_to_sf_map(
		void ivas_masa_sf_to_sf_map(
		Decoder_Struct st_ivas / i/o: IVAS decoder structure */
		);

lib_dec/ivas_dec.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -743,8 +743,8 @@ ivas_error ivas_dec(
		}
		else
		{
		/* directly copy to tc buffers */
		ivas_jbm_dec_copy_tc_no_tsm( st_ivas, p_output, output_frame );
		/* directly copy to TC buffers */
		ivas_dec_copy_tc_to_tsm( st_ivas, p_output, output_frame );
		}

		/----------------------------------------------------------------
		@@ -2204,8 +2204,8 @@ ivas_error ivas_jbm_dec_tc(
		}
		else
		{
		/* directly copy to tc buffers */
		ivas_jbm_dec_copy_tc_no_tsm( st_ivas, p_output, output_frame );
		/* directly copy to TC buffers */
		ivas_dec_copy_tc_to_tsm( st_ivas, p_output, output_frame );
		}

		/----------------------------------------------------------------

lib_dec/ivas_dirac_dec.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -975,7 +975,7 @@ ivas_error ivas_dirac_dec_config(
		{
		nchan_to_allocate = 2 * BINAURAL_CHANNELS;
		}
		if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, TC_BUFFER_MODE_RENDERER, nchan_transport, nchan_to_allocate, nchan_to_allocate, st_ivas->hSpatParamRendCom->slot_size ) ) != IVAS_ERR_OK )
		if ( ( error = ivas_dec_tc_buffer_open( st_ivas, TC_BUFFER_MODE_RENDERER, nchan_transport, nchan_to_allocate, nchan_to_allocate, st_ivas->hSpatParamRendCom->slot_size ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		@@ -1540,7 +1540,7 @@ void ivas_dirac_dec_set_md_map(
		num_slots_in_subfr = CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES;
		hSpatParamRendCom->subframes_rendered = 0;

		ivas_jbm_dec_get_adapted_subframes( nCldfbTs, hSpatParamRendCom->subframe_nbslots, &hSpatParamRendCom->nb_subframes );
		ivas_dec_get_adapted_subframes( nCldfbTs, hSpatParamRendCom->subframe_nbslots, &hSpatParamRendCom->nb_subframes );

		/* copy also to tc buffer */
		/* only for non-combined formats and combinded formats w/o discrete objects */
		@@ -1556,15 +1556,15 @@ void ivas_dirac_dec_set_md_map(

		if ( st_ivas->ivas_format == MASA_FORMAT )
		{
		ivas_jbm_dec_get_md_map_even_spacing( nCldfbTs, num_slots_in_subfr, 0, hSpatParamRendCom->dirac_md_buffer_length, hSpatParamRendCom->render_to_md_map );
		ivas_dec_get_md_map_even_spacing( nCldfbTs, num_slots_in_subfr, 0, hSpatParamRendCom->dirac_md_buffer_length, hSpatParamRendCom->render_to_md_map );
		}
		else if ( hDirAC == NULL \|\| hDirAC->hConfig == NULL \|\| hDirAC->hConfig->dec_param_estim == 0 )
		{
		ivas_jbm_dec_get_md_map( DEFAULT_JBM_CLDFB_TIMESLOTS, nCldfbTs, num_slots_in_subfr, 0, hSpatParamRendCom->dirac_md_buffer_length, hSpatParamRendCom->render_to_md_map );
		ivas_dec_get_md_map( DEFAULT_JBM_CLDFB_TIMESLOTS, nCldfbTs, num_slots_in_subfr, 0, hSpatParamRendCom->dirac_md_buffer_length, hSpatParamRendCom->render_to_md_map );
		}
		else
		{
		ivas_jbm_dec_get_md_map( DEFAULT_JBM_CLDFB_TIMESLOTS, nCldfbTs, num_slots_in_subfr, hSpatParamRendCom->dirac_read_idx, hSpatParamRendCom->dirac_md_buffer_length, hSpatParamRendCom->render_to_md_map );
		ivas_dec_get_md_map( DEFAULT_JBM_CLDFB_TIMESLOTS, nCldfbTs, num_slots_in_subfr, hSpatParamRendCom->dirac_read_idx, hSpatParamRendCom->dirac_md_buffer_length, hSpatParamRendCom->render_to_md_map );
		}

		if ( hDirAC == NULL \|\| hDirAC->hConfig == NULL \|\| hDirAC->hConfig->dec_param_estim == 0 )
		@@ -2458,7 +2458,7 @@ void ivas_dirac_dec_render_sf(

		if ( st_ivas->hCombinedOrientationData && st_ivas->hCombinedOrientationData->enableCombinedOrientation[0] )
		{
		ivas_jbm_dec_get_adapted_linear_interpolator( n_samples_to_render, n_samples_to_render, st_ivas->hIsmRendererData->interpolator );
		ivas_dec_get_adapted_linear_interpolator( n_samples_to_render, n_samples_to_render, st_ivas->hIsmRendererData->interpolator );
		interp_offset = 0;
		}

lib_dec/ivas_init_dec.c

+11 −12

Original line number	Diff line number	Diff line
		@@ -2026,9 +2026,9 @@ ivas_error ivas_init_decoder(
		{
		#endif
		granularity = NS2SA( st_ivas->hDecoderConfig->output_Fs, FRAME_SIZE_NS / MAX_PARAM_SPATIAL_SUBFRAMES );
		n_channels_transport_jbm = ivas_jbm_dec_get_num_tc_channels( st_ivas );
		n_channels_transport_jbm = ivas_dec_get_num_tc_channels( st_ivas );

		if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, TC_BUFFER_MODE_RENDERER, n_channels_transport_jbm, n_channels_transport_jbm, n_channels_transport_jbm, granularity ) ) != IVAS_ERR_OK )
		if ( ( error = ivas_dec_tc_buffer_open( st_ivas, TC_BUFFER_MODE_RENDERER, n_channels_transport_jbm, n_channels_transport_jbm, n_channels_transport_jbm, granularity ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		@@ -2081,9 +2081,9 @@ ivas_error ivas_init_decoder(
		{
		granularity = NS2SA( output_Fs, CLDFB_SLOT_NS );

		n_channels_transport_jbm = ivas_jbm_dec_get_num_tc_channels( st_ivas );
		n_channels_transport_jbm = ivas_dec_get_num_tc_channels( st_ivas );

		if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, TC_BUFFER_MODE_RENDERER, n_channels_transport_jbm, MC_PARAMUPMIX_MAX_INPUT_CHANS, MC_PARAMUPMIX_MAX_INPUT_CHANS, granularity ) ) != IVAS_ERR_OK )
		if ( ( error = ivas_dec_tc_buffer_open( st_ivas, TC_BUFFER_MODE_RENDERER, n_channels_transport_jbm, MC_PARAMUPMIX_MAX_INPUT_CHANS, MC_PARAMUPMIX_MAX_INPUT_CHANS, granularity ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		@@ -2092,9 +2092,9 @@ ivas_error ivas_init_decoder(
		{
		granularity = NS2SA( st_ivas->hDecoderConfig->output_Fs, FRAME_SIZE_NS / MAX_PARAM_SPATIAL_SUBFRAMES );

		n_channels_transport_jbm = ivas_jbm_dec_get_num_tc_channels( st_ivas );
		n_channels_transport_jbm = ivas_dec_get_num_tc_channels( st_ivas );

		if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, TC_BUFFER_MODE_RENDERER, n_channels_transport_jbm, n_channels_transport_jbm, n_channels_transport_jbm, granularity ) ) != IVAS_ERR_OK )
		if ( ( error = ivas_dec_tc_buffer_open( st_ivas, TC_BUFFER_MODE_RENDERER, n_channels_transport_jbm, n_channels_transport_jbm, n_channels_transport_jbm, granularity ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		@@ -2249,12 +2249,11 @@ ivas_error ivas_init_decoder(
		#else
		if ( st_ivas->hTcBuffer == NULL )
		#endif

		{
		/* no module has yet open the TC buffer, open a default one */
		n_channels_transport_jbm = ivas_jbm_dec_get_num_tc_channels( st_ivas );
		n_channels_transport_jbm = ivas_dec_get_num_tc_channels( st_ivas );

		if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, ivas_jbm_dec_get_tc_buffer_mode( st_ivas ), n_channels_transport_jbm, n_channels_transport_jbm, n_channels_transport_jbm, NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ) != IVAS_ERR_OK )
		if ( ( error = ivas_dec_tc_buffer_open( st_ivas, ivas_dec_get_tc_buffer_mode( st_ivas ), n_channels_transport_jbm, n_channels_transport_jbm, n_channels_transport_jbm, NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		@@ -2263,7 +2262,7 @@ ivas_error ivas_init_decoder(
		if ( st_ivas->hTcBuffer == NULL )
		{
		/* we need the handle anyway, but without the buffer*/
		if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, TC_BUFFER_MODE_NONE, 0, 0, 0, 1 ) ) != IVAS_ERR_OK )
		if ( ( error = ivas_dec_tc_buffer_open( st_ivas, TC_BUFFER_MODE_NONE, 0, 0, 0, 1 ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		@@ -2275,7 +2274,7 @@ ivas_error ivas_init_decoder(
		#endif
		if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL )
		{
		if ( ( error = ivas_jbm_dec_metadata_open( st_ivas ) ) != IVAS_ERR_OK )
		if ( ( error = ivas_dec_metadata_open( st_ivas ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		@@ -2792,7 +2791,7 @@ void ivas_destroy_dec(
		st_ivas->hDecoderConfig = NULL;
		}

		ivas_jbm_dec_tc_buffer_close( &st_ivas->hTcBuffer );
		ivas_dec_tc_buffer_close( &st_ivas->hTcBuffer );

		if ( st_ivas->hJbmMetadata != NULL )
		{

lib_dec/ivas_ism_dec.c

+6 −5

Original line number	Diff line number	Diff line
		@@ -144,7 +144,7 @@ static ivas_error ivas_ism_bitrate_switching_dec(

		/* JBM: when granularity goes down (e.g. Discrete ISM with TD Obj Renderer -> ParamISM with binaural fastconv
		render what still fits in the new granularity */
		tc_granularity_new = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, st_ivas->ivas_format, st_ivas->mc_mode, st_ivas->hDecoderConfig->output_Fs );
		tc_granularity_new = ivas_dec_get_render_granularity( st_ivas->renderer_type, st_ivas->ivas_format, st_ivas->mc_mode, st_ivas->hDecoderConfig->output_Fs );

		if ( tc_granularity_new < st_ivas->hTcBuffer->n_samples_granularity )
		{
		@@ -339,6 +339,7 @@ static ivas_error ivas_ism_bitrate_switching_dec(
		/-----------------------------------------------------------------
		* JBM TC buffers
		-----------------------------------------------------------------/

		#ifndef NONBE_UNIFIED_DECODING_PATHS
		if ( st_ivas->hDecoderConfig->Opt_5ms )
		#endif
		@@ -347,8 +348,8 @@ static ivas_error ivas_ism_bitrate_switching_dec(
		DECODER_TC_BUFFER_HANDLE hTcBuffer;

		hTcBuffer = st_ivas->hTcBuffer;
		tc_buffer_mode_new = ivas_jbm_dec_get_tc_buffer_mode( st_ivas );
		tc_nchan_tc_new = ivas_jbm_dec_get_num_tc_channels( st_ivas );
		tc_buffer_mode_new = ivas_dec_get_tc_buffer_mode( st_ivas );
		tc_nchan_tc_new = ivas_dec_get_num_tc_channels( st_ivas );
		tc_nchan_allocate_new = tc_nchan_tc_new;
		tc_nchan_full_new = tc_nchan_tc_new;

		@@ -363,11 +364,11 @@ static ivas_error ivas_ism_bitrate_switching_dec(
		tc_nchan_full_new = 0;
		}

		/* reconfigure buffer */
		/* reconfigure TC buffer */
		if ( hTcBuffer->tc_buffer_mode != tc_buffer_mode_new \|\| hTcBuffer->nchan_transport_jbm != tc_nchan_tc_new \|\|
		hTcBuffer->nchan_buffer_full != tc_nchan_full_new \|\| hTcBuffer->nchan_transport_internal != tc_nchan_allocate_new )
		{
		if ( ( error = ivas_jbm_dec_tc_buffer_reconfigure( st_ivas, tc_buffer_mode_new, tc_nchan_tc_new, tc_nchan_allocate_new, tc_nchan_full_new, tc_granularity_new ) ) != IVAS_ERR_OK )
		if ( ( error = ivas_dec_tc_buffer_reconfigure( st_ivas, tc_buffer_mode_new, tc_nchan_tc_new, tc_nchan_allocate_new, tc_nchan_full_new, tc_granularity_new ) ) != IVAS_ERR_OK )
		{
		return error;
		}