formatting (15620553) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/renderer.c

+1 −6

Original line number	Diff line number	Diff line
		@@ -859,12 +859,7 @@ int main(
		if ( args.sceneDescriptionInput )
		{
		/* With scene description input, inputFilePath is the path to the scene description file. Parse it. */
		parseSceneDescriptionFile( args.inputFilePath,
		audioFilePath,
		&args.inConfig,
		positionProvider,
		masaReaders,
		lfeRoutingConfigs );
		parseSceneDescriptionFile( args.inputFilePath, audioFilePath, &args.inConfig, positionProvider, masaReaders, lfeRoutingConfigs );
		}
		else
		{

lib_com/ivas_prot.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -1038,7 +1038,7 @@ ivas_error ivas_ism_metadata_dec(
		int16_t ism_extended_metadata_flag, / i/o: Extended metadata active in renderer */
		int16_t ism_extmeta_cnt / i/o: Number of change frames observed */
		#ifdef SBA_AND_OBJECTS
		, DEC_CORE_HANDLE st0
		, DEC_CORE_HANDLE st0 /* i : core-coder handle */
		#endif
		);

lib_dec/ivas_ism_metadata_dec.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -152,7 +152,7 @@ ivas_error ivas_ism_metadata_dec(
		int16_t ism_extmeta_cnt / i/o: Number of change frames observed */
		#ifdef SBA_AND_OBJECTS
		,
		DEC_CORE_HANDLE st0
		DEC_CORE_HANDLE st0 /* i : core-coder handle */
		#endif
		)
		{

lib_dec/ivas_spar_md_dec.c

+34 −32

Original line number	Diff line number	Diff line
		@@ -312,9 +312,7 @@ ivas_error ivas_spar_md_dec_open(
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR MD decoder" );
		}

		num_md_sub_frames = ivas_get_spar_dec_md_num_subframes( sba_order, hDecoderConfig->ivas_total_brate,
		last_active_ivas_total_brate /* i : IVAS last active bitrate */
		);
		num_md_sub_frames = ivas_get_spar_dec_md_num_subframes( sba_order, hDecoderConfig->ivas_total_brate, last_active_ivas_total_brate );

		if ( ( error = ivas_spar_md_dec_matrix_open( hMdDec, num_channels, num_md_sub_frames ) ) != IVAS_ERR_OK )
		{
		@@ -336,6 +334,7 @@ ivas_error ivas_spar_md_dec_open(
		{
		hMdDec->table_idx = ivas_get_spar_table_idx( hDecoderConfig->ivas_total_brate, sba_order, SPAR_CONFIG_BW, NULL, NULL );
		}

		if ( ( error = ivas_spar_md_dec_init( hMdDec, hDecoderConfig, num_channels, sba_order ) ) != IVAS_ERR_OK )
		{
		return error;
		@@ -821,12 +820,7 @@ void ivas_spar_md_dec_process(
		}
		}

		ivas_get_spar_matrices( hMdDec, num_bands_out, num_md_sub_frames, bw, dtx_vad, nB,
		num_md_chs,
		active_w_vlbr,
		dyn_active_w_flag

		);
		ivas_get_spar_matrices( hMdDec, num_bands_out, num_md_sub_frames, bw, dtx_vad, nB, num_md_chs, active_w_vlbr, dyn_active_w_flag );

		#ifdef DEBUG_SPAR_DIRAC_WRITE_OUT_PRED_PARS
		{
		@@ -843,6 +837,7 @@ void ivas_spar_md_dec_process(
		{
		nB = nB << 1;
		}

		for ( b = nB; b < num_bands_out; b++ )
		{
		hMdDec->valid_bands[b] = 1;
		@@ -854,11 +849,14 @@ void ivas_spar_md_dec_process(

		return;
		}


		/-----------------------------------------------------------------------------------------
		* Function ivas_spar_chk_zero_coefs()
		*
		* Check for zeroed SPAR coefficients
		-----------------------------------------------------------------------------------------/

		int16_t ivas_spar_chk_zero_coefs(
		Decoder_Struct st_ivas, / i/o: IVAS decoder handle */
		const int16_t sba_order /* i : Ambisonic (SBA) order */
		@@ -911,6 +909,7 @@ int16_t ivas_spar_chk_zero_coefs(
		return mono;
		}


		/-----------------------------------------------------------------------------------------
		* Function ivas_spar_smooth_md_dtx()
		*
		@@ -1162,9 +1161,10 @@ static void ivas_get_spar_matrices(
		{
		num_bands = num_bands >> 1;
		}
		active_w = ( dyn_active_w_flag == 1 ) \|\| ( hMdDec->spar_md_cfg.active_w == 1 );

		active_w = ( dyn_active_w_flag == 1 ) \|\| ( hMdDec->spar_md_cfg.active_w == 1 );
		active_w_dm_fac = ( dtx_vad == 0 ) ? IVAS_ACTIVEW_DM_F_SCALE_DTX : ( ( active_w_vlbr ) ? IVAS_ACTIVEW_DM_F_SCALE_VLBR : IVAS_ACTIVEW_DM_F_SCALE );

		for ( i_ts = 0; i_ts < n_ts; i_ts++ )
		{
		for ( i = 0; i < numch_out; i++ )
		@@ -1653,8 +1653,7 @@ static void ivas_spar_dec_parse_md_bs(

		if ( no_ec == 0 )
		{
		ivas_decode_arith_bs( hMdDec, st0, qsi, nB, bands_bw, do_diff,
		strat, ivas_total_brate );
		ivas_decode_arith_bs( hMdDec, st0, qsi, nB, bands_bw, do_diff, strat, ivas_total_brate );
		}
		else
		{
		@@ -1857,9 +1856,11 @@ static void ivas_decode_arith_bs(
		}

		ivas_fill_band_coeffs_idx( hMdDec->spar_md.band_coeffs_idx, nB, symbol_arr_re, decx_cell_dims, DECX_COEFF );

		return;
		}


		/-----------------------------------------------------------------------------------------
		* Function ivas_fill_band_coeffs_idx()
		*
		@@ -1942,6 +1943,7 @@ static void ivas_decode_huffman_bs(
		drct_dim = ndec * ( ndm - 1 );
		decd_dim = ndec;
		pred_offset = 0;

		if ( hMdDec->spar_hoa_md_flag && hMdDec->spar_hoa_dirac2spar_md_flag )
		{
		if ( i >= SPAR_DIRAC_SPLIT_START_BAND )

lib_dec/lib_dec.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1112,7 +1112,7 @@ ivas_error IVAS_DEC_FeedHeadTrackData(
		IVAS_VECTOR3 Pos / i : listener position */
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		,
		IVAS_SPLIT_REND_ROT_AXIS rot_axis
		const IVAS_SPLIT_REND_ROT_AXIS rot_axis
		#endif
		)
		{