Commit bee35aa7 authored Mar 07, 2025 by vaclav

port FIX_959_MASA_LINEAR_REND

parent 2e715f2e

lib_com/options.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -181,6 +181,7 @@
		#define SPLIT_REND_POSE_CORRECTION_UNUSED_BITS
		#define ISAR_BITSTREAM_UPDATE_LC3PLUS /* FhG: Multiple improvements to the ISAR bitstream when LC3plus is used. See MR 1456 for details. */
		#endif
		#define FIX_959_MASA_LINEAR_REND /* VA: issue 959: remove unused calling of ivas_sba_linear_renderer() in MASA rendering */

		/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_jbm_dec.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -2173,6 +2173,7 @@ ivas_error ivas_jbm_dec_render_fx(
		}
		ELSE IF( EQ_32( st_ivas->ivas_format, MASA_FORMAT ) )
		{
		#ifndef FIX_959_MASA_LINEAR_REND
		IF( EQ_32( st_ivas->renderer_type, RENDERER_SBA_LINEAR_DEC ) )
		{
		*nSamplesRendered = s_min( st_ivas->hTcBuffer->n_samples_available, nSamplesAskedLocal );
		@@ -2187,6 +2188,9 @@ ivas_error ivas_jbm_dec_render_fx(
		}
		}
		ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_DIRAC ) )
		#else
		IF( EQ_32( st_ivas->renderer_type, RENDERER_DIRAC ) )
		#endif
		{
		ivas_dirac_dec_render_fx( st_ivas, nchan_remapped, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output_fx );
		}

lib_dec/ivas_output_config.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -447,7 +447,11 @@ void ivas_renderer_select(
		*internal_config = IVAS_AUDIO_CONFIG_HOA3;
		move16();
		}
		#ifdef FIX_959_MASA_LINEAR_REND
		*renderer_type = RENDERER_SBA_LINEAR_DEC;
		#else
		st_ivas->renderer_type = RENDERER_SBA_LINEAR_DEC;
		#endif
		move16();
		}
		ELSE IF( ( EQ_32( ivas_format, MASA_FORMAT ) && EQ_32( output_config, IVAS_AUDIO_CONFIG_MONO ) && EQ_16( st_ivas->nchan_transport, 1 ) ) \|\|