[cleanup] accept NONBE_FIX_1052_SBA_EXT (9259a3eb) · Commits · SA4 / Audio / IVAS BASOP

lib_com/ivas_prot.h

+0 −8

Original line number	Diff line number	Diff line
		@@ -3241,9 +3241,7 @@ void ivas_qmetadata_enc_sid_encode(
		BSTR_ENC_HANDLE hMetaData, /* i/o: metadata bitstream handle */
		IVAS_QMETADATA q_metadata, / i/o: metadata handle */
		const int16_t masa_sid_descriptor, /* i : description of MASA SID coding structure*/
		#ifdef NONBE_FIX_1052_SBA_EXT
		const int16_t nchan_transport, /* i : number of transport channels */
		#endif
		const int16_t ivas_format /* i : ivas format */
		);

		@@ -3547,12 +3545,10 @@ int16_t ivas_sba_get_nchan_metadata(
		const int32_t ivas_total_brate /* i : IVAS total bitrate */
		);

		#ifdef NONBE_FIX_1052_SBA_EXT
		/! r: number of bits in SBA SID frame /
		int16_t ivas_sba_spar_sid_bitlen(
		const int16_t nchan_transport /* i : number of transport channels */
		);
		#endif

		void ivas_sba_get_spar_hoa_ch_ind(
		const int16_t num_md_chs, /* i : number of MD channels */
		@@ -3655,9 +3651,7 @@ ivas_error ivas_dirac_enc(
		const int16_t input_frame, /* i : input frame length */
		const int16_t dtx_vad, /* i : DTX vad flag */
		const IVAS_FORMAT ivas_format, /* i : ivas format */
		#ifdef NONBE_FIX_1052_SBA_EXT
		const int16_t nchan_transport, /* i : number of transport channels */
		#endif
		const int16_t hodirac_flag /* i : hodirac flag */
		);

		@@ -3715,9 +3709,7 @@ void ivas_dirac_dec_read_BS(
		int16_t nb_bits, / o : number of bits read */
		const int16_t last_bit_pos, /* i : last read bitstream position */
		const int16_t hodirac_flag, /* i : flag to indicate HO-DirAC mode */
		#ifdef NONBE_FIX_1052_SBA_EXT
		const int16_t nchan_transport, /* i : number of transport channels */
		#endif
		int16_t dirac_to_spar_md_bands / o : DirAC->SPAR MD bands */
		);

lib_com/ivas_sba_config.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -159,7 +159,6 @@ int16_t ivas_sba_get_nchan(
		}


		#ifdef NONBE_FIX_1052_SBA_EXT
		/-------------------------------------------------------------------
		* ivas_sba_spar_sid_bitlen()
		*
		@@ -181,7 +180,6 @@ int16_t ivas_sba_spar_sid_bitlen(

		return num_bits;
		}
		#endif

		/-------------------------------------------------------------------
		* ivas_sba_get_nchan_metadata()

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -157,7 +157,6 @@
		/* #################### Start BASOP porting switches ############################ */

		#define FIX_1129_EXT_REND_OUTPUT_HIGH /* Philips: issue 1129: External renderer BINAURAL_ROOM_REVERB format output level too high compared to internal rendering output */
		#define NONBE_FIX_1052_SBA_EXT /* Dlb: SBA external output support */
		#define FIX_1082_INSTRUM_FAILED_LC3PLUS /* VoiceAge: issue 1082: fix ambiguous syntax in LC3Plus code leading to fails of instrumented builds */
		#define NONBE_FIX_1074_NOBJ_SIGNAL_OMASA_LBR /* Nok: issue 1074 fixing number of objects signaling in OMASA low rate */
		#define FIX_1222_OMASA_DEC_CHANNEL_BUFFERS /* VA: issue 1222: Reduction of the number of channel buffers in OMASA decoder */

lib_dec/ivas_dirac_dec.c

+0 −14

Original line number	Diff line number	Diff line
		@@ -973,9 +973,7 @@ void ivas_dirac_dec_read_BS(
		int16_t nb_bits, / o : number of bits read */
		const int16_t last_bit_pos, /* i : last read bitstream position */
		const int16_t hodirac_flag, /* i : flag to indicate HO-DirAC mode */
		#ifdef NONBE_FIX_1052_SBA_EXT
		const int16_t nchan_transport, /* i : number of transport channels */
		#endif
		int16_t dirac_to_spar_md_bands / o : DirAC->SPAR MD bands */
		)
		{
		@@ -1009,11 +1007,7 @@ void ivas_dirac_dec_read_BS(
		}
		}

		#ifdef NONBE_FIX_1052_SBA_EXT
		*nb_bits += ivas_qmetadata_dec_sid_decode( hQMetaData, st->bit_stream, &( st->next_bit_pos ), nchan_transport, NULL, SBA_FORMAT );
		#else
		*nb_bits += ivas_qmetadata_dec_sid_decode( hQMetaData, st->bit_stream, &( st->next_bit_pos ), 0, NULL, SBA_FORMAT );
		#endif
		for ( i = 0; i < MAX_PARAM_SPATIAL_SUBFRAMES; i++ )
		{
		hQMetaData->q_direction[0].band_data[orig_dirac_bands - 1].azimuth[i] = hQMetaData->q_direction[0].band_data[1].azimuth[0];
		@@ -1061,11 +1055,7 @@ void ivas_dirac_dec_read_BS(
		next_bit_pos_orig = st->next_bit_pos;

		/* subtract mode signaling bits, since bitstream was moved after mode reading */
		#ifdef NONBE_FIX_1052_SBA_EXT
		st->next_bit_pos = (int16_t) ( ivas_total_brate / FRAMES_PER_SEC - 1 - SID_FORMAT_NBITS - SBA_PLANAR_BITS - SBA_ORDER_BITS );
		#else
		st->next_bit_pos = (int16_t) ( ivas_total_brate / FRAMES_PER_SEC - 1 - SID_FORMAT_NBITS );
		#endif

		/* 1 bit flag for signaling metadata to read */
		b = st->bit_stream[( st->next_bit_pos )--];
		@@ -1087,11 +1077,7 @@ void ivas_dirac_dec_read_BS(
		}


		#ifdef NONBE_FIX_1052_SBA_EXT
		*nb_bits += ivas_qmetadata_dec_sid_decode( hQMetaData, st->bit_stream, &( st->next_bit_pos ), nchan_transport, NULL, SBA_FORMAT );
		#else
		*nb_bits += ivas_qmetadata_dec_sid_decode( hQMetaData, st->bit_stream, &( st->next_bit_pos ), 0, NULL, SBA_FORMAT );
		#endif

		for ( i = 0; i < MAX_PARAM_SPATIAL_SUBFRAMES; i++ )
		{

lib_dec/ivas_init_dec.c

+0 −10

Original line number	Diff line number	Diff line
		@@ -54,16 +54,13 @@ static ivas_error ivas_read_format( Decoder_Struct st_ivas, int16_t num_bits_r

		static ivas_error doSanityChecks_IVAS( Decoder_Struct *st_ivas );

		#ifdef NONBE_FIX_1052_SBA_EXT
		#ifdef NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER
		static AUDIO_CONFIG ivas_set_audio_config_from_sba_order( const int16_t sba_order );
		#else
		static AUDIO_CONFIG ivas_set_output_config_from_sba_order( const int16_t sba_order );
		#endif
		#endif


		#ifdef NONBE_FIX_1052_SBA_EXT
		#ifdef NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER
		/-------------------------------------------------------------------
		* ivas_set_audio_config_from_sba_order()
		@@ -105,7 +102,6 @@ static AUDIO_CONFIG ivas_set_output_config_from_sba_order( const int16_t sba_ord

		return output_config;
		}
		#endif


		#ifdef FIX_1209_SID_SIGNALING
		@@ -561,7 +557,6 @@ ivas_error ivas_dec_setup(
		st_ivas->sba_order += 2 * st_ivas->bit_stream[num_bits_read];

		#ifndef NONBE_FIX_1052_SBA_EXT_FIX
		#ifdef NONBE_FIX_1052_SBA_EXT
		if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL )
		{
		#ifdef NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER
		@@ -571,7 +566,6 @@ ivas_error ivas_dec_setup(
		#endif
		st_ivas->hDecoderConfig->nchan_out = audioCfg2channels( st_ivas->hDecoderConfig->output_config );
		}
		#endif
		#endif
		num_bits_read += SBA_ORDER_BITS;
		if ( st_ivas->ini_frame > 0 && ivas_total_brate != st_ivas->last_active_ivas_total_brate && ivas_total_brate > IVAS_SID_5k2 )
		@@ -821,7 +815,6 @@ ivas_error ivas_dec_setup(
		}

		#ifndef NONBE_FIX_1052_SBA_EXT_FIX
		#ifdef NONBE_FIX_1052_SBA_EXT
		if ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL )
		{
		#ifdef NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER
		@@ -831,7 +824,6 @@ ivas_error ivas_dec_setup(
		#endif
		st_ivas->hDecoderConfig->nchan_out = audioCfg2channels( st_ivas->hDecoderConfig->output_config );
		}
		#endif
		#endif
		if ( st_ivas->ini_frame > 0 && st_ivas->ivas_format == SBA_FORMAT )
		{
		@@ -1092,7 +1084,6 @@ static ivas_error ivas_read_format(
		if ( st_ivas->ivas_format == SBA_FORMAT )
		{

		#ifdef NONBE_FIX_1052_SBA_EXT
		/* read Ambisonic (SBA) planar flag */
		st_ivas->sba_planar = st_ivas->bit_stream[*num_bits_read];
		*num_bits_read += SBA_PLANAR_BITS;
		@@ -1101,7 +1092,6 @@ static ivas_error ivas_read_format(
		st_ivas->sba_order = st_ivas->bit_stream[*num_bits_read + 1];
		st_ivas->sba_order += 2 * st_ivas->bit_stream[*num_bits_read];
		*num_bits_read += SBA_ORDER_BITS;
		#endif
		if ( st_ivas->sba_analysis_order == 0 )
		{
		st_ivas->sba_analysis_order = SBA_FOA_ORDER;