[cleanup] accept NONBE_FIX_1052_SBA_EXT (58a0542d) · Commits · SA4 / Audio / IVAS BASOP

lib_com/ivas_prot_fx.h

+0 −8

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

		@@ -2495,12 +2493,10 @@ Word16 ivas_sba_get_nchan_metadata_fx(
		const Word32 ivas_total_brate /* i : IVAS total bitrate */
		);

		#ifdef NONBE_FIX_1052_SBA_EXT
		/! r: number of bits in SBQ SID frame /
		Word16 ivas_sba_spar_sid_bitlen_fx(
		const Word16 nchan_transport /* i : number of transport channels */
		);
		#endif

		void ivas_sba_get_spar_hoa_ch_ind_fx(
		const Word16 num_md_chs, /* i : number of MD channels */
		@@ -3517,9 +3513,7 @@ void ivas_qmetadata_enc_sid_encode_fx(
		BSTR_ENC_HANDLE hMetaData, /* i/o: metadata bitstream handle */
		IVAS_QMETADATA q_metadata, / i/o: metadata handle */
		const Word16 masa_sid_descriptor, /* i : description of MASA SID coding structure*/
		#ifdef NONBE_FIX_1052_SBA_EXT
		const Word16 nchan_transport, /* i : number of transport channels */
		#endif
		const Word16 ivas_format /* i : ivas format */
		);
		void ivas_param_mc_enc_fx(
		@@ -5879,9 +5873,7 @@ ivas_error ivas_dirac_enc_fx(
		const Word16 input_frame, /* i : input frame length */
		const Word16 dtx_vad, /* i : DTX vad flag */
		const IVAS_FORMAT ivas_format, /* i : ivas format */
		#ifdef NONBE_FIX_1052_SBA_EXT
		const Word16 nchan_transport, /* i : number of transport channels */
		#endif
		const Word16 hodirac_flag, /* i : hodirac flag */
		const Word16 shift
		);

lib_com/ivas_sba_config_fx.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -167,7 +167,6 @@ Word16 ivas_sba_get_nchan_fx(
		}


		#ifdef NONBE_FIX_1052_SBA_EXT
		/-------------------------------------------------------------------
		* ivas_sba_spar_sid_bitlen_fx()
		*
		@@ -189,7 +188,6 @@ Word16 ivas_sba_spar_sid_bitlen_fx(

		return num_bits;
		}
		#endif


		/-------------------------------------------------------------------

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -86,7 +86,6 @@

		/* #################### Start BASOP porting switches ############################ */

		#define NONBE_FIX_1052_SBA_EXT /* Dlb: SBA external output support */
		#define NONBE_FIX_MC_LFE_LPF /* Dlb: Adding the LFE LPF filter back for MC content. */
		#define FIX_1158_FASTCONV_REVERB_HRTF /* Philips: issue 1158: Rendering with FastConv to BINAURAL_ROOM_REVERB uses BRIR convolution instead of HRTF */
		#define NONBE_FIX_1096_NAN_VALUES_IN_DIRAC_TO_STEREO /* FhG: avoid sidegain DFT-Stereo param to be larger than 1 when converting from Dirac parameters */

lib_dec/ivas_dirac_dec_fx.c

+0 −16

Original line number	Diff line number	Diff line
		@@ -1242,9 +1242,7 @@ void ivas_dirac_dec_read_BS_fx(
		Word16 nb_bits, / o : number of bits read */
		const Word16 last_bit_pos, /* i : last read bitstream position */
		const Word16 hodirac_flag, /* i : flag to indicate HO-DirAC mode */
		#ifdef NONBE_FIX_1052_SBA_EXT
		const Word16 nchan_transport, /* i : number of transport channels */
		#endif
		Word16 dirac_to_spar_md_bands / o : DirAC->SPAR MD bands */
		)
		{
		@@ -1289,13 +1287,8 @@ void ivas_dirac_dec_read_BS_fx(
		}
		}

		#ifdef NONBE_FIX_1052_SBA_EXT
		nb_bits = add( nb_bits, ivas_qmetadata_dec_sid_decode( hQMetaData, st->bit_stream, &( st->next_bit_pos ), nchan_transport, NULL, SBA_FORMAT ) );
		move16();
		#else
		nb_bits = add( nb_bits, ivas_qmetadata_dec_sid_decode( hQMetaData, st->bit_stream, &( st->next_bit_pos ), 0, NULL, SBA_FORMAT ) );
		move16();
		#endif
		FOR( i = 0; i < MAX_PARAM_SPATIAL_SUBFRAMES; i++ )
		{
		hQMetaData->q_direction[0].band_data[orig_dirac_bands - 1].azimuth_fx[i] = hQMetaData->q_direction[0].band_data[1].azimuth_fx[0];
		@@ -1355,11 +1348,7 @@ void ivas_dirac_dec_read_BS_fx(

		/* subtract mode signaling bits, since bitstream was moved after mode reading */
		iDiv_and_mod_32( ivas_total_brate, FRAMES_PER_SEC, &quo, &rem, 0 );
		#ifdef NONBE_FIX_1052_SBA_EXT
		st->next_bit_pos = extract_l( L_sub( L_sub( quo, 1 ), SID_FORMAT_NBITS + SBA_PLANAR_BITS + SBA_ORDER_BITS ) );
		#else
		st->next_bit_pos = extract_l( L_sub( L_sub( quo, 1 ), SID_FORMAT_NBITS ) );
		#endif

		move16();
		/* 1 bit flag for signaling metadata to read */
		@@ -1383,13 +1372,8 @@ void ivas_dirac_dec_read_BS_fx(
		}
		}
		}
		#ifdef NONBE_FIX_1052_SBA_EXT
		nb_bits = add( nb_bits, ivas_qmetadata_dec_sid_decode( hQMetaData, st->bit_stream, &( st->next_bit_pos ), nchan_transport, NULL, SBA_FORMAT ) );
		move16();
		#else
		nb_bits = add( nb_bits, ivas_qmetadata_dec_sid_decode( hQMetaData, st->bit_stream, &( st->next_bit_pos ), 0, NULL, SBA_FORMAT ) );
		move16();
		#endif

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

lib_dec/ivas_init_dec_fx.c

+0 −10

Original line number	Diff line number	Diff line
		@@ -52,16 +52,13 @@ static ivas_error ivas_read_format( Decoder_Struct st_ivas, Word16 num_bits_re

		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 Word16 sba_order );
		#else
		static AUDIO_CONFIG ivas_set_output_config_from_sba_order( const Word16 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()
		@@ -108,7 +105,6 @@ static AUDIO_CONFIG ivas_set_output_config_from_sba_order( const Word16 sba_orde

		return output_config;
		}
		#endif


		#ifdef FIX_1209_SID_SIGNALING
		@@ -636,7 +632,6 @@ ivas_error ivas_dec_setup(
		st_ivas->sba_order = add( st_ivas->sba_order, shl( st_ivas->bit_stream[num_bits_read], 1 ) );
		move16();
		#ifndef NONBE_FIX_1052_SBA_EXT_FIX
		#ifdef NONBE_FIX_1052_SBA_EXT
		IF( EQ_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )
		{
		#ifdef NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER
		@@ -646,7 +641,6 @@ ivas_error ivas_dec_setup(
		#endif
		st_ivas->hDecoderConfig->nchan_out = audioCfg2channels( st_ivas->hDecoderConfig->output_config );
		}
		#endif
		#endif
		num_bits_read = add( num_bits_read, SBA_ORDER_BITS );

		@@ -951,7 +945,6 @@ ivas_error ivas_dec_setup(
		}

		#ifndef NONBE_FIX_1052_SBA_EXT_FIX
		#ifdef NONBE_FIX_1052_SBA_EXT
		IF( EQ_32( st_ivas->ivas_format, SBA_FORMAT ) && EQ_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )
		{
		#ifdef NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER
		@@ -961,7 +954,6 @@ ivas_error ivas_dec_setup(
		#endif
		st_ivas->hDecoderConfig->nchan_out = audioCfg2channels( st_ivas->hDecoderConfig->output_config );
		}
		#endif
		#endif
		test();
		IF( st_ivas->ini_frame > 0 && EQ_32( st_ivas->ivas_format, SBA_FORMAT ) )
		@@ -1294,7 +1286,6 @@ static ivas_error ivas_read_format(

		IF( EQ_32( 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];
		move16();
		@@ -1308,7 +1299,6 @@ static ivas_error ivas_read_format(
		move16();
		num_bits_read = add( num_bits_read, SBA_ORDER_BITS );
		move16();
		#endif

		if ( st_ivas->sba_analysis_order == 0 )
		{