Commit adaa09bb authored Jul 24, 2023 by Jan Kiene

accept ISM_FB

parent b9e7d776

lib_com/ivas_cnst.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -313,13 +313,11 @@ typedef enum
		#define MIN_BRATE_SWB_SCE ACELP_9k60 /* min. SCE bitrate where SWB is supported */
		#define MIN_BRATE_SWB_STEREO IVAS_13k2 /* min. stereo bitrate where SWB is supported */
		#define MIN_BRATE_FB_STEREO IVAS_32k /* min. SCE and stereo bitrate where FB is supported */
		#ifdef ISM_FB
		#ifdef ISM_FB_16k4
		#define MIN_BRATE_FB_ISM 16000 /* min. SCE bitrate where FB is supported in ISM format */
		#else
		#define MIN_BRATE_FB_ISM 24000 /* min. SCE bitrate where FB is supported in ISM format */
		#endif
		#endif

		#define MIN_TDM_BRATE_WB_TBE_1k05 12000 /* min. per channel bitrate where WB TBE @1.05 kbps is supported (0.35kbs at lower bitrates) */
		#define MIN_BRATE_WB_TBE_1k05 9650 /* min. per channel bitrate where WB TBE @1.05 kbps is supported (0.35kbs at lower bitrates) */

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -154,7 +154,6 @@
		#define SBA_MODE_CLEANUP_2 /* Dlb : changes part of fix issue #523 for unused signaling bit in SBA SID*/
		#define FIX_137_SID_MD_BITS /* Dlb: Fix issue #137 , SID bitrate mismatch correction */
		#define FIX_470_MASA_JBM_EXT /* Nokia: Issue 470, fix MASA EXT output with JBM */
		#define ISM_FB /* issue 556: change SWB to FB coding in 1ISM at 24.4 kbps */
		#define FIX_558_PLC_DISCONT /* FhG: issue 558: fix discontinuities in DFT Stereo when switching from TCX concealment to ACELP */
		#define FIX_564 /* Nokia: Issue 564: Fix gains in JBM path for SBA with parametric binaural renderer */
		#define FIX_566_2DIR_MASA_384K /* Nokia: Issued 566: Bugfix in 384k MASA metadata encoding of second direction */

lib_dec/ivas_sce_dec.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -123,12 +123,8 @@ ivas_error ivas_sce_dec(
		/* only WB is supported */
		st->bwidth = WB;
		}
		#ifdef ISM_FB
		else if ( ( hSCE->element_brate < MIN_BRATE_FB_STEREO && !st->is_ism_format ) \|\|
		( hSCE->element_brate < MIN_BRATE_FB_ISM && st->is_ism_format ) )
		#else
		else if ( hSCE->element_brate < MIN_BRATE_FB_STEREO )
		#endif
		{
		/* WB and SWB are supported */
		st->bwidth = get_next_indice( st, 1 ) + WB;

lib_enc/bw_detect.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -579,12 +579,8 @@ void set_bw(
		{
		st->bwidth = WB;
		}
		#ifdef ISM_FB
		else if ( st->bwidth > SWB && ( ( element_brate < MIN_BRATE_FB_STEREO && !st->is_ism_format ) \|\|
		( element_brate < MIN_BRATE_FB_ISM && st->is_ism_format ) ) )
		#else
		else if ( element_brate < MIN_BRATE_FB_STEREO && st->bwidth > SWB )
		#endif
		{
		st->bwidth = SWB;
		}

lib_enc/ivas_decision_matrix_enc.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -453,12 +453,8 @@ void ivas_signaling_enc(
		{
		/* only WB is supported */
		}
		#ifdef ISM_FB
		else if ( ( element_brate < MIN_BRATE_FB_STEREO && !st->is_ism_format ) \|\|
		( element_brate < MIN_BRATE_FB_ISM && st->is_ism_format ) )
		#else
		else if ( element_brate < MIN_BRATE_FB_STEREO )
		#endif
		{
		/* WB and SWB are supported */
		ind = st->bwidth - WB;