Commit dd428be2 authored Dec 14, 2023 by vaclav

fix merge

parent 067a6111

lib_dec/ivas_dec.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -96,6 +96,14 @@ ivas_error ivas_dec(
		}
		}

		if ( !st_ivas->hDecoderConfig->Opt_tsm )
		{
		for ( n = 0; n < ivas_get_nchan_buffers_dec( st_ivas, st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate ); n++ )
		{
		st_ivas->hTcBuffer->tc[n] = st_ivas->p_output_f[n];
		}
		}

		/----------------------------------------------------------------
		* Decoding + pre-rendering
		----------------------------------------------------------------/

lib_dec/ivas_jbm_dec.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -774,7 +774,6 @@ int16_t ivas_dec_get_num_tc_channels(
		}
		if ( st_ivas->ivas_format == SBA_FORMAT )
		{

		if ( num_tc == 3 )
		{
		num_tc++;
		@@ -801,6 +800,7 @@ int16_t ivas_dec_get_num_tc_channels(
		{
		num_tc = CPE_CHANNELS;
		}

		#ifdef NONBE_FIX_926_OSBA_DECODER_CRASH_PLANAR_SBA
		if ( num_tc == 3 )
		#else