Commit 762344f6 authored Jul 04, 2024 by vaclav

Merge remote-tracking branch 'remotes/origin/main' into 1138-error-printouts-in-sba-ext-output

parents 4d8f69b0 960148be

Workspace_msvc/lib_util.vcxproj

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -101,6 +101,7 @@
	</ItemDefinitionGroup>		</ItemDefinitionGroup>
	<ItemGroup>		<ItemGroup>
	<ClCompile Include="..\lib_util\aeid_file_reader.c" />		<ClCompile Include="..\lib_util\aeid_file_reader.c" />
			<ClCompile Include="..\lib_util\ambi_convert.c" />
	<ClCompile Include="..\lib_util\audio_file_reader.c" />		<ClCompile Include="..\lib_util\audio_file_reader.c" />
	<ClCompile Include="..\lib_util\audio_file_writer.c" />		<ClCompile Include="..\lib_util\audio_file_writer.c" />
	<ClCompile Include="..\lib_util\bitstream_reader.c" />		<ClCompile Include="..\lib_util\bitstream_reader.c" />
	@@ -128,6 +129,7 @@
	</ItemGroup>		</ItemGroup>
	<ItemGroup>		<ItemGroup>
	<ClInclude Include="..\lib_util\aeid_file_reader.h" />		<ClInclude Include="..\lib_util\aeid_file_reader.h" />
			<ClInclude Include="..\lib_util\ambi_convert.h" />
	<ClInclude Include="..\lib_util\audio_file_reader.h" />		<ClInclude Include="..\lib_util\audio_file_reader.h" />
	<ClInclude Include="..\lib_util\audio_file_writer.h" />		<ClInclude Include="..\lib_util\audio_file_writer.h" />
	<ClInclude Include="..\lib_util\bitstream_reader.h" />		<ClInclude Include="..\lib_util\bitstream_reader.h" />

lib_com/ivas_cnst.h

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -1289,14 +1289,8 @@ typedef enum
	#define LFE_CHANNEL 3		#define LFE_CHANNEL 3

	#define MIN_LFE_NRG 0.5f		#define MIN_LFE_NRG 0.5f
	#ifdef ADJUST_MCT_CHANNELS_MAX
	#define MCT_MAX_CHANNELS 11 /* == 7.1.4 LS channels without the LFE channel */		#define MCT_MAX_CHANNELS 11 /* == 7.1.4 LS channels without the LFE channel */
	#define MCT_MAX_BLOCKS ( ( MCT_MAX_CHANNELS + 1 ) / CPE_CHANNELS ) /* max. number of channel pairs (MCT_MAX_CHANNELS/2) within MCT*/		#define MCT_MAX_BLOCKS ( ( MCT_MAX_CHANNELS + 1 ) / CPE_CHANNELS ) /* max. number of channel pairs (MCT_MAX_CHANNELS/2) within MCT*/
	#else
	#define MCT_MAX_CHANNELS 12
	#define MCT_MAX_BLOCKS ( MCT_MAX_CHANNELS / CPE_CHANNELS ) /* max. number of channel pairs (MCT_MAX_CHANNELS/2) within MCT*/
	#define MAX_NUM_DATA max( MCT_MAX_CHANNELS, 4 )
	#endif

	#define NBBITS_MCT_RATIO 4		#define NBBITS_MCT_RATIO 4
	#define BITRATE_MCT_RATIO_RANGE ( 1 << NBBITS_MCT_RATIO ) /* Range of the coded bitrate distribution ratio */		#define BITRATE_MCT_RATIO_RANGE ( 1 << NBBITS_MCT_RATIO ) /* Range of the coded bitrate distribution ratio */

lib_com/ivas_prot.h

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -84,13 +84,9 @@ void ivas_write_format(
	void ivas_write_format_sid(		void ivas_write_format_sid(
	const IVAS_FORMAT ivas_format, /* i : IVAS format */		const IVAS_FORMAT ivas_format, /* i : IVAS format */
	const int16_t element_mode, /* i : element bitrate */		const int16_t element_mode, /* i : element bitrate */
	#ifdef NONBE_FIX_1052_SBA_EXT_FIX
	BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */		BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
	const int16_t sba_order, /* i : Ambisonic (SBA) order */		const int16_t sba_order, /* i : Ambisonic (SBA) order */
	const int16_t sba_planar /* i : SBA planar flag */		const int16_t sba_planar /* i : SBA planar flag */
	#else
	BSTR_ENC_HANDLE hBstr /* i/o: encoder bitstream handle */
	#endif
	);		);

	ivas_error create_sce_enc(		ivas_error create_sce_enc(

lib_com/ivas_rom_com.c

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2471,13 +2471,11 @@ const uint16_t ivas_param_mc_sym_freq_ild_delta_combined_48_16bits[2 * PARAM_MC_
	* MASA ROM tables		* MASA ROM tables
	----------------------------------------------------------------------------------/		----------------------------------------------------------------------------------/

	#ifdef FIX_1121_MASA_DESCRIPTOR
	const uint8_t ivasmasaFormatDescriptor[8] =		const uint8_t ivasmasaFormatDescriptor[8] =
	{		{
	0x49, 0x56, 0x41, 0x53, 0x4D, 0x41, 0x53, 0x41 /* "IVASMASA" */		0x49, 0x56, 0x41, 0x53, 0x4D, 0x41, 0x53, 0x41 /* "IVASMASA" */
	};		};

	#endif
	const float diffuseness_reconstructions_hr[HR_MASA_ER_LEVELS] =		const float diffuseness_reconstructions_hr[HR_MASA_ER_LEVELS] =
	{		{
	0.00f,		0.00f,

lib_com/ivas_rom_com.h

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -264,10 +264,8 @@ extern const uint16_t ivas_param_mc_sym_freq_icc_delta_combined_48_16bits[2 * PA
	* MASA ROM tables		* MASA ROM tables
	----------------------------------------------------------------------------------/		----------------------------------------------------------------------------------/

	#ifdef FIX_1121_MASA_DESCRIPTOR
	extern const uint8_t ivasmasaFormatDescriptor[8]; /* "IVASMASA" */		extern const uint8_t ivasmasaFormatDescriptor[8]; /* "IVASMASA" */

	#endif
	extern const int16_t bits_direction_masa[DIRAC_DIFFUSE_LEVELS];		extern const int16_t bits_direction_masa[DIRAC_DIFFUSE_LEVELS];
	extern const int16_t no_theta_masa[NO_SPHERICAL_GRIDS - 2];		extern const int16_t no_theta_masa[NO_SPHERICAL_GRIDS - 2];
	extern const int16_t no_phi_masa[NO_SPHERICAL_GRIDS][MAX_NO_THETA];		extern const int16_t no_phi_masa[NO_SPHERICAL_GRIDS][MAX_NO_THETA];