[cleanup] accept JBM_PARAMUPMIX (62f4e3b4) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/cnst.h

+0 −7

Original line number	Diff line number	Diff line
		@@ -2243,13 +2243,6 @@ enum
		VOIP_RTPDUMP
		};

		#ifndef JBM_PARAMUPMIX
		typedef enum _COV_SMOOTHING_TYPE
		{
		COV_SMOOTH_SPAR,
		COV_SMOOTH_MC
		} COV_SMOOTHING_TYPE;
		#endif

		/* clang-format on */
		#endif /* CNST_H */

lib_com/ivas_cnst.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -1390,13 +1390,11 @@ typedef enum
		#define MC_PARAMUPMIX_NCH 2 /* number of channels to combine into 1 */
		#define MC_PARAMUPMIX_MIN_CLDFB 8

		#ifdef JBM_PARAMUPMIX
		typedef enum _COV_SMOOTHING_TYPE
		{
		COV_SMOOTH_SPAR,
		COV_SMOOTH_MC
		} COV_SMOOTHING_TYPE;
		#endif

		typedef struct {
		const int32_t *value;

lib_com/ivas_prot.h

+0 −20

Original line number	Diff line number	Diff line
		@@ -891,10 +891,8 @@ TC_BUFFER_MODE ivas_jbm_dec_get_tc_buffer_mode(
		/! r: render granularity /
		int16_t ivas_jbm_dec_get_render_granularity(
		const RENDERER_TYPE rendererType, /* i : renderer type */
		#ifdef JBM_PARAMUPMIX
		const IVAS_FORMAT ivas_format, /* i : ivas format */
		const MC_MODE mc_mode, /* i : MC mode */
		#endif
		const int32_t output_Fs /* i : sampling rate */
		);

		@@ -3927,7 +3925,6 @@ void ivas_mc_paramupmix_dec_read_BS(
		int16_t nb_bits / o : number of bits written */
		);

		#ifdef JBM_PARAMUPMIX
		void ivas_mc_paramupmix_dec_digest_tc(
		Decoder_Struct st_ivas, / i/o: IVAS decoder handle */
		const uint8_t nCldfbSlots, /* i : number of CLFBS slots in the transport channels */
		@@ -3942,7 +3939,6 @@ void ivas_mc_paramupmix_dec_render(
		float input_f[], / i: core-coder transport channels */
		float output_f[] / i/o: synthesized core-coder transport channels */
		);
		#endif

		void ivas_param_mc_metadata_open(
		const MC_LS_SETUP mc_ls_setup, /* i : MC ls setup */
		@@ -5430,7 +5426,6 @@ ivas_error ivas_allocate_binaural_hrtf(
		int16_t allocate_init_flag /* i : Memory allocation flag */
		);

		#ifdef JBM_PARAMUPMIX
		void ivas_binaural_cldfb(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		float output_f[] / i/o: synthesized core-coder transport channels/DirAC output */
		@@ -5442,21 +5437,6 @@ void ivas_binaural_cldfb_sf(
		const int16_t slot_size, /* i : JBM slot size */
		float output_f[] / i/o: synthesized core-coder transport channels/DirAC output */
		);
		#else
		#ifdef DEBUGGING
		void ivas_binaural_cldfb(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		float output_f[] / i/o: synthesized core-coder transport channels/DirAC output */
		);

		void ivas_binaural_cldfb_sf(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		const int16_t n_samples_to_render, /* i : output frame length per channel */
		float output_f[] / i/o: synthesized core-coder transport channels/DirAC output */

		);
		#endif
		#endif

		void ivas_binRenderer(
		BINAURAL_RENDERER_HANDLE hBinRenderer, /* i/o: binaural renderer handle */

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -151,7 +151,6 @@
		/#define FIX_I4_OL_PITCH/ /* fix open-loop pitch used for EVS core switching */


		#define JBM_PARAMUPMIX /* Dlb: Issue 471: Integrate the Multichannel Parametric Upmix into the JBM path */
		#define FIX_194_LFE_DELAY_EXTREND /* FhG: Issue 194: Fix delay alignment of LFE in external renderer */
		#define FIX_582_INDEX_OUT_OF_BOUNDS_SNS_AVQ_DEC /* FhG: fix an undefined behaviour error in SNS AVQ decoding */
		#define FIX_614_ADD_TO_NULL_PTR_DIRAC_SETUP /* FhG: Issue 614: prevent adding to a null pointer in dirac setup code */

lib_dec/ivas_binRenderer_internal.c

+0 −9

Original line number	Diff line number	Diff line
		@@ -1733,9 +1733,7 @@ void ivas_binaural_cldfb(
		void ivas_binaural_cldfb_sf(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		const int16_t n_samples_to_render, /* i : output frame length per channel */
		#ifdef JBM_PARAMUPMIX
		const int16_t slot_size, /* i : JBM slot size */
		#endif
		float output_f[] / i/o: synthesized core-coder transport channels/DirAC output */
		)
		{
		@@ -1749,18 +1747,11 @@ void ivas_binaural_cldfb_sf(
		float Cldfb_ImagBuffer_Binaural[BINAURAL_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];
		#endif
		int16_t slot_idx, subframeIdx, index_slot, idx_in, idx_lfe, maxBand, ch;
		#ifdef JBM_PARAMUPMIX
		int16_t slots_to_render, first_sf, last_sf;
		#else
		int16_t slot_size, slots_to_render, first_sf, last_sf;
		#endif
		int16_t slot_index_start, slot_index_start_cldfb;

		/* Implement a 5 msec loops */
		maxBand = (int16_t) ( ( CLDFB_NO_CHANNELS_MAX * st_ivas->hDecoderConfig->output_Fs ) / 48000 );
		#ifndef JBM_PARAMUPMIX
		slot_size = st_ivas->hTcBuffer->nb_subframes;
		#endif

		/* loop for synthesis, assume we always have to render in multiples of 5ms subframes with spills */
		slots_to_render = min( st_ivas->hTcBuffer->num_slots - st_ivas->hTcBuffer->slots_rendered, n_samples_to_render / slot_size );