[cleanup] accept NONBE_1200_ISM_JBM_BRATE_SW_FLUSH (0260823d) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -170,7 +170,6 @@
		/* all switches in this category should start with "NONBE_" */

		#define NONBE_FIX_1176_OSBA_REVERB_JBM_ASAN_ERROR /* Ericsson: Issue 1176, fix in TDREND_firfilt for subframes shorter than the filter length */
		#define NONBE_1200_ISM_JBM_BRATE_SW_FLUSH /* VA: issue 1200: fix bug in renderer flush in ISM JBM bitrate switching */
		#define NONBE_FIX_1205_TD_STEREO_MOD_CT /* VA: fix mismatch of coder_type (mod_ct) btw. TD stereo encoder and decoder */
		#define NONBE_1203_MDCT2DFT_SWITCHING /* VA: issue 1203: fix severe artifacts during MDCT to DFT stereo switching when MDCT ITD is not used */
		#define NONBE_1220_OMASA_JBM_BRATE_SW_FLUSH /* VA: issue 1220: fix bug in renderer flush in OMASA 1ISM JBM bitrate switching */

lib_dec/ivas_ism_dec.c

+0 −18

Original line number	Diff line number	Diff line
		@@ -111,9 +111,6 @@ static ivas_error ivas_ism_bitrate_switching_dec(
		ivas_output_init( &( st_ivas->hIntSetup ), st_ivas->hDecoderConfig->output_config );
		}

		#ifndef NONBE_1200_ISM_JBM_BRATE_SW_FLUSH
		{
		#endif
		/* transfer subframe info from DirAC or ParamMC to central tc buffer */
		/* only do this if we are not having done everything already in the TC decoding part and having only played out from the TC buffer */
		if ( last_ism_mode == ISM_MODE_PARAM && st_ivas->hSpatParamRendCom != NULL && st_ivas->hTcBuffer->tc_buffer_mode != TC_BUFFER_MODE_BUFFER )
		@@ -141,9 +138,6 @@ static ivas_error ivas_ism_bitrate_switching_dec(
		return error;
		}
		}
		#ifndef NONBE_1200_ISM_JBM_BRATE_SW_FLUSH
		}
		#endif

		if ( st_ivas->ism_mode != last_ism_mode )
		{
		@@ -293,26 +287,17 @@ static ivas_error ivas_ism_bitrate_switching_dec(
		* floating-point output audio buffers
		-----------------------------------------------------------------/

		#ifndef NONBE_1200_ISM_JBM_BRATE_SW_FLUSH
		{
		#endif
		nchan_out_buff = ivas_get_nchan_buffers_dec( st_ivas, -1, -1 );

		if ( ( error = ivas_output_buff_dec( st_ivas->p_output_f, nchan_out_buff_old, nchan_out_buff ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		#ifndef NONBE_1200_ISM_JBM_BRATE_SW_FLUSH
		}
		#endif

		/-----------------------------------------------------------------
		* JBM TC buffers
		-----------------------------------------------------------------/

		#ifndef NONBE_1200_ISM_JBM_BRATE_SW_FLUSH
		{
		#endif
		int16_t tc_nchan_full_new;
		DECODER_TC_BUFFER_HANDLE hTcBuffer;

		@@ -348,9 +333,6 @@ static ivas_error ivas_ism_bitrate_switching_dec(

		mvs2s( st_ivas->hTcBuffer->subframe_nbslots, st_ivas->hSpatParamRendCom->subframe_nbslots, MAX_JBM_SUBFRAMES_5MS );
		}
		#ifndef NONBE_1200_ISM_JBM_BRATE_SW_FLUSH
		}
		#endif

		return IVAS_ERR_OK;
		}

lib_dec/lib_dec.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -1000,11 +1000,7 @@ ivas_error IVAS_DEC_ReadFormat(
		/* JBM: when granularity goes down (e.g. Discrete ISM with TD Obj Renderer -> ParamISM with binaural fastconv
		render what still fits in the new granularity */
		int16_t tc_granularity_new = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, st_ivas->ivas_format, st_ivas->mc_mode, st_ivas->hDecoderConfig->output_Fs );
		#ifdef NONBE_1200_ISM_JBM_BRATE_SW_FLUSH
		st_ivas->nchan_transport = nchan_transport_old;
		#else
		// st_ivas->nchan_transport = nchan_transport_old; // ToDo: temporarily deactivated to keep FIX_HRTF_LOAD bit-exact but this is likely a bug in the main -> see issue #1200
		#endif
		if ( tc_granularity_new < st_ivas->hTcBuffer->n_samples_granularity )
		{
		if ( ( error = ivas_jbm_dec_flush_renderer( st_ivas, tc_granularity_new, renderer_type_old, intern_config_old, &st_ivas->hIntSetup, mc_mode_old, ism_mode_old, &hIvasDec->nSamplesFlushed, pcm_type_API_to_internal( hIvasDec->pcmType ), hIvasDec->flushbuffer ) ) != IVAS_ERR_OK )