Merge branch '133-bitrate-switching-in-core-coder' into 'main' (8f339535) · Commits · IVAS Codec Public Collaboration / IVAS Codec

Workspace_msvc/lib_dec.vcxproj

+1 −0

Original line number	Diff line number	Diff line
		@@ -267,6 +267,7 @@
		<ClCompile Include="..\lib_dec\ivas_allrad_dec.c" />
		<ClCompile Include="..\lib_dec\ivas_binauralRenderer.c" />
		<ClCompile Include="..\lib_dec\ivas_binaural_reverb.c" />
		<ClCompile Include="..\lib_dec\ivas_corecoder_dec_reconfig.c" />
		<ClCompile Include="..\lib_dec\ivas_core_dec.c" />
		<ClCompile Include="..\lib_dec\ivas_cpe_dec.c" />
		<ClCompile Include="..\lib_dec\ivas_crend.c" />

Workspace_msvc/lib_dec.vcxproj.filters

+3 −0

Original line number	Diff line number	Diff line
		@@ -581,6 +581,9 @@
		<ClCompile Include="..\lib_dec\ivas_spar_md_dec.c">
		<Filter>dec_ivas_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_dec\ivas_corecoder_dec_reconfig.c">
		<Filter>dec_ivas_c</Filter>
		</ClCompile>
		</ItemGroup>
		<ItemGroup>
		<ClInclude Include="..\lib_dec\jbm_jb4_inputbuffer.h">

Workspace_msvc/lib_enc.vcxproj

+1 −0

Original line number	Diff line number	Diff line
		@@ -206,6 +206,7 @@
		</ItemDefinitionGroup>
		<ItemGroup>
		<ClCompile Include="..\lib_enc\ivas_agc_enc.c" />
		<ClCompile Include="..\lib_enc\ivas_corecoder_enc_reconfig.c" />
		<ClCompile Include="..\lib_enc\ivas_core_pre_proc.c" />
		<ClCompile Include="..\lib_enc\ivas_core_pre_proc_front.c" />
		<ClCompile Include="..\lib_enc\ivas_enc_cov_handler.c" />

Workspace_msvc/lib_enc.vcxproj.filters

+3 −0

Original line number	Diff line number	Diff line
		@@ -581,6 +581,9 @@
		<ClCompile Include="..\lib_enc\ivas_spar_md_enc.c">
		<Filter>enc_ivas_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\ivas_corecoder_enc_reconfig.c">
		<Filter>enc_ivas_c</Filter>
		</ClCompile>
		</ItemGroup>
		<ItemGroup>
		<ClInclude Include="..\lib_enc\ivas_stat_enc.h">

lib_com/ivas_prot.h

+34 −4

Original line number	Diff line number	Diff line
		@@ -119,6 +119,19 @@ void destroy_cpe_enc(
		CPE_ENC_HANDLE hCPE /* i/o: CPE encoder structure */
		);

		void ivas_mct_enc_close(
		MCT_ENC_HANDLE hMCT /* i/o: MCT encoder structure */
		);

		#ifdef CORECODER_BITRATE_SWITCHING
		ivas_error ivas_corecoder_enc_reconfig(
		Encoder_Struct st_ivas, / i/o: IVAS encoder structure */
		const int16_t nSCE_old, /* i : number of SCEs in previous frame */
		const int16_t nCPE_old, /* i : number of CPEs in previous frame */
		const int16_t nchan_transport_old /* i : number of TCs in previous frame */
		);
		#endif

		ivas_error ivas_sce_enc(
		Encoder_Struct st_ivas, / i/o: IVAS encoder structure */
		const int16_t sce_id, /* i : SCE # identifier */
		@@ -191,6 +204,9 @@ ivas_error pre_proc_ivas(
		Encoder_State st, / i/o: encoder state structure */
		const int16_t last_element_mode, /* i : last element mode */
		const int32_t element_brate, /* i : element bitrate */
		#ifdef CORECODER_BITRATE_SWITCHING
		const int32_t last_element_brate, /* i : last element bitrate */
		#endif
		const int16_t input_frame, /* i : frame length */
		float old_inp_12k8[], /* i/o: buffer of old input signal */
		float old_inp_16k[], /* i/o: buffer of old input signal @ 16kHz */
		@@ -315,6 +331,21 @@ void ivas_mct_dec_close(
		MCT_DEC_HANDLE hMCT / i/o: MCT decoder structure */
		);

		#ifdef CORECODER_BITRATE_SWITCHING
		ivas_error ivas_corecoder_dec_reconfig(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		const int16_t nSCE_old, /* i : number of SCEs in previous frame */
		const int16_t nCPE_old, /* i : number of CPEs in previous frame */
		const int16_t nchan_transport_old, /* i : number of TCs in previous frame */
		const int16_t sba_dirac_stereo_flag_old /* i : signal stereo output for SBA DirAC in previous frame */
		);

		ivas_error ivas_hp20_dec_reconfig(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		const int16_t nchan_hp20_old /* i : number of HP20 filters in previous frame*/
		);
		#endif

		ivas_error ivas_sce_dec(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		const int16_t sce_id, /* i : SCE # identifier */
		@@ -385,6 +416,9 @@ ivas_error ivas_core_enc(
		float enerBuffer[CPE_CHANNELS][CLDFB_NO_CHANNELS_MAX], /* i : energy buffer */
		float fft_buff[CPE_CHANNELS][2 * L_FFT], /* i : FFT buffer */
		const int16_t tdm_SM_flag, /* i : channel combination scheme flag */
		#ifdef CORECODER_BITRATE_SWITCHING
		const int16_t ivas_format, /* i : IVAS format */
		#endif
		const int16_t flag_16k_smc /* i : flag to indicate if the OL SMC is run at 16 kHz */
		);

		@@ -2737,10 +2771,6 @@ void mctStereoIGF_dec(
		const int16_t bfi /* i : bad frame flag */
		);

		void ivas_mct_enc_close(
		MCT_ENC_HANDLE hMCT /* i/o: MCT encoder structure */
		);

		void ivas_mdct_tcx10_bit_distribution(
		int16_t target_bitsTCX10[NB_DIV], /* o : target bit distribution */
		const int16_t bits_frame_channel, /* i : bits frame channel */