formatting, comments (1977e37d) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/renderer.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -1014,6 +1014,7 @@ int main(
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		}
		#endif

		#ifdef NONBE_UNIFIED_DECODING_PATHS
		const int16_t frameSize_smpls = (int16_t) ( ( args.render_framesize ) * args.sampleRate * 5 / ( 1000 ) );
		#else

lib_com/ivas_prot.h

+21 −21

Original line number	Diff line number	Diff line
		@@ -788,9 +788,9 @@ ivas_error ivas_jbm_dec_tc(
		float data / o : output synthesis signals */
		);

		ivas_error ivas_jbm_dec_render(
		ivas_error ivas_dec_render(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		const uint16_t nSamplesAsked, /* i : number of samples wanted */
		const uint16_t nSamplesAsked, /* i : number of samples requested */
		uint16_t nSamplesRendered, / o : number of samples rendered */
		uint16_t nSamplesAvailableNext, / o : number of samples still available in the rendering pipeline */
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		@@ -826,7 +826,7 @@ void ivas_jbm_dec_feed_tc_to_renderer(
		);

		ivas_error ivas_jbm_dec_set_discard_samples(
		Decoder_Struct st_ivas / i/o: main IVAS decoder structre */
		Decoder_Struct st_ivas / i/o: main IVAS decoder structure */
		);

		void ivas_jbm_dec_get_adapted_linear_interpolator(
		@@ -1122,9 +1122,9 @@ void ivas_ism_param_dec_tc_gain_ajust(

		void ivas_param_ism_dec_render(
		Decoder_Struct st_ivas, / i/o: IVAS decoder handle */
		const uint16_t nSamplesAsked, /* i : number of CLDFB slots requested */
		uint16_t nSamplesRendered, / o : number of CLDFB slots rendered */
		uint16_t nSamplesAvailable, / o : number of CLDFB slots still to render */
		const uint16_t nSamplesAsked, /* i : number of samples requested */
		uint16_t nSamplesRendered, / o : number of samples rendered */
		uint16_t nSamplesAvailable, / o : number of samples still to render */
		float output_f[] / o : rendered time signal */
		);

		@@ -3698,9 +3698,9 @@ void ivas_dirac_dec(
		void ivas_dirac_dec_render(
		Decoder_Struct st_ivas, / i/o: IVAS decoder handle */
		const int16_t nchan_transport, /* i : number of transport channels */
		const uint16_t nSamplesAsked, /* i : number of CLDFB slots requested */
		uint16_t nSamplesRendered, / o : number of CLDFB slots rendered */
		uint16_t nSamplesAvailable, / o : number of CLDFB slots still to render */
		const uint16_t nSamplesAsked, /* i : number of samples requested */
		uint16_t nSamplesRendered, / o : number of sampels rendered */
		uint16_t nSamplesAvailable, / o : number of samples still to render */
		float output_f[] / o : rendered time signal */
		);

		@@ -3813,9 +3813,9 @@ void ivas_mc_paramupmix_dec_digest_tc(

		void ivas_mc_paramupmix_dec_render(
		Decoder_Struct st_ivas, / i/o: IVAS decoder handle */
		const uint16_t nSamplesAsked, /* i : number of CLDFB slots requested */
		uint16_t nSamplesRendered, / o : number of CLDFB slots rendered */
		uint16_t nSamplesAvailable, / o : number of CLDFB slots still to render */
		const uint16_t nSamplesAsked, /* i : number of samples requested */
		uint16_t nSamplesRendered, / o : number of samples rendered */
		uint16_t nSamplesAvailable, / o : number of samples still to render */
		float input_f[], / i : core-coder transport channels */
		float output_f[] / i/o: synthesized core-coder transport channels */
		);
		@@ -3895,9 +3895,9 @@ void ivas_param_mc_dec_digest_tc(

		void ivas_param_mc_dec_render(
		Decoder_Struct st_ivas, / i/o: IVAS decoder handle */
		const uint16_t nSamplesAsked, /* i : number of CLDFB slots requested */
		uint16_t nSamplesRendered, / o : number of CLDFB slots rendered */
		uint16_t nSamplesAvailable, / o : number of CLDFB slots still to render */
		const uint16_t nSamplesAsked, /* i : number of sampes requested */
		uint16_t nSamplesRendered, / o : number of sampes rendered */
		uint16_t nSamplesAvailable, / o : number of sampes still to render */
		float output_f[] / o : rendered time signal */
		);

		@@ -4371,9 +4371,9 @@ void ivas_sba_dec_digest_tc(

		ivas_error ivas_sba_dec_render(
		Decoder_Struct st_ivas, / i/o: IVAS decoder handle */
		const uint16_t nSamplesAsked, /* i : number of CLDFB slots requested */
		uint16_t nSamplesRendered, / o : number of CLDFB slots rendered */
		uint16_t nSamplesAvailable, / o : number of CLDFB slots still to render */
		const uint16_t nSamplesAsked, /* i : number of samples requested */
		uint16_t nSamplesRendered, / o : number of samples rendered */
		uint16_t nSamplesAvailable, / o : number of samples still to render */
		float output_f[] / o : rendered time signal */
		);

		@@ -5695,9 +5695,9 @@ ivas_error ivas_osba_data_open(

		ivas_error ivas_osba_dirac_td_binaural_jbm(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		const uint16_t nSamplesAsked, /* i : number of CLDFB slots requested */
		uint16_t nSamplesRendered, / o : number of CLDFB slots rendered */
		uint16_t nSamplesAvailable, / o : number of CLDFB slots still to render */
		const uint16_t nSamplesAsked, /* i : number of samples requested */
		uint16_t nSamplesRendered, / o : number of samples rendered */
		uint16_t nSamplesAvailable, / o : number of samples still to render */
		float output_f[] / o : rendered time signal */
		);

lib_dec/ivas_dirac_dec.c

+31 −125

File changed.

Preview size limit exceeded, changes collapsed.

lib_dec/ivas_init_dec.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -2173,7 +2173,6 @@ ivas_error ivas_init_decoder(
		#else
		if ( st_ivas->hTcBuffer == NULL )
		#endif

		{
		/* no module has yet open the TC buffer, open a default one */
		n_channels_transport_jbm = ivas_jbm_dec_get_num_tc_channels( st_ivas );
		@@ -2205,7 +2204,7 @@ ivas_error ivas_init_decoder(
		}

		/-----------------------------------------------------------------
		* Allocate floating-point output audio buffers
		* Allocate 'float' output audio buffers
		-----------------------------------------------------------------/

		#ifndef NONBE_UNIFIED_DECODING_PATHS
		@@ -2482,7 +2481,7 @@ void ivas_initialize_handles_dec(
		st_ivas->hTcBuffer = NULL;
		st_ivas->hJbmMetadata = NULL;

		/* floating-point output audio buffers */
		/* 'float' output audio buffers */
		for ( i = 0; i < MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS; i++ )
		{
		st_ivas->p_output_f[i] = NULL;
		@@ -2720,7 +2719,7 @@ void ivas_destroy_dec(
		st_ivas->hJbmMetadata = NULL;
		}

		/* floating-point output audio buffers */
		/* 'float' output audio buffers */
		for ( i = 0; i < MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS; i++ )
		{
		if ( st_ivas->p_output_f[i] != NULL )

lib_dec/ivas_ism_dec.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -321,20 +321,22 @@ static ivas_error ivas_ism_bitrate_switching_dec(
		}

		/-----------------------------------------------------------------
		* floating-point output audio buffers
		* 'float' output audio buffers
		-----------------------------------------------------------------/

		#ifndef NONBE_UNIFIED_DECODING_PATHS
		if ( !st_ivas->hDecoderConfig->Opt_5ms )
		#endif
		{
		#endif
		nchan_out_buff = ivas_get_nchan_buffers_dec( st_ivas, -1, -1 );

		if ( ( error = ivas_output_buff_dec( st_ivas->p_output_f, nchan_out_buff_old, nchan_out_buff ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		#ifndef NONBE_UNIFIED_DECODING_PATHS
		}
		#endif

		/-----------------------------------------------------------------
		* JBM TC buffers