Merge branch 'main' of ssh://forge.3gpp.org:29419/sa4/audio/ivas-basop into... (7c7af934) · Commits · SA4 / Audio / IVAS BASOP

Workspace_msvc/lib_com.vcxproj

+1 −0

Original line number	Diff line number	Diff line
		@@ -212,6 +212,7 @@
		<ClCompile Include="..\lib_com\ivas_mdct_imdct_fx.c" />
		<ClCompile Include="..\lib_com\ivas_mdft_imdft_fx.c" />
		<ClCompile Include="..\lib_com\ivas_omasa_com_fx.c" />
		<ClCompile Include="..\lib_com\ivas_osba_com_fx.c" />
		<ClCompile Include="..\lib_com\ivas_pca_tools_fx.c" />
		<ClCompile Include="..\lib_com\ivas_qmetadata_com_fx.c" />
		<ClCompile Include="..\lib_com\ivas_qspherical_com_fx.c" />

Workspace_msvc/lib_com.vcxproj.filters

+1 −0

Original line number	Diff line number	Diff line
		@@ -512,6 +512,7 @@
		<Filter>common_ivas_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_com\ivas_rotation_com.c">
		<ClCompile Include="..\lib_com\ivas_osba_com_fx.c">
		<Filter>common_ivas_c</Filter>
		</ClCompile>
		</ItemGroup>

apps/decoder.c

+13 −1

Original line number	Diff line number	Diff line
		@@ -488,18 +488,30 @@ int main(
		goto cleanup;
		}

		#ifdef CONF_DISTATT
		if ( ( error = RenderConfigReader_getDirectivity( renderConfigReader, arg.directivityPatternId, renderConfig.directivity_fx ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = RenderConfigReader_getDirectivity( renderConfigReader, arg.directivityPatternId, renderConfig.directivity ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "Failed to get directivity patterns for one or more of IDs: %d %d %d %d\n\n", arg.directivityPatternId[0], arg.directivityPatternId[1], arg.directivityPatternId[2], arg.directivityPatternId[3] );
		goto cleanup;
		}
		#ifndef CONF_DISTATT
		FOR( Word16 i = 0; i < 4; i++ )
		{
		renderConfig.directivity_fx[i * 3] = (Word16) ( renderConfig.directivity[i * 3] * ( 1u << 6 ) );
		renderConfig.directivity_fx[i * 3 + 1] = (Word16) ( renderConfig.directivity[i * 3 + 1] * ( 1u << 6 ) );
		renderConfig.directivity_fx[i * 3 + 2] = (Word16) ( renderConfig.directivity[i * 3 + 2] * ( ( 1u << 15 ) - 1 ) );
		}

		#endif
		#ifdef CONF_DISTATT
		if ( ( error = RenderConfigReader_getDistanceAttenuation( renderConfigReader, renderConfig.distAtt_fx ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Failed to get Distance Attenuation \n\n" );
		goto cleanup;
		}
		#endif
		if ( ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\|
		arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )
		{

lib_com/common_api_types.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -347,6 +347,10 @@ typedef struct _IVAS_RENDER_CONFIG
		ISAR_SPLIT_REND_CONFIG_DATA split_rend_config;
		float directivity[IVAS_MAX_NUM_OBJECTS * 3];
		Word16 directivity_fx[IVAS_MAX_NUM_OBJECTS * 3]; // has the following q-factor pattern: {6, 6, 15, 6, 6, 15, 6, 6, 15, 6, 6, 15}
		#ifdef CONF_DISTATT
		float distAtt[3];
		Word32 distAtt_fx[3]; /* {Q27, Q30, Q30} */
		#endif
		} IVAS_RENDER_CONFIG_DATA, *IVAS_RENDER_CONFIG_HANDLE;

		typedef struct

lib_com/ivas_osba_com_fx.c

0 → 100644

+73 −0

Original line number	Diff line number	Diff line
		/******************************************************************************************************

		(C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
		Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
		Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
		Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
		contributors to this repository. All Rights Reserved.

		This software is protected by copyright law and by international treaties.
		The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
		Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
		Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
		Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
		contributors to this repository retain full ownership rights in their respective contributions in
		the software. This notice grants no license of any kind, including but not limited to patent
		license, nor is any license granted by implication, estoppel or otherwise.

		Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
		contributions.

		This software is provided "AS IS", without any express or implied warranties. The software is in the
		development stage. It is intended exclusively for experts who have experience with such software and
		solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
		and fitness for a particular purpose are hereby disclaimed and excluded.

		Any dispute, controversy or claim arising under or in relation to providing this software shall be
		submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
		accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
		the United Nations Convention on Contracts on the International Sales of Goods.

		*******************************************************************************************************/

		#include "options.h"
		#include "ivas_cnst.h"
		#include "ivas_prot_fx.h"
		#include "prot_fx.h"
		#include "ivas_rom_com.h"
		#ifdef DEBUGGING
		#include "debug.h"
		#endif

		/! r : ISM format mode /
		ISM_MODE ivas_osba_ism_mode_select(
		const Word32 ivas_total_brate, /* i : IVAS total bitrate */
		const Word16 nchan_ism /* i : number of input ISM's */
		)
		{
		ISM_MODE ism_mode = ISM_MODE_NONE;

		SWITCH( nchan_ism )
		{
		case 1:
		if ( GE_32( ivas_total_brate, IVAS_96k ) )
		{
		ism_mode = ISM_SBA_MODE_DISC;
		move32();
		}
		BREAK;


		case 2:
		case 3:
		case 4:
		if ( GE_32( ivas_total_brate, IVAS_128k ) )
		{
		ism_mode = ISM_SBA_MODE_DISC;
		move32();
		}
		BREAK;
		}

		return ism_mode;
		}