- Merge remote-tracking branch 'remotes/origin/main' into 2463-evs-bug-in-calling-quant_bwe_lsf_fx (2e1d74a8) · Commits · SA4 / Audio / IVAS BASOP

apps/decoder.c

+0 −11

Original line number	Diff line number	Diff line
		@@ -2962,10 +2962,8 @@ static ivas_error decodeVoIP(

		phIvasDec = hIvasDec; / Update for main()' s free */
		ivasRtp.restartNeeded = false;
		#ifdef FIX_1525_UNINIT_FORMAT_SWITCHING_DEC
		bitstreamReadDone = false;
		parametersAvailableForEditing = false;
		#endif
		}

		/* reference vector */
		@@ -3215,10 +3213,8 @@ static ivas_error decodeVoIP(
		}

		phIvasDec = hIvasDec; / Update for main()' s free */
		#ifdef FIX_1525_UNINIT_FORMAT_SWITCHING_DEC
		bitstreamReadDone = false;
		parametersAvailableForEditing = false;
		#endif
		}

		/* Placeholder for memory reallocation */
		@@ -3982,13 +3978,6 @@ static ivas_error restartDecoder(
		}
		}

		#ifndef FIX_1525_UNINIT_FORMAT_SWITCHING_DEC
		if ( ( error = IVAS_DEC_PrintConfig( hIvasDec, 1, arg->voipMode ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_PrintConfig failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}
		#endif
		/* ISAR frame size is set from command line, not renderer config file.
		* This will be ignored if output format is not split rendering. */
		if ( renderConfig != NULL )

lib_com/bitstream_fx.c

+12 −9

Original line number	Diff line number	Diff line
		@@ -242,7 +242,7 @@ static Word16 rate2AMRWB_IOmode(
		case ACELP_23k85:
		return AMRWB_IO_2385;
		default:
		break;
		BREAK;
		}

		return -1;
		@@ -298,7 +298,7 @@ Word16 rate2EVSmode(
		case HQ_128k:
		return PRIMARY_128000;
		default:
		break;
		BREAK;
		}

		if ( is_amr_wb != NULL )
		@@ -3206,12 +3206,15 @@ Word16 find_indice(
		{
		Word16 i;

		for ( i = 0; i < hBstr->nb_ind_tot; i++ )
		FOR( i = 0; i < hBstr->nb_ind_tot; i++ )
		{
		if ( hBstr->ind_list[i].id == id && hBstr->ind_list[i].nb_bits > 0 )
		test();
		IF( EQ_16( hBstr->ind_list[i].id, id ) && hBstr->ind_list[i].nb_bits > 0 )
		{
		*value = hBstr->ind_list[i].value;
		*nb_bits = hBstr->ind_list[i].nb_bits;
		move16();
		move16();
		return i;
		}
		}
		@@ -3273,7 +3276,7 @@ UWord16 delete_indice(
		#endif
		}

		return i - j;
		return sub( i, j );
		}


		@@ -3949,13 +3952,13 @@ static void decoder_selectCodec(
		case 2800:
		st->codec_mode = MODE1;
		move16();
		break;
		BREAK;
		default: /* validate that total_brate (derived from RTP packet or a file header) is one of the defined bitrates */
		st->codec_mode = st->last_codec_mode;
		move16();
		st->bfi = 1;
		move16();
		break;
		BREAK;
		}
		}
		}
		@@ -4417,7 +4420,7 @@ void ivas_set_bitstream_pointers(
		num_bits = 0;

		/* set bitstream pointers for SCEs */
		for ( k = 0; k < st_ivas->nSCE; k++ )
		FOR( k = 0; k < st_ivas->nSCE; k++ )
		{
		sts = st_ivas->hSCE[k]->hCoreCoder;
		sts[0]->bit_stream = st_ivas->bit_stream + num_bits;
		@@ -4425,7 +4428,7 @@ void ivas_set_bitstream_pointers(
		}

		/* set bitstream pointers for CPEs */
		for ( k = 0; k < st_ivas->nCPE; k++ )
		FOR( k = 0; k < st_ivas->nCPE; k++ )
		{
		sts = st_ivas->hCPE[k]->hCoreCoder;
		sts[0]->bit_stream = st_ivas->bit_stream + num_bits;

lib_com/fd_cng_com_fx.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -166,9 +166,6 @@ void initFdCngCom(

		set16_fx( hFdCngCom->coherence_fx, 16384 /* 0.5 in Q15 */, MDCT_ST_DTX_NUM_COHERENCE_BANDS );

		#ifndef FIX_BASOP_REMOVE_SYNTH2_FX
		set32_fx( hFdCngCom->olapBufferSynth2_fx, 0, FFTLEN );
		#endif
		set32_fx( hFdCngCom->exc_cng_32fx, 0, L_FRAME16k );
		set16_fx( hFdCngCom->exc_cng, 0, L_FRAME16k );

		@@ -3259,11 +3256,11 @@ void SynthesisSTFT_dirac_fx(
		case 640:
		fftScale = FFT_SCALING_640;
		move32();
		break;
		BREAK;
		case 512:
		fftScale = FFT_SCALING_512;
		move32();
		break;
		BREAK;
		default:
		assert( !"Not supported FFT length!" );
		}

lib_com/fft_fx.c

+0 −498

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/gs_bitallocation_fx.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -77,11 +77,7 @@ static Word32 Find_bit_frac_fx( const Word16 nb_band, const Word16 remaining_bit
		/* _ None */
		/==================================================================================/

		#ifdef FIX_2467_RENAME_GSC_FUNCTION
		void bands_and_bit_alloc_fx(
		#else
		void bands_and_bit_alloc_ivas_fx(
		#endif
		const Word16 cor_strong_limit, /* i : HF correlation */
		const Word16 noise_lev, /* i : dwn scaling factor */
		const Word32 core_brate, /* i : core bit rate */