formatting + comments (071dac15) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_prot.h

+45 −43

Original line number	Diff line number	Diff line
		@@ -3844,7 +3844,7 @@ void calculate_hodirac_sector_parameters(
		void ivas_mc_paramupmix_enc(
		Encoder_Struct st_ivas, / i/o: IVAS Encoder handle */
		BSTR_ENC_HANDLE hMetaData, /* i/o: IVAS Metadata bitstream handle */
		float data_f[][L_FRAME48k], /* i/o: input: CICP6, CICP12, CICP14, CICP16 or CICP19 MC data */
		float data_f[][L_FRAME48k], /* i/o: input: MC data */
		const int16_t input_frame /* i : input frame length */
		);

		@@ -3921,7 +3921,7 @@ void ivas_param_mc_enc_close(
		void ivas_param_mc_enc(
		Encoder_Struct st_ivas, / i/o: IVAS Encoder handle */
		BSTR_ENC_HANDLE hMetaData, /* i/o: IVAS Metadata bitstream handle */
		float data_f[][L_FRAME48k], /* i/o: input: CICP6, CICP12, CICP14, CICP16 or CICP19 MC data */
		float data_f[][L_FRAME48k], /* i/o: input: MC data */
		const int16_t input_frame /* i : input frame length */
		);

		@@ -4522,9 +4522,11 @@ void ivas_get_spar_md_from_dirac(
		const int16_t active_w_vlbr
		);

		/! r: number of MD subframes /
		int16_t ivas_get_spar_dec_md_num_subframes(
		const int16_t sba_order, /* i : Ambisonic (SBA) order */
		const int32_t ivas_total_brate );
		const int32_t ivas_total_brate /* i : IVAS total bitrate */
		);

		ivas_error ivas_spar_md_dec_open(
		ivas_spar_md_dec_state_t *hMdDec_out, / i/o: SPAR MD decoder handle */
		@@ -4600,7 +4602,7 @@ ivas_error ivas_spar_covar_enc_open(
		ivas_filterbank_t pFb, / i/o: FB handle */
		const int32_t input_Fs, /* i : input sampling rate */
		const int16_t nchan_inp, /* i : number of input channels */
		COV_SMOOTHING_TYPE smooth_mode, /* i : Smooth covariance for SPAR or MC*/
		const COV_SMOOTHING_TYPE smooth_mode, /* i : Smooth covariance for SPAR or MC */
		const int32_t ivas_total_brate /* i : IVAS total bitrate */
		);

lib_com/options.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -99,7 +99,7 @@
		/MCT Debug switches/
		/#define DEBUG_FORCE_MCT_CP/ /* force MCT Stereo pairs for verification with SPAR */
		#ifdef DEBUG_FORCE_MCT_CP
		/#define DEBUG_SINGLE_CODE_OMNI/ /* force 3 TC SBA always code W channel seperately */
		/#define DEBUG_SINGLE_CODE_OMNI/ /* force 3 TC SBA always code W channel separatelly */
		#endif

		/PLC Debug switches/
		@@ -125,7 +125,7 @@
		#endif
		/#define SPAR_HOA_DBG/ /* SPAR HOA debug statements */
		/#define DEBUG_BINAURAL_FILTER_DESIGN/ /* debugging of Crend binaural filter design */
		//#define DEBUG_AGC_ENCODER_CMD_OPTION /* Ability to force enable or disable AGC behaviour in DIRAC/SPAR via command line option */
		/#define DEBUG_AGC_ENCODER_CMD_OPTION/ /* Ability to force enable or disable AGC behaviour in DIRAC/SPAR via command line option */
		#define DEBUG_JBM_CMD_OPTION /* ability for telling the decoder the frontend fetch size and to not delay compensate for bad frames at the beginning */

		#define VARIABLE_SPEED_DECODING /* variable speed decoding employing the JBM functioniality; move to DEBUGGING after build for disabled is fixed */

lib_dec/ivas_dec.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -108,8 +108,7 @@ ivas_error ivas_dec(
		* Combine orientations
		----------------------------------------------------------------/

		if ( ( error = combine_external_and_head_orientations_dec( st_ivas->hHeadTrackData, st_ivas->hExtOrientationData,
		st_ivas->hCombinedOrientationData ) ) != IVAS_ERR_OK )
		if ( ( error = combine_external_and_head_orientations_dec( st_ivas->hHeadTrackData, st_ivas->hExtOrientationData, st_ivas->hCombinedOrientationData ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		@@ -266,6 +265,7 @@ ivas_error ivas_dec(
		{
		return error;
		}

		ivas_binaural_add_LFE( st_ivas, output_frame, p_output, p_output );
		}
		#ifdef DEBUGGING
		@@ -292,7 +292,6 @@ ivas_error ivas_dec(
		}
		else if ( st_ivas->ivas_format == SBA_FORMAT )
		{

		if ( ( error = ivas_spar_dec( st_ivas, nb_bits_metadata ) ) != IVAS_ERR_OK )
		{
		return error;
		@@ -380,7 +379,6 @@ ivas_error ivas_dec(
		nchan_remapped = ivas_sba_remapTCs( output, st_ivas, output_frame );

		if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC \|\| st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM )

		{
		ivas_sba_mix_matrix_determiner( st_ivas->hSpar, output, st_ivas->bfi, nchan_remapped, output_frame );
		}

lib_dec/ivas_dirac_dec.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -421,7 +421,6 @@ ivas_error ivas_dirac_dec_config(
		return IVAS_ERR_OK;
		}


		if ( nchan_transport_orig > 2 && hDirAC->hOutSetup.is_loudspeaker_setup && st_ivas->renderer_type == RENDERER_DIRAC
		#ifdef FIX_DIRAC_LS_SYNTHESIS_CONFIG
		&& !hodirac_flag
		@@ -431,8 +430,7 @@ ivas_error ivas_dirac_dec_config(
		hDirAC->synthesisConf = DIRAC_SYNTHESIS_PSD_LS;
		hDirAC->panningConf = DIRAC_PANNING_VBAP;
		}
		else if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC \|\|
		st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM \|\| st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC )
		else if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC \|\| st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM \|\| st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC )
		{
		hDirAC->synthesisConf = DIRAC_SYNTHESIS_PSD_LS;
		hDirAC->panningConf = DIRAC_PANNING_VBAP;

lib_dec/ivas_jbm_dec.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -202,6 +202,7 @@ ivas_error ivas_jbm_dec_tc(
		{
		return error;
		}

		#ifdef FIX_470_MASA_JBM_EXT
		if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL )
		{
		@@ -212,7 +213,6 @@ ivas_error ivas_jbm_dec_tc(
		}
		else if ( st_ivas->ivas_format == SBA_FORMAT )
		{

		if ( ( error = ivas_spar_dec( st_ivas, nb_bits_metadata ) ) != IVAS_ERR_OK )
		{
		return error;
		@@ -328,6 +328,7 @@ ivas_error ivas_jbm_dec_tc(
		{
		st_ivas->hCPE[1]->hCoreCoder[1]->hTcxCfg = st_ivas->hCPE[1]->hCoreCoder[0]->hTcxCfg;
		}

		ivas_lfe_dec( st_ivas->hLFE, st, output_frame, st_ivas->bfi, output_lfe_ch );
		}

		@@ -348,6 +349,7 @@ ivas_error ivas_jbm_dec_tc(
		hp20( output[n], output_frame, st_ivas->mem_hp20_out[n], output_Fs );
		}
		}

		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 ) )
		{
		if ( ( st_ivas->hTransSetup.nchan_out_woLFE + st_ivas->hTransSetup.num_lfe ) <= ( st_ivas->hIntSetup.nchan_out_woLFE + st_ivas->hIntSetup.num_lfe ) )
		@@ -355,6 +357,7 @@ ivas_error ivas_jbm_dec_tc(
		ivas_mc2sba( st_ivas->hTransSetup, p_output, p_output, output_frame, st_ivas->hIntSetup.ambisonics_order, GAIN_LFE );
		}
		}

		if ( ( st_ivas->renderer_type == RENDERER_MC \|\| st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC ) && ( st_ivas->hTransSetup.nchan_out_woLFE + st_ivas->hTransSetup.num_lfe ) >= ( st_ivas->hOutSetup.nchan_out_woLFE + st_ivas->hOutSetup.num_lfe ) )
		{
		if ( st_ivas->renderer_type == RENDERER_MC )