Merge branch 'main' into add_evs_be_test_to_ci (5aeaca8b) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/encoder.c

100755 → 100644

+1 −1

Original line number	Diff line number	Diff line
		@@ -1618,7 +1618,7 @@ static void usage_enc( void )
		fprintf( stdout, " where 0 = adaptive, 3-100 = fixed in number of frames,\n" );
		fprintf( stdout, " default is deactivated\n" );
		fprintf( stdout, "-dtx : Activate DTX mode with a SID update rate of 8 frames\n" );
		fprintf( stdout, " Note: DTX is currently supported in EVS, DFT/TD stereo, 1 ISm, \n" );
		fprintf( stdout, " Note: DTX is currently supported in EVS, stereo, 1 ISm, \n" );
		fprintf( stdout, " SBA (up to 128kbps) and MASA (up to 128kbps)\n" );
		fprintf( stdout, "-rf p o : Activate channel-aware mode for WB and SWB signal at 13.2kbps, \n" );
		fprintf( stdout, " where FEC indicator, p: LO or HI, and FEC offset, o: 2, 3, 5, or 7 in number of frames.\n" );

lib_com/bitstream.c

100755 → 100644

+5 −11

Original line number	Diff line number	Diff line
		@@ -1981,15 +1981,9 @@ ivas_error preview_indices(
		st_ivas->sba_order = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_SBA + 2] == 1 );
		st_ivas->sba_order += 2 * ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_SBA + 1] == 1 );

		#ifdef SBA_ORDER_BITSTREAM
		st_ivas->sba_analysis_order = ivas_sba_get_analysis_order( total_brate, st_ivas->sba_order );
		#endif

		#ifdef SBA_ORDER_BITSTREAM
		ivas_sba_config( total_brate, st_ivas->sba_analysis_order, -1, &( st_ivas->nchan_transport ), st_ivas->sba_planar, &( st_ivas->nSCE ), &( st_ivas->nCPE ), &( st_ivas->element_mode_init ), st_ivas->sba_mode );
		#else
		ivas_sba_config( total_brate, st_ivas->sba_order, -1, &( st_ivas->nchan_transport ), st_ivas->sba_planar, &( st_ivas->nSCE ), &( st_ivas->nCPE ), &( st_ivas->element_mode_init ), st_ivas->sba_mode );
		#endif
		}
		}

		@@ -2069,7 +2063,7 @@ ivas_error read_indices(
		}
		else if ( k == SIZE_IVAS_BRATE_TBL )
		{
		/temp change for spar DTX/
		/temp change for SPAR DTX/
		if ( total_brate == IVAS_SID_5k )
		{
		st_ivas->element_mode_init = -1;
		@@ -2122,7 +2116,7 @@ ivas_error read_indices(
		}
		else
		{
		sid_upd_bad = 1; /* this frame type may happen in ETSI/3GPP CS cases , a corrupt sid frames */
		sid_upd_bad = 1; /* this frame type may happen in ETSI/3GPP CS cases, a corrupt SID frames */
		}
		}

		@@ -2207,7 +2201,7 @@ ivas_error read_indices(
		/* total_brate= 0 */
		}

		/* handle bad/lost speech frame(and CS bad sid frame) in the decoders CNG synthesis settings pair (total_brate, bfi) */
		/* handle bad/lost speech frame(and CS bad SID frame) in the decoders CNG synthesis settings pair (total_brate, bfi) */
		if ( ( ( CNG != 0 ) && ( ( speech_bad != 0 ) \|\| ( speech_lost != 0 ) ) ) \|\| / SP_BAD or SPEECH_LOST) --> stay in CNG */
		( sid_upd_bad != 0 ) ) /* SID_UPD_BAD --> start CNG */
		{
		@@ -2326,7 +2320,7 @@ static Word32 read_indices_mime_handle_dtx(
		{
		if ( st->bfi )
		{
		sid_upd_bad = 1; /* corrupt sid_first, signaled as bad sid */
		sid_upd_bad = 1; /* corrupt sid_first, signaled as bad SID */
		}
		else
		{
		@@ -2384,7 +2378,7 @@ static Word32 read_indices_mime_handle_dtx(
		}

		/* in CNG */
		/* handle bad speech frame(and bad sid frame) in the decoders CNG synthesis settings pair (total_brate, bfi) */
		/* handle bad speech frame(and bad SID frame) in the decoders CNG synthesis settings pair (total_brate, bfi) */
		if ( ( CNG != 0 && ( speech_bad \|\| speech_lost \|\| no_data ) ) \|\| / SP_BAD or SPEECH_LOST) --> stay in CNG */
		sid_upd_bad ) /* SID_UPD_BAD --> start/stay CNG */
		{

lib_com/ivas_dirac_com.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -82,11 +82,7 @@ ivas_error ivas_dirac_config(
		nCPE = &( (Encoder_Struct *) st_ivas )->nCPE;
		element_mode = &( (Encoder_Struct *) st_ivas )->hEncoderConfig->element_mode_init;
		nchan_transport = &( (Encoder_Struct *) st_ivas )->nchan_transport;
		#ifndef SBA_ORDER_BITSTREAM
		sba_order = ( (Encoder_Struct *) st_ivas )->hEncoderConfig->sba_order;
		#else
		sba_order = ( (Encoder_Struct *) st_ivas )->sba_analysis_order;
		#endif
		sba_planar = ( (Encoder_Struct *) st_ivas )->hEncoderConfig->sba_planar;
		ivas_total_brate = ( (Encoder_Struct *) st_ivas )->hEncoderConfig->ivas_total_brate;
		Fs = ( (Encoder_Struct *) st_ivas )->hEncoderConfig->input_Fs;
		@@ -111,11 +107,7 @@ ivas_error ivas_dirac_config(
		nCPE = &( (Decoder_Struct *) st_ivas )->nCPE;
		element_mode = &( (Decoder_Struct *) st_ivas )->element_mode_init;
		nchan_transport = &( (Decoder_Struct *) st_ivas )->nchan_transport;
		#ifndef SBA_ORDER_BITSTREAM
		sba_order = ( (Decoder_Struct *) st_ivas )->sba_order;
		#else
		sba_order = ( (Decoder_Struct *) st_ivas )->sba_analysis_order;
		#endif
		sba_planar = ( (Decoder_Struct *) st_ivas )->sba_planar;
		ivas_total_brate = ( (Decoder_Struct *) st_ivas )->hDecoderConfig->ivas_total_brate;
		Fs = ( (Decoder_Struct *) st_ivas )->hDecoderConfig->output_Fs;

lib_com/ivas_entropy_coder_common.c

100755 → 100644

+0 −0

File mode changed from 100755 to 100644.

View file

lib_com/ivas_fb_mixer.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1098,8 +1098,8 @@ static ivas_error ivas_filterbank_setup(

		for ( j = 0; j < IVAS_MAX_NUM_FB_BANDS; j++ )
		{
		pFb->fb_bin_to_band.p_short_stride_num_bins_per_band[j] = 0; /* aka num_active_bins per spar band */
		pFb->fb_bin_to_band.p_short_stride_start_bin_per_band[j] = 0; /* first considered bin index per spar band */
		pFb->fb_bin_to_band.p_short_stride_num_bins_per_band[j] = 0; /* aka num_active_bins per SPAR band */
		pFb->fb_bin_to_band.p_short_stride_start_bin_per_band[j] = 0; /* first considered bin index per SPAR band */
		pFb->fb_bin_to_band.pp_short_stride_bin_to_band[j] = NULL;
		for ( i = 0; i < CLDFB_NO_CHANNELS_MAX; i++ )
		{