Merge branch 'main' into basop-2575-regression-with-nonbe_fix_issue_2518 (fa654d25) · Commits · SA4 / Audio / IVAS BASOP

Workspace_msvc/lib_dec.vcxproj

+0 −1

Original line number	Diff line number	Diff line
		@@ -321,7 +321,6 @@
		<ClInclude Include="..\lib_dec\jbm_jb4_inputbuffer.h" />
		<ClInclude Include="..\lib_dec\jbm_jb4_jmf.h" />
		<ClInclude Include="..\lib_dec\jbm_pcmdsp_apa.h" />
		<ClInclude Include="..\lib_dec\jbm_pcmdsp_fifo.h" />
		<ClInclude Include="..\lib_dec\jbm_pcmdsp_similarityestimation.h" />
		<ClInclude Include="..\lib_dec\jbm_pcmdsp_window.h" />
		<ClInclude Include="..\lib_dec\lib_dec.h" />

Workspace_msvc/lib_dec.vcxproj.filters

+0 −3

Original line number	Diff line number	Diff line
		@@ -515,9 +515,6 @@
		<ClInclude Include="..\lib_dec\jbm_pcmdsp_apa.h">
		<Filter>decoder_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_dec\jbm_pcmdsp_fifo.h">
		<Filter>decoder_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_dec\jbm_pcmdsp_similarityestimation.h">
		<Filter>decoder_h</Filter>
		</ClInclude>

lib_com/options.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -104,8 +104,9 @@
		#define FIX_2095_REMOVE_UNUSED_ISAR_TABLES /* Dolby: remove unused ISAR */
		#define FIX_BASOP_2560_STEREO_DFT_DEC_RESET /* FhG: BASOP issue 2560: align reset of hStereoDft->res_gains_ind_fx[][] between BASOP and float */
		#define HARMONIZE_2539_cng_energy /* FhG: basop issue 2539: harmonize cng_energy with its ivas derivate */
		#define FIX_1585_ASAN_FORMAT_SW_ALT /* VA: float issue 1585: alternative fix memory leaks with format switching */
		#define FIX_1585_ASAN_FORMAT_SW_ALT /* VA,FhG: float issues 1585,1593: alternative fix memory leaks with format switching */
		#define FIX_BASOP_2573_RF_MODE_UPDATE /* FhG: BASOP issue 2573: remove duplicated update of rf_mode parameters from evs_enc_fx(); was already done in updt_enc_common_fx() */
		#define FIX_2570_BUF_OVFL /* Orange: basop issue 2570: global-buffer-overflow in lib_rend/ivas_objectRenderer_sources_fx.c */

		/* #################### End BE switches ################################## */

lib_dec/ivas_init_dec_fx.c

+3 −6

Original line number	Diff line number	Diff line
		@@ -2765,12 +2765,6 @@ ivas_error ivas_init_decoder_fx(
		set32_fx( st_ivas->mem_hp20_out_fx[i], 0, L_HP20_MEM + 2 );
		}

		#ifdef FIX_1585_ASAN_FORMAT_SW_ALT
		FOR( ; i < MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS; i++ )
		{
		st_ivas->mem_hp20_out_fx[i] = NULL;
		}
		#endif

		/-------------------------------------------------------------------
		* Allocate and initialize rendering handles
		@@ -3467,6 +3461,9 @@ void ivas_initialize_handles_dec(
		FOR( i = 0; i < MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS; i++ )
		{
		st_ivas->p_output_fx[i] = NULL;
		#ifdef FIX_1585_ASAN_FORMAT_SW_ALT
		st_ivas->mem_hp20_out_fx[i] = NULL;
		#endif
		}

		return;

lib_dec/jbm_pcmdsp_fifo.h

deleted100644 → 0

+0 −44

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

		(C) 2022-2026 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.

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

		/*====================================================================================
		EVS Codec 3GPP TS26.452 Nov 04, 2021. Version 16.4.0
		====================================================================================*/

		/! @file jbm_pcmdsp_fifo.h Ringbuffer (FIFO) with fixed capacity for audio samples. /

		#ifndef JBM_PCMDSP_FIFO_H
		#define JBM_PCMDSP_FIFO_H JBM_PCMDSP_FIFO_H

		#include <stdint.h>
		#include "options.h"
		#endif /* JBM_PCMDSP_FIFO_H */