rebase with float-pc (74a15c63) · Commits · SA4 / Audio / IVAS BASOP

.gitlab-ci.yml

+748 −5

File changed.

Preview size limit exceeded, changes collapsed.

apps/decoder.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -2382,10 +2382,8 @@ static ivas_error decodeG192(
		#endif
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		if ( ( error = IVAS_DEC_GetSamples( hIvasDec, nSamplesToRender, IVAS_DEC_PCM_INT16, (void ) ( pcmBuf + nOutChannels nSamplesRendered ), &nSamplesRendered_loop, &needNewFrame ) ) != IVAS_ERR_OK )

		#else
		if ( ( error = IVAS_DEC_GetSamples( hIvasDec, nSamplesToRender, ( pcmBuf + nOutChannels * nSamplesRendered ), &nSamplesRendered_loop, &needNewFrame ) ) != IVAS_ERR_OK )

		#endif
		{
		fprintf( stderr, "\nError in IVAS_DEC_GetSamples: %s\n", IVAS_DEC_GetErrorMessage( error ) );
		@@ -2478,6 +2476,7 @@ static ivas_error decodeG192(
		#endif
		}


		/* Write ISm metadata to external file(s) */
		if ( decodedGoodFrame && arg.outputConfig == IVAS_AUDIO_CONFIG_EXTERNAL )
		{

apps/renderer.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -651,7 +651,6 @@ static int16_t is_split_pre_rend_mode(
		}
		#endif


		/------------------------------------------------------------------------------------------
		* main()
		*

lib_com/gs_bitallocation.c

+17 −18

Original line number	Diff line number	Diff line
		@@ -1229,8 +1229,7 @@ static Word16 Find_bit_alloc_IVAS_int( /* o : Number of band to encode */
		/* Find normalized 1 / ToDivide */
		static Word16 Find_norm_inv(
		const Word32 ToDivide,
		Word16 *e_div
		)
		Word16 *e_div )
		{
		Word16 d_tmp, e_tmp;

lib_com/ivas_dirac_com.c

+7 −14

Original line number	Diff line number	Diff line
		@@ -162,10 +162,8 @@ 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 +320,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 )
		{
		@@ -402,8 +398,7 @@ ivas_error ivas_dirac_sba_config(
		const int16_t sba_order, /* i : Ambisonic (SBA) order */
		const int16_t nbands /* i : number of frequency bands */
		,
		IVAS_FORMAT ivas_format
		)
		IVAS_FORMAT ivas_format )
		{
		int16_t nbands_coded;
		int16_t hodirac_flag;
		@@ -465,10 +460,8 @@ 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;
		}