[cleanup] accept NONBE_FIX_1074_NOBJ_SIGNAL_OMASA_LBR (90a211c8) · Commits · SA4 / Audio / IVAS BASOP

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_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 */
		#define NONBE_FIX_1130_DIV_ZERO_LEV_DUR /* VA: issue 1130: avoid div by zero in L-D by thresholding R[0] to a min value of 100.0 */
		#define FIX_1111_TDM_LSP_BUFFER /* VA: issue 1111: remove unused buffer `tdm_lspQ_PCh[]' */

lib_dec/ivas_init_dec_fx.c

+0 −11

Original line number	Diff line number	Diff line
		@@ -683,7 +683,6 @@ ivas_error ivas_dec_setup(

		IF( GT_16( st_ivas->nchan_ism, 0 ) )
		{
		#ifdef NONBE_FIX_1074_NOBJ_SIGNAL_OMASA_LBR
		/* the input_ivas_format should be MASA_ISM_FORMAT, but we cannot initialize it now */
		/* info about the number of objects:
		'00' - MASA format at the encoder
		@@ -702,16 +701,6 @@ ivas_error ivas_dec_setup(
		}

		/* for MASA_ISM_FORMAT at input the number of MASA transport channels is always 2 and the corresponding bit is not used here*/
		#else
		/* the input_ivas_format should be MASA_ISM_FORMAT, but we cannot initialize it now */
		test();
		IF( EQ_16( st_ivas->nchan_transport, 2 ) && EQ_16( st_ivas->nchan_ism, 3 ) )
		{
		st_ivas->nchan_ism = 4;
		move16();
		}
		/* for MASA_ISM_FORMAT at input the number of MASA transport channels is always 2 */
		#endif
		st_ivas->nchan_transport = 2;
		element_mode_flag = 1;
		move16();

lib_dec/ivas_masa_dec_fx.c

+0 −13

Original line number	Diff line number	Diff line
		@@ -184,7 +184,6 @@ ivas_error ivas_masa_decode_fx(
		test();
		IF( NE_32( ivas_format, MC_FORMAT ) \|\| NE_16( st_ivas->mc_mode, MC_MODE_MCMASA ) )
		{
		#ifdef NONBE_FIX_1074_NOBJ_SIGNAL_OMASA_LBR
		Word16 bits_per_frame = extract_l( Mpy_32_32( ivas_total_brate, ONE_BY_FRAMES_PER_SEC_Q31 ) );
		IF( EQ_32( ivas_format, MASA_FORMAT ) )
		{
		@@ -239,7 +238,6 @@ ivas_error ivas_masa_decode_fx(
		}
		ELSE
		{
		#endif
		IF( NE_32( ivas_format, MASA_ISM_FORMAT ) )
		{
		/* number of transport channels is always 2 for MASA_ISM format */
		@@ -377,15 +375,6 @@ ivas_error ivas_masa_decode_fx(
		}
		}

		#ifndef NONBE_FIX_1074_NOBJ_SIGNAL_OMASA_LBR
		/* read 2 bits:
		'00' - MASA format at the encoder
		'01' - MASA_ISM_FORMAT at the encoder, with 1 object
		'10' - MASA_ISM_FORMAT at the encoder, with 2 objects
		'11' - MASA_ISM_FORMAT at the encoder, with 3 or 4 objects
		reading if 3 or 4 object is performed later
		*/
		#endif
		byteBuffer = st->bit_stream[st->next_bit_pos];
		move16();
		st->next_bit_pos = sub( st->next_bit_pos, 1 );
		@@ -412,9 +401,7 @@ ivas_error ivas_masa_decode_fx(
		move16();
		hMasa->config.numberOfDirections = (UWord8) L_add( byteBuffer, 1 );
		move16();
		#ifdef NONBE_FIX_1074_NOBJ_SIGNAL_OMASA_LBR
		}
		#endif
		}
		ELSE
		{

lib_enc/ivas_masa_enc_fx.c

+0 −27

Original line number	Diff line number	Diff line
		@@ -558,7 +558,6 @@ ivas_error ivas_masa_encode_fx(
		test();
		IF( EQ_32( ivas_format, MASA_ISM_FORMAT ) && EQ_32( ism_mode, ISM_MODE_NONE ) )
		{
		#ifdef NONBE_FIX_1074_NOBJ_SIGNAL_OMASA_LBR
		/* use the MASA number of transport channels bit to signal if there are 1 or 2 objects */
		test();
		IF( EQ_16( nchan_ism, 1 ) \|\| EQ_16( nchan_ism, 2 ) )
		@@ -570,17 +569,6 @@ ivas_error ivas_masa_encode_fx(
		/* for 3 or 4 objects write already the number of MASA directions */
		push_next_indice( hMetaData, sub( hQMetaData->no_directions, 1 ), MASA_TRANSP_BITS );
		}
		#else
		/* use the MASA number of transport channels bit to signal if there are 3 or 4 objects */
		IF( EQ_16( nchan_ism, 4 ) )
		{
		push_next_indice( hMetaData, 1, MASA_TRANSP_BITS );
		}
		ELSE
		{
		push_next_indice( hMetaData, 0, MASA_TRANSP_BITS );
		}
		#endif
		}
		ELSE
		{
		@@ -594,7 +582,6 @@ ivas_error ivas_masa_encode_fx(
		test();
		IF( EQ_32( ivas_format, MASA_ISM_FORMAT ) && EQ_32( ism_mode, ISM_MODE_NONE ) )
		{
		#ifdef NONBE_FIX_1074_NOBJ_SIGNAL_OMASA_LBR
		IF( GE_16( nchan_ism, 3 ) ) /* if 3 or 4 objects */
		{
		push_next_indice( hMetaData, sub( 5, nchan_ism ), MASA_HEADER_BITS );
		@@ -603,16 +590,6 @@ ivas_error ivas_masa_encode_fx(
		{
		push_next_indice( hMetaData, 3, MASA_HEADER_BITS );
		}
		#else
		IF( LE_16( nchan_ism, 3 ) )
		{
		push_next_indice( hMetaData, nchan_ism, MASA_HEADER_BITS );
		}
		ELSE
		{
		push_next_indice( hMetaData, sub( nchan_ism, 1 ), MASA_HEADER_BITS );
		}
		#endif
		hQMetaData->metadata_max_bits = sub( hQMetaData->metadata_max_bits, MASA_HEADER_BITS );
		move16();
		}
		@@ -624,20 +601,16 @@ ivas_error ivas_masa_encode_fx(
		hQMetaData->metadata_max_bits = sub( hQMetaData->metadata_max_bits, MASA_HEADER_BITS );
		move16();
		}
		#ifdef NONBE_FIX_1074_NOBJ_SIGNAL_OMASA_LBR
		test();
		test();
		test();
		IF( !( EQ_32( ivas_format, MASA_ISM_FORMAT ) && EQ_32( ism_mode, ISM_MODE_NONE ) && GT_16( nchan_ism, 2 ) ) )
		{
		#endif
		/* write number of directions */
		push_next_indice( hMetaData, sub( hQMetaData->no_directions, 1 ), 1 );
		hQMetaData->metadata_max_bits = sub( hQMetaData->metadata_max_bits, 1 );
		move16();
		#ifdef NONBE_FIX_1074_NOBJ_SIGNAL_OMASA_LBR
		}
		#endif

		/* write subframe mode */
		IF( EQ_16( hQMetaData->q_direction[0].cfg.nblocks, 1 ) )

lib_rend/ivas_output_init_fx.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -391,12 +391,8 @@ Word16 ivas_get_nchan_buffers_dec_fx(
		nchan_out_buff = s_max( nchan_out_buff, audioCfg2channels( output_config ) );
		}
		test();
		#ifdef NONBE_FIX_1074_NOBJ_SIGNAL_OMASA_LBR
		test();
		IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) && GT_16( st_ivas->nchan_ism, 0 ) && LT_16( st_ivas->nchan_ism, 5 ) ) /* Last condition needed only in BASOP */
		#else
		IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) && GT_16( st_ivas->nchan_ism, 0 ) )
		#endif
		{
		nchan_out_buff = add( st_ivas->nchan_ism, CPE_CHANNELS );
		}