Commit 9061faff authored Jun 15, 2023 by vaclav

issue 556: change SWB to FB coding in 1ISM at 24.4 kbps; under ISM_FB

parent db55ae08

lib_com/ivas_cnst.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -310,6 +310,9 @@ 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
		#define MIN_BRATE_FB_STEREO_ISM 24000 /* min. SCE bitrate where FB is supported in ISM format */
		#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

+1 −5

Original line number	Diff line number	Diff line
		@@ -157,11 +157,7 @@

		#define FIX_529_BWD_ISSUE /* VA: issue 529: fix Bandwidth Detector not working reliably for Music and Generic Audio */




		#define ISM_16_KHZ_CORE // 1ISM 16.4 kbps: change starting bitrate of core-coder with 16kHz internal sampling rate from 17 kbps to 15.9 kbps
		#define ISM_FB // 1ISM 24.4 kbps: change SWB to FB coding
		#define ISM_FB /* issue 556: change SWB to FB coding in 1ISM at 24.4 kbps */

lib_dec/ivas_sce_dec.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -123,7 +123,11 @@ ivas_error ivas_sce_dec(
		/* only WB is supported */
		st->bwidth = WB;
		}
		#ifdef ISM_FB
		else if ( ( hSCE->element_brate < MIN_BRATE_FB_STEREO_ISM && st_ivas->ism_mode != ISM_MODE_NONE ) \|\| ( hSCE->element_brate < MIN_BRATE_FB_STEREO && st_ivas->ism_mode == ISM_MODE_NONE ) )
		#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

+4 −0

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

lib_enc/ivas_decision_matrix_enc.c

+4 −0

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