Merge remote-tracking branch 'remotes/origin/main' into framework_maintenance (4cdda801) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -2894,6 +2894,13 @@ cleanup:
		#ifdef SUPPORT_JBM_TRACEFILE
		JbmTraceFileWriter_close( &jbmTraceWriter );
		#endif
		#ifdef FIX_683_JBM_CLEANUP
		MasaFileWriter_close( &masaWriter );
		for ( int16_t i = 0; i < IVAS_MAX_NUM_OBJECTS; i++ )
		{
		IsmFileWriter_close( &ismWriters[i] );
		}
		#endif

		if ( decodingFailed && error == IVAS_ERR_OK )
		{

lib_com/options.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -240,6 +240,7 @@
		#define FIX_657_REMOVE_EDITING /* Nokia: Remove remaining unused coded related to object editing */
		#define FIX_634_MASA_JBM_UNUSED_PARAMETER /* Nokia: Fix issue 634 by removing the unnecessary argument. */
		#define FIX_675_WB_OMASA /* Nokia: Fix for issue 675 solving the crash in OMASA for WB input */
		#define FIX_683_JBM_CLEANUP /* FhG: Fix for issue 683, add clean up for ISM and MASA file writers */

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

lib_dec/ivas_jbm_dec.c

+35 −6

Original line number	Diff line number	Diff line
		@@ -417,6 +417,27 @@ ivas_error ivas_jbm_dec_tc(
		{
		ivas_mono_downmix_render_passive( st_ivas, output, output_frame );
		}
		else if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL )
		{
		/* sanity check in case of bitrate switching */
		if ( st_ivas->ism_mode != ISM_MASA_MODE_DISC )
		{
		return IVAS_ERROR( IVAS_ERR_INVALID_OUTPUT_FORMAT, "Incorrect output configuration specified for combined MASA and ISM format" );
		}

		/* in case of external rendering, rearrange the channels order */
		mvr2r( output[0], output[MAX_TRANSPORT_CHANNELS - 2], output_frame );
		mvr2r( output[1], output[MAX_TRANSPORT_CHANNELS - 1], output_frame );

		for ( n = 0; n < nchan_transport_ism; n++ )
		{
		mvr2r( output[st_ivas->nchan_transport + n], output[n], output_frame );
		}
		mvr2r( output[MAX_TRANSPORT_CHANNELS - 2], output[n], output_frame );
		mvr2r( output[MAX_TRANSPORT_CHANNELS - 1], output[++n], output_frame );

		ivas_jbm_dec_copy_masa_meta_to_buffer( st_ivas );
		}

		#ifndef FIX_657_REMOVE_EDITING
		/* Set edited object positions, if editing enabled */
		@@ -701,7 +722,12 @@ ivas_error ivas_jbm_dec_feed_tc_to_renderer(
		{
		ivas_jbm_dec_td_renderers_adapt_subframes( st_ivas );
		#ifdef FIX_470_MASA_JBM_EXT
		#ifdef MASA_AND_OBJECTS
		if ( ( st_ivas->ivas_format == MASA_FORMAT \|\| st_ivas->ivas_format == MASA_ISM_FORMAT ) && st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL )
		#else

		if ( st_ivas->ivas_format == MASA_FORMAT && st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL )
		#endif
		{
		ivas_jbm_masa_sf_to_slot_map( st_ivas, n_render_timeslots );
		}
		@@ -1687,6 +1713,8 @@ int16_t ivas_jbm_dec_get_num_tc_channels(
		}
		#ifdef MASA_AND_OBJECTS
		else if ( st_ivas->ivas_format == MASA_ISM_FORMAT )
		{
		if ( st_ivas->hDecoderConfig->output_config != AUDIO_CONFIG_EXTERNAL )
		{
		if ( st_ivas->ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ \|\| st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ )
		{
		@@ -1697,6 +1725,7 @@ int16_t ivas_jbm_dec_get_num_tc_channels(
		num_tc += st_ivas->nchan_ism;
		}
		}
		}
		#endif
		else if ( st_ivas->ivas_format == MC_FORMAT )
		{

work_in_progress/IVAS-MP-HOA.zip

deleted100644 → 0LFS

−131 B

File deleted.

View file

work_in_progress/readme.txt

deleted100644 → 0

+0 −38

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

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

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


		Note: Contributions found in the directory work_in_progress are work in
		progress, lacking integration, evaluation and decision.

		The delta is relative to IVAS_Pre-Release_Float_ANSI-C__2022_02_06.zip,
		as published on https://immersivevoiceandaudio.org.