rename sba_mode into isSBAStereoMode, to avoid confusion with other sba_mode variable (d06cd3c9) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_prot.h

+10 −8

Original line number	Diff line number	Diff line
		@@ -2155,12 +2155,11 @@ void stereo_mdct_core_dec(
		void splitAvailableBits(
		const int16_t total_bits, /* i : total available bits for TCX coding */
		const int16_t split_ratio, /* i : split ratio */
		int16_t bits_ch0, / o : bits for channel 0 */
		int16_t bits_ch1 / o : bits for channel 1 */
		#ifdef LBR_SBA_CORE_CODING_TUNING
		,
		const int16_t sba_mode /* i : signal core coding for sba */
		const int16_t isSBAStereoMode, /* i : signal core coding for sba */
		#endif
		int16_t bits_ch0, / o : bits for channel 0 */
		int16_t bits_ch1 / o : bits for channel 1 */
		);

		int16_t write_stereo_to_bitstream
		@@ -2176,12 +2175,11 @@ void parse_stereo_from_bitstream(
		STEREO_MDCT_DEC_DATA_HANDLE hStereoMdct, /* i/o: MDCT stereo decoder structure */
		Decoder_State *sts, / i/o: decoder state structure */
		const int16_t mct_on, /* i : flag mct block (1) or stereo (0) */
		Decoder_State st0, / i/o: decoder state structure for Bstr */
		int16_t ms_mask[NB_DIV][MAX_SFB] /* o : bandwise MS mask */
		#ifdef LBR_SBA_CORE_CODING_TUNING
		,
		const int16_t sba_mode /* i: flag core coding for sba */
		const int16_t isSBAStereoMode, /* i: flag core coding for sba */
		#endif
		Decoder_State st0, / i/o: decoder state structure for Bstr */
		int16_t ms_mask[NB_DIV][MAX_SFB] /* o : bandwise MS mask */
		);

		void FindSplitRatio(
		@@ -3014,7 +3012,11 @@ void ivas_dirac_param_est_enc(
		----------------------------------------------------------------------------------/

		/! r: SBA format mode /
		#ifdef LBR_SBA_CORE_CODING_TUNING
		SBA_MODE ivas_sba_mode_select(
		#else
		int16_t ivas_sba_mode_select(
		#endif
		const int32_t ivas_total_brate /* i : IVAS total bitrate */
		);

lib_com/ivas_sba_config.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -54,7 +54,7 @@
		-------------------------------------------------------------------/

		/! r: SBA format mode /
		int16_t ivas_sba_mode_select(
		SBA_MODE ivas_sba_mode_select(
		const int32_t ivas_total_brate /* i : IVAS total bitrate */
		)
		{

lib_com/ivas_stereo_mdct_stereo_com.c

+6 −7

Original line number	Diff line number	Diff line
		@@ -46,12 +46,11 @@
		void splitAvailableBits(
		const int16_t total_bits, /* i : total available bits for TCX coding */
		const int16_t split_ratio, /* i : split ratio */
		int16_t bits_ch0, / o : bits for channel 0 */
		int16_t bits_ch1 / o : bits for channel 1 */
		#ifdef LBR_SBA_CORE_CODING_TUNING
		,
		const int16_t sba_mode /* i : signal core coding for sba */
		const int16_t isSBAStereoMode, /* i : signal core coding for sba */
		#endif
		int16_t bits_ch0, / o : bits for channel 0 */
		int16_t bits_ch1 / o : bits for channel 1 */
		)
		{
		assert( split_ratio >= 1 && split_ratio < SMDCT_BITRATE_RATIO_RANGE );
		@@ -59,7 +58,7 @@ void splitAvailableBits(
		bits_ch0 = split_ratio total_bits / SMDCT_BITRATE_RATIO_RANGE;
		#ifdef LBR_SBA_CORE_CODING_TUNING
		/* for SBA mode bias the distribution towards the W channel */
		if ( split_ratio < 7 && sba_mode )
		if ( split_ratio < 7 && isSBAStereoMode )
		{
		bits_ch0 += (int16_t) ( 0.2 *bits_ch0 );
		}

lib_dec/ivas_mct_dec_mct.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -147,12 +147,11 @@ void ivas_mct_dec_mct(
		p_st[0] = sts[hBlock->ch1];
		p_st[1] = sts[hBlock->ch2];

		parse_stereo_from_bitstream( hBlock->hStereoMdct, p_st, 1, sts[0], hBlock->mask
		#ifdef LBR_SBA_CORE_CODING_TUNING
		,
		0
		parse_stereo_from_bitstream( hBlock->hStereoMdct, p_st, 1, 0, sts[0], hBlock->mask );
		#else
		parse_stereo_from_bitstream( hBlock->hStereoMdct, p_st, 1, sts[0], hBlock->mask );
		#endif
		);
		}

		return;

lib_dec/ivas_stat_dec.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -325,7 +325,7 @@ typedef struct stereo_mdct_dec_data_structure
		int16_t noise_seed_common;
		#endif
		#ifdef LBR_SBA_CORE_CODING_TUNING
		int16_t sba_mode;
		int16_t isSBAStereoMode;
		#endif

		} STEREO_MDCT_DEC_DATA, *STEREO_MDCT_DEC_DATA_HANDLE;