add missing cleanup in ivas_jbm_dec_tc_buffer_playout() compared to... (2df784f3) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/options.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -175,7 +175,7 @@
		#define FIX_ISMRENDERER_HANDLE_DEALLOC /* VA: issue 781: harmonize Deallocation of handle 'hIsmRendererData' */
		#define FIX_782_OSBA_FUNCTION_NAMES /* VA: fix 782: correct OSBA function names */
		#define PARAM_ISM_REFACTOR /* FhG: Issue 768: Refactoring to decouple hDirAC and hParamISM */

		#define FIX_796_MCT_MODE_DIFF_JBM /* FhG: Issue 796: fix differences between JBM and non-JBM fOR MC */

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -412,11 +412,12 @@ ivas_error ivas_jbm_dec_tc(

		if ( st_ivas->mc_mode == MC_MODE_MCT )
		{
		#ifndef FIX_796_MCT_MODE_DIFF_JBM
		if ( st_ivas->hCPE[1]->hCoreCoder[1]->hTcxCfg == NULL ) // ToDo: this is missing in ivas_dec() -> TBV
		{
		st_ivas->hCPE[1]->hCoreCoder[1]->hTcxCfg = st_ivas->hCPE[1]->hCoreCoder[0]->hTcxCfg;
		}

		#endif
		/* LFE channel decoder */
		ivas_lfe_dec( st_ivas->hLFE, st, output_frame, st_ivas->bfi, p_output[LFE_CHANNEL] );

		@@ -436,7 +437,7 @@ ivas_error ivas_jbm_dec_tc(

		if ( st_ivas->transport_config != st_ivas->intern_config && ( st_ivas->intern_config == IVAS_AUDIO_CONFIG_FOA \|\| st_ivas->intern_config == IVAS_AUDIO_CONFIG_HOA2 \|\| st_ivas->intern_config == IVAS_AUDIO_CONFIG_HOA3 ) )
		{
		if ( ( st_ivas->hTransSetup.nchan_out_woLFE + st_ivas->hTransSetup.num_lfe ) >= ( st_ivas->hIntSetup.nchan_out_woLFE + st_ivas->hIntSetup.num_lfe ) ) // ToDo: this is missing in ivas_dec() -> TBV
		if ( ( st_ivas->hTransSetup.nchan_out_woLFE + st_ivas->hTransSetup.num_lfe ) >= ( st_ivas->hIntSetup.nchan_out_woLFE + st_ivas->hIntSetup.num_lfe ) )
		{
		ivas_mc2sba( st_ivas->hTransSetup, p_output, p_output, output_frame, st_ivas->hIntSetup.ambisonics_order, GAIN_LFE );
		}