formatting (961d8491) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_dirac_com.c

+6 −16

Original line number	Diff line number	Diff line
		@@ -162,10 +162,7 @@ ivas_error ivas_dirac_config(
		hConfig->dec_param_estim = FALSE;
		if ( ivas_format == SBA_FORMAT \|\| ivas_format == SBA_ISM_FORMAT ) /* skip for MASA decoder */
		{
		if ( ( error = ivas_dirac_sba_config( hQMetaData, element_mode, ivas_total_brate, sba_order, hConfig->nbands - spar_dirac_split_band
		,
		ivas_format
		) ) != IVAS_ERR_OK )
		if ( ( error = ivas_dirac_sba_config( hQMetaData, element_mode, ivas_total_brate, sba_order, hConfig->nbands - spar_dirac_split_band, ivas_format ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		@@ -322,10 +319,8 @@ void ivas_get_dirac_sba_max_md_bits(
		int16_t *bits_frame_nominal,
		int16_t *metadata_max_bits,
		int16_t *qmetadata_max_bit_req,
		const int16_t nbands
		,
		IVAS_FORMAT ivas_format
		)
		const int16_t nbands,
		IVAS_FORMAT ivas_format )
		{
		if ( sba_total_brate <= IVAS_13k2 )
		{
		@@ -400,10 +395,8 @@ ivas_error ivas_dirac_sba_config(
		int16_t element_mode, / i/o: element mode of the core coder */
		int32_t sba_total_brate, /* i : SBA total bitrate */
		const int16_t sba_order, /* i : Ambisonic (SBA) order */
		const int16_t nbands /* i : number of frequency bands */
		,
		IVAS_FORMAT ivas_format
		)
		const int16_t nbands, /* i : number of frequency bands */
		IVAS_FORMAT ivas_format )
		{
		int16_t nbands_coded;
		int16_t hodirac_flag;
		@@ -465,10 +458,7 @@ ivas_error ivas_dirac_sba_config(
		}
		}

		ivas_get_dirac_sba_max_md_bits( sba_total_brate, &hQMetaData->bits_frame_nominal, &hQMetaData->metadata_max_bits, &hQMetaData->qmetadata_max_bit_req, hQMetaData->q_direction[0].cfg.nbands
		,
		ivas_format
		);
		ivas_get_dirac_sba_max_md_bits( sba_total_brate, &hQMetaData->bits_frame_nominal, &hQMetaData->metadata_max_bits, &hQMetaData->qmetadata_max_bit_req, hQMetaData->q_direction[0].cfg.nbands, ivas_format );

		return error;
		}

lib_com/ivas_prot.h

+4 −6

Original line number	Diff line number	Diff line
		@@ -3639,8 +3639,7 @@ void ivas_get_dirac_sba_max_md_bits(
		int16_t *bits_frame_nominal,
		int16_t *metadata_max_bits,
		int16_t *qmetadata_max_bit_req,
		const int16_t nbands
		,
		const int16_t nbands,
		IVAS_FORMAT ivas_format
		);

		@@ -3649,8 +3648,7 @@ ivas_error ivas_dirac_sba_config(
		int16_t element_mode, / o : element mode of the core coder */
		int32_t sba_total_brate, /* i : SBA total bitrate */
		const int16_t sba_order, /* i : Ambisonic (SBA) order */
		const int16_t nbands /* i : number of frequency bands */
		,
		const int16_t nbands, /* i : number of frequency bands */
		IVAS_FORMAT ivas_format
		);

lib_com/prot.h

+4 −5

Original line number	Diff line number	Diff line
		@@ -2271,8 +2271,7 @@ ivas_error init_encoder(
		const int16_t var_SID_rate_flag, /* i : flag for variable SID update rate */
		const int16_t interval_SID, /* i : interval for SID update */
		const int16_t vad_only_flag, /* i : flag to indicate front-VAD structure */
		const ISM_MODE ism_mode /* i : ISM mode */
		,
		const ISM_MODE ism_mode, /* i : ISM mode */
		const int32_t element_brate /* element bitrate */
		);

lib_dec/ivas_init_dec.c

+34 −36

Original line number	Diff line number	Diff line
		@@ -1356,10 +1356,9 @@ ivas_error ivas_init_decoder(
		}
		}

		if ( ( error = ivas_dirac_sba_config( st_ivas->hQMetaData, &st_ivas->element_mode_init, ivas_total_brate, st_ivas->sba_analysis_order, ivas_get_hodirac_flag( ivas_total_brate, st_ivas->sba_analysis_order ) ? IVAS_MAX_NUM_BANDS : ( IVAS_MAX_NUM_BANDS - SPAR_DIRAC_SPLIT_START_BAND )
		,
		st_ivas->ivas_format
		) ) != IVAS_ERR_OK )
		if ( ( error = ivas_dirac_sba_config( st_ivas->hQMetaData, &st_ivas->element_mode_init, ivas_total_brate, st_ivas->sba_analysis_order,
		ivas_get_hodirac_flag( ivas_total_brate, st_ivas->sba_analysis_order ) ? IVAS_MAX_NUM_BANDS : ( IVAS_MAX_NUM_BANDS - SPAR_DIRAC_SPLIT_START_BAND ),
		st_ivas->ivas_format ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		@@ -1512,10 +1511,9 @@ ivas_error ivas_init_decoder(
		}
		}

		if ( ( error = ivas_dirac_sba_config( st_ivas->hQMetaData, &st_ivas->element_mode_init, ivas_total_brate, st_ivas->sba_analysis_order, ivas_get_hodirac_flag( ivas_total_brate, st_ivas->sba_analysis_order ) ? IVAS_MAX_NUM_BANDS : ( IVAS_MAX_NUM_BANDS - SPAR_DIRAC_SPLIT_START_BAND )
		,
		st_ivas->ivas_format
		) ) != IVAS_ERR_OK )
		if ( ( error = ivas_dirac_sba_config( st_ivas->hQMetaData, &st_ivas->element_mode_init, ivas_total_brate, st_ivas->sba_analysis_order,
		ivas_get_hodirac_flag( ivas_total_brate, st_ivas->sba_analysis_order ) ? IVAS_MAX_NUM_BANDS : ( IVAS_MAX_NUM_BANDS - SPAR_DIRAC_SPLIT_START_BAND ),
		st_ivas->ivas_format ) ) != IVAS_ERR_OK )
		{
		return error;
		}

lib_dec/ivas_mct_dec.c

100755 → 100644

+37 −37

File changed.File mode changed from 100755 to 100644.

Contains only whitespace changes.