rename BASOP_sub(_sub)_start() to push_wmops() (ad9e2d66) · Commits · SA4 / Audio / IVAS BASOP

lib_lc3plus/dec_lc3.c

+24 −24

Original line number	Diff line number	Diff line
		@@ -149,7 +149,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s
		#endif

		#ifdef WMOPS
		BASOP_sub_start("Decoder");
		push_wmops("Decoder");
		#endif

		#ifdef ENABLE_RFRAME
		@@ -165,18 +165,18 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s
		if (bfi != 1)
		{
		#ifdef WMOPS
		BASOP_sub_sub_start("Dec(bfi=0)");
		push_wmops("Dec(bfi=0)");
		#endif
		}
		else
		{
		#ifdef WMOPS
		BASOP_sub_sub_start("Dec(bfi=1)");
		push_wmops("Dec(bfi=1)");
		#endif
		}

		#ifdef WMOPS
		BASOP_sub_start("Entropy dec");
		push_wmops("Entropy dec");
		#endif
		IF (sub(bfi, 1) != 0)
		{
		@@ -191,7 +191,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s
		#endif

		#ifdef WMOPS
		BASOP_sub_start("Ari dec");
		push_wmops("Ari dec");
		#endif
		IF (sub(bfi, 1) != 0)
		{
		@@ -248,7 +248,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s
		#endif

		#ifdef WMOPS
		BASOP_sub_start("SnsQuantScfDec");
		push_wmops("SnsQuantScfDec");
		#endif
		IF (sub(bfi, 1) != 0)
		{
		@@ -265,7 +265,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s
		#endif

		#ifdef WMOPS
		BASOP_sub_start("PLC::ComputeStabFac");
		push_wmops("PLC::ComputeStabFac");
		#endif
		if (h_DecSetup->plcAd)
		{
		@@ -277,7 +277,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s
		#endif

		#ifdef WMOPS
		BASOP_sub_start("Partial Concealment");
		push_wmops("Partial Concealment");
		#endif
		IF (sub(bfi, 1) != 0)
		{
		@@ -302,7 +302,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s
		IF (sub(bfi, 1) != 0)
		{
		#ifdef WMOPS
		BASOP_sub_start("Residual dec");
		push_wmops("Residual dec");
		#endif
		processResidualDecoding_fx(q_d_fx, q_fx_exp, decoder->yLen, resBitBuf, fill_bits
		#ifdef ENABLE_HR_MODE
		@@ -314,7 +314,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s
		#endif

		#ifdef WMOPS
		BASOP_sub_start("Noisefill");
		push_wmops("Noisefill");
		#endif
		/* currentScratch Size = 2 * MAX_LEN bytes */
		IF (zero_frame == 0)
		@@ -331,7 +331,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s
		#endif

		#ifdef WMOPS
		BASOP_sub_start("applyGlobalGain");
		push_wmops("applyGlobalGain");
		#endif
		processApplyGlobalGain_fx(q_d_fx, &q_fx_exp, decoder->yLen, gg_idx, h_DecSetup->quantizedGainOff);
		#ifdef WMOPS
		@@ -339,7 +339,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s
		#endif

		#ifdef WMOPS
		BASOP_sub_start("Tns_dec");
		push_wmops("Tns_dec");
		#endif
		/* currentScratch Size = 48 bytes */
		processTnsDecoder_fx(indexes, q_d_fx, decoder->yLen, tns_order, &q_fx_exp, BW_cutoff_idx, decoder->frame_dms,
		@@ -354,7 +354,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s

		#ifdef ENABLE_HR_MODE
		#ifdef WMOPS
		BASOP_sub_start("SnsInterpScfDec");
		push_wmops("SnsInterpScfDec");
		#endif
		processSnsInterpolateScf_fx(scf_q_ip, int_scf_fx_ip, int_scf_fx_exp, 0, decoder->bands_number, currentScratch);

		@@ -363,7 +363,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s
		#endif

		#ifdef WMOPS
		BASOP_sub_start("Mdct shaping_dec");
		push_wmops("Mdct shaping_dec");
		#endif
		processScfScaling(int_scf_fx_exp, decoder->bands_number, &q_fx_exp);

		@@ -373,7 +373,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s
		#endif
		#else
		#ifdef WMOPS
		BASOP_sub_start("SnsInterpScfDec");
		push_wmops("SnsInterpScfDec");
		#endif
		/* currentScratch Size = 128 bytes */
		processSnsInterpolateScf_fx(scf_q, int_scf_fx, int_scf_fx_exp, 0, decoder->bands_number, currentScratch);
		@@ -382,7 +382,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s
		#endif

		#ifdef WMOPS
		BASOP_sub_start("Mdct shaping_dec");
		push_wmops("Mdct shaping_dec");
		#endif
		processScfScaling(int_scf_fx_exp, decoder->bands_number, &q_fx_exp);
		processMdctShaping_fx(q_d_fx, int_scf_fx, int_scf_fx_exp, decoder->bands_offset, decoder->bands_number);
		@@ -407,7 +407,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s
		#endif

		#ifdef WMOPS
		BASOP_sub_start("PLC::Main");
		push_wmops("PLC::Main");
		#endif
		/* currentScratch Size = 2 * MAX_LGW + 8 * MAX_LPROT + 12 * MAX_L_FRAME */
		processPLCmain_fx(decoder->plcMeth, &h_DecSetup->concealMethod, &h_DecSetup->nbLostFramesInRow, bfi,
		@@ -447,7 +447,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s
		#endif

		#ifdef WMOPS
		BASOP_sub_start("PLC/PC::DampingScrambling");
		push_wmops("PLC/PC::DampingScrambling");
		#endif
		if (h_DecSetup->plcAd)
		{
		@@ -467,7 +467,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s
		#endif

		#ifdef WMOPS
		BASOP_sub_start("Imdct");
		push_wmops("Imdct");
		#endif
		/* currentScratch Size = 4 * MAX_LEN */
		ProcessingIMDCT(q_d_fx, &q_fx_exp, decoder->W_fx, h_DecSetup->stDec_ola_mem_fx, &h_DecSetup->stDec_ola_mem_fx_exp,
		@@ -504,7 +504,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s
		#endif

		#ifdef WMOPS
		BASOP_sub_start("PLC::Update");
		push_wmops("PLC::Update");
		#endif

		processPLCupdate_fx(h_DecSetup->plcAd, x_fx, q_fx_exp, h_DecSetup->concealMethod, decoder->frame_length,
		@@ -519,7 +519,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s
		#endif

		#ifdef WMOPS
		BASOP_sub_start("LtpfDec");
		push_wmops("LtpfDec");
		#endif
		/* currentScratch Size = 0.5 * MAX_LEN + 20 bytes */
		process_ltpf_decoder_fx(&q_fx_exp, decoder->frame_length, decoder->ltpf_mem_x_len, decoder->fs_idx,
		@@ -548,7 +548,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s
		#endif

		#ifdef WMOPS
		BASOP_sub_start("Output scaling");
		push_wmops("Output scaling");
		#endif
		{
		scale = sub(sub(31 + 16, bits_per_sample), q_fx_exp);
		@@ -624,7 +624,7 @@ LC3PLUS_Error Dec_LC3PLUS(LC3PLUS_Dec decoder, UWord8 input, int num_bytes, vo
		fec_num_bytes = num_bytes;

		#ifdef WMOPS
		BASOP_sub_start("fec_dec");
		push_wmops("fec_dec");
		#endif

		decoder->error_report =
		@@ -669,7 +669,7 @@ LC3PLUS_Error Dec_LC3PLUS(LC3PLUS_Dec decoder, UWord8 input, int num_bytes, vo
		fec_num_bytes = num_bytes / decoder->channels + (ch < (num_bytes % decoder->channels));

		#ifdef WMOPS
		BASOP_sub_start("fec_dec");
		push_wmops("fec_dec");
		#endif

		channel_bfi = bfi;

lib_lc3plus/enc_lc3.c

+28 −28

Original line number	Diff line number	Diff line
		@@ -62,7 +62,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_
		#endif /* CR8_F_ADAPT_MDCT_DCT_PRECISION */

		#ifdef WMOPS
		BASOP_sub_start("Encoder");
		push_wmops("Encoder");
		#endif

		/* BUFFER INITIALISATION. Some buffers may overlap since they are not used in the whole encoding process */
		@@ -135,7 +135,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_
		IF (sub(bits_per_sample, 24) == 0)
		{
		#ifdef WMOPS
		BASOP_sub_start("Scale_signal24");
		push_wmops("Scale_signal24");
		#endif
		scale_signal24_fx(s_in, s_in_scaled, &h_EncSetup->x_exp, h_EncSetup->stEnc_mdct_mem,
		encoder->stEnc_mdct_mem_len, h_EncSetup->r12k8_mem_in, encoder->r12k8_mem_in_len,
		@@ -162,7 +162,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_
		}

		#ifdef WMOPS
		BASOP_sub_start("Mdct");
		push_wmops("Mdct");
		#endif

		/* currentScratch Size = 4 * MAX_LEN */
		@@ -180,7 +180,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_

		/* begin s_12k8 */
		#ifdef WMOPS
		BASOP_sub_start("Resamp12k8");
		push_wmops("Resamp12k8");
		#endif
		/* currentScratch Size = 2.25 * MAX_LEN bytes */
		#ifdef ENABLE_HR_MODE
		@@ -203,7 +203,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_
		#endif

		#ifdef WMOPS
		BASOP_sub_start("Olpa");
		push_wmops("Olpa");
		#endif
		/* currentScratch Size = 392 bytes */
		process_olpa_fx(&h_EncSetup->olpa_mem_s6k4_exp, h_EncSetup->olpa_mem_s12k8, h_EncSetup->olpa_mem_s6k4, &pitch,
		@@ -217,7 +217,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_
		#endif

		#ifdef WMOPS
		BASOP_sub_start("LtpfEnc");
		push_wmops("LtpfEnc");
		#endif
		/* currentScratch Size = 512 bytes */
		process_ltpf_coder_fx(&ltpf_bits, pitch, h_EncSetup->ltpf_enable, &h_EncSetup->ltpf_mem_in_exp,
		@@ -235,7 +235,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_

		/* end s_12k8 */
		#ifdef WMOPS
		BASOP_sub_start("AttackDetector");
		push_wmops("AttackDetector");
		#endif
		/* currentScratch Size = ??? bytes */
		#ifdef ENABLE_HR_MODE
		@@ -249,7 +249,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_

		/* begin ener_fx */
		#ifdef WMOPS
		BASOP_sub_start("PerBandEnergy");
		push_wmops("PerBandEnergy");
		#endif
		/* currentScratch Size = 160 bytes */
		processPerBandEnergy_fx(ener_fx, &ener_fx_exp, d_fx, d_fx_exp, encoder->bands_offset, encoder->fs_idx,
		@@ -263,7 +263,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_
		#endif

		#ifdef WMOPS
		BASOP_sub_start("Near Nyquist Detector");
		push_wmops("Near Nyquist Detector");
		#endif
		/* Near Nyquist Detector */
		processNearNyquistdetector_fx(&encoder->near_nyquist_flag, encoder->fs_idx, encoder->near_nyquist_index,
		@@ -287,7 +287,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_
		BASOP_sub_end();
		#endif
		#ifdef WMOPS
		BASOP_sub_start("BW Cutoff-Detection");
		push_wmops("BW Cutoff-Detection");
		#endif
		IF (h_EncSetup->lfe == 0)
		{
		@@ -316,7 +316,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_
		#endif

		#ifdef WMOPS
		BASOP_sub_start("SnsCompScf");
		push_wmops("SnsCompScf");
		#endif


		@@ -329,7 +329,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_
		#endif

		#ifdef WMOPS
		BASOP_sub_start("SnsQuantScfEnc");
		push_wmops("SnsQuantScfEnc");
		#endif
		/* currentScratch Size = 500 bytes */

		@@ -339,7 +339,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_
		#endif

		#ifdef WMOPS
		BASOP_sub_start("SnsInterpScfEnc");
		push_wmops("SnsInterpScfEnc");
		#endif
		/* currentScratch Size = 128 bytes */
		processSnsInterpolateScf_fx(scf_q, int_scf_fx, int_scf_fx_exp, 1, encoder->bands_number, currentScratch);
		@@ -348,7 +348,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_
		#endif

		#ifdef WMOPS
		BASOP_sub_start("Mdct shaping_enc");
		push_wmops("Mdct shaping_enc");
		#endif
		processMdctShaping_fx(d_fx, int_scf_fx, int_scf_fx_exp, encoder->bands_offset, encoder->bands_number);

		@@ -357,7 +357,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_
		#endif
		/* end int_scf_fx_exp */
		#ifdef WMOPS
		BASOP_sub_start("BandwidthControl_enc");
		push_wmops("BandwidthControl_enc");
		#endif
		if (encoder->bandwidth < L_shr_pos(encoder->fs, 1))
		{
		@@ -368,7 +368,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_
		BASOP_sub_end();
		#endif
		#ifdef WMOPS
		BASOP_sub_start("Tns_enc");
		push_wmops("Tns_enc");
		#endif
		/* currentScratch Size = 2 * MAX_LEN + 220 */

		@@ -397,7 +397,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_
		#endif

		#ifdef WMOPS
		BASOP_sub_start("Est. Global Gain");
		push_wmops("Est. Global Gain");
		#endif
		/* currentScratch Size = 4 * MAX_LEN bytes */
		h_EncSetup->targetBitsQuant = sub(h_EncSetup->targetBitsInit, add(h_EncSetup->tns_bits, ltpf_bits));
		@@ -436,7 +436,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_
		/* begin q_d_fx16 */

		#ifdef WMOPS
		BASOP_sub_start("Quant. 1");
		push_wmops("Quant. 1");
		#endif
		#ifdef ENABLE_HR_MODE
		processQuantizeSpec_fx(d_fx, d_fx_exp, gain32, gain_e, q_d_fx24, encoder->yLen, h_EncSetup->targetBitsQuant,
		@@ -453,7 +453,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_
		#endif

		#ifdef WMOPS
		BASOP_sub_start("Adj. Global Gain");
		push_wmops("Adj. Global Gain");
		#endif
		#ifdef ENABLE_HR_MODE
		//gain32 = L_shl_pos((Word32)gain, 16);
		@@ -471,7 +471,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_
		#endif

		#ifdef WMOPS
		BASOP_sub_start("Quant. 2");
		push_wmops("Quant. 2");
		#endif
		IF (sub(gainChange, 1) == 0)
		{
		@@ -490,7 +490,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_
		#endif

		#ifdef WMOPS
		BASOP_sub_start("Res. Cod.");
		push_wmops("Res. Cod.");
		#endif
		IF (lsbMode == 0)
		{
		@@ -521,7 +521,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_
		#endif

		#ifdef WMOPS
		BASOP_sub_start("Noise fac");
		push_wmops("Noise fac");
		#endif
		/* currentScratch Size = 2 * MAX_LEN bytes */
		IF (h_EncSetup->lfe == 0)
		@@ -548,7 +548,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_
		#endif

		#ifdef WMOPS
		BASOP_sub_start("Entropy cod");
		push_wmops("Entropy cod");
		#endif
		processEncoderEntropy(bytes, &bp_side, &mask_side, h_EncSetup->targetBitsAri, h_EncSetup->targetBytes,
		encoder->yLen, encoder->BW_cutoff_bits, tns_numfilters, lsbMode, lastnz, tns_order,
		@@ -558,7 +558,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_
		#endif

		#ifdef WMOPS
		BASOP_sub_start("Ari cod");
		push_wmops("Ari cod");
		#endif
		processAriEncoder_fx(bytes, bp_side, mask_side, h_EncSetup->targetBitsAri,
		#ifdef ENABLE_HR_MODE
		@@ -573,13 +573,13 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_
		#endif

		#ifdef WMOPS
		BASOP_sub_start("Reorder Bitstream Enc");
		push_wmops("Reorder Bitstream Enc");
		#endif
		test();
		IF (encoder->combined_channel_coding == 0 && h_EncSetup->n_pc > 0)
		{
		#ifdef WMOPS
		BASOP_sub_start("Reorder Ari dec");
		push_wmops("Reorder Ari dec");
		#endif

		#ifdef ENABLE_HR_MODE
		@@ -639,7 +639,7 @@ int Enc_LC3PLUS(LC3PLUS_Enc encoder, void *input, int bits_per_sample, UWord8
		{
		output_size2 = totalBytes / encoder->channels + (ch < (totalBytes % encoder->channels));
		#ifdef WMOPS
		BASOP_sub_start("fec_enc");
		push_wmops("fec_enc");
		#endif

		fec_encoder(encoder->epmode, encoder->epmr, lc3buf, encoder->channel_setup[ch]->targetBytes, output_size2,
		@@ -664,7 +664,7 @@ int Enc_LC3PLUS(LC3PLUS_Enc encoder, void *input, int bits_per_sample, UWord8
		input_size = output_size;
		output_size = (Word32)encoder->bitrate * encoder->frame_length / (8 * encoder->fs_in);
		#ifdef WMOPS
		BASOP_sub_start("fec_enc");
		push_wmops("fec_enc");
		#endif

		fec_encoder(encoder->epmode, encoder->epmr, output, input_size, output_size, encoder->channel_setup[0]->n_pccw,

lib_lc3plus/plc_classify_fx.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@ static void array_insert_and_shift(Word32 *array, UWord8 value, Word16 longterm_
		Word32 current_byte = 0;

		#ifdef WMOPS
		BASOP_sub_sub_start("PLC::array_insert_and_shift");
		push_wmops("PLC::array_insert_and_shift");
		#endif

		IF( overall_counter != NULL)
		@@ -74,7 +74,7 @@ static void array_calculate(Word32 array_tdc, Word32 array_ns, int length, Wor
		Word16 counter_loc_tdc = 0, counter_loc_ns = 0, counter_tmp = 0;

		#ifdef WMOPS
		BASOP_sub_sub_start("PLC::array_calculate");
		push_wmops("PLC::array_calculate");
		#endif

		for (i = length - 1; i >= 0; i--)
		@@ -131,7 +131,7 @@ void processPLCclassify_fx(Word16 plcMeth, Word16 concealMethod, Word16 nbLost
		);

		#ifdef WMOPS
		BASOP_sub_sub_start("PLC::processPLCclassify_fx");
		push_wmops("PLC::processPLCclassify_fx");
		#endif

		UNUSED(yLen);
		@@ -269,7 +269,7 @@ Word16 spectral_centroid_fx_lc(Word16 old_scf_q[], const Word16 *band_offsets, W
		Word16 *band_offsets_local;
		);
		#ifdef WMOPS
		BASOP_sub_sub_start("PLC::spectral_centroid_fx_lc");
		push_wmops("PLC::spectral_centroid_fx_lc");
		#endif

		#ifdef ENABLE_HR_MODE

lib_lc3plus/plc_phecu_fec_hq_fx.c

+27 −27

Original line number	Diff line number	Diff line
		@@ -128,7 +128,7 @@ static void rotate_W16_fx(Word16 re_in, Word16 im_in, Word16 cosFactor, Word16 s
		Word16 *im_out_ptr)
		{
		#ifdef WMOPS
		BASOP_sub_sub_start("PhECU::rotate_W16_fx");
		push_wmops("PhECU::rotate_W16_fx");
		#endif
		re_out_ptr = msu_r(L_mult(re_in, cosFactor), im_in, sinFactor); / 2 ops no move when inlined */
		im_out_ptr = mac_r(L_mult(re_in, sinFactor), im_in, cosFactor); / 2 ops no move when inlined */
		@@ -142,7 +142,7 @@ static void valley_magnitude_adj_fx(Word16 re_ptr, Word16 im_ptr, Word16 uniFa
		{
		Word16 scale_fx;
		#ifdef WMOPS
		BASOP_sub_sub_start("PhECU::valley_magnitude_adj_fx");
		push_wmops("PhECU::valley_magnitude_adj_fx");
		#endif

		/* y = 0.5((2rand(1,10000) + 1cos(2pix)) - 1 / /* y will be in -1 to 1 range */
		@@ -189,7 +189,7 @@ Word16 rand_phase_fx(const Word16 seed, Word16 sin_F, Word16 cos_F)
		#endif

		#ifdef WMOPS
		BASOP_sub_sub_start("PhECU::rand_phase_fx");
		push_wmops("PhECU::rand_phase_fx");
		#endif

		seed2 = extract_l(L_mac0(13849, seed, 31821));
		@@ -355,13 +355,13 @@ void trans_burst_ana_fx(
		if (time_offs == 0)
		{
		#ifdef WMOPS
		BASOP_sub_sub_start("PhECU::trans_burst_ana_fx(1st)");
		push_wmops("PhECU::trans_burst_ana_fx(1st)");
		#endif
		}
		else
		{
		#ifdef WMOPS
		BASOP_sub_sub_start("PhECU::trans_burst_ana_fx(N)");
		push_wmops("PhECU::trans_burst_ana_fx(N)");
		#endif
		}

		@@ -827,7 +827,7 @@ static Word16 imax_fx( /* o: The location, relative to the
		#endif

		#ifdef WMOPS
		BASOP_sub_sub_start("PhECU::imax_fx");
		push_wmops("PhECU::imax_fx");
		#endif

		/* Seek the extremum of the parabola P(x) defined by 3 consecutive points
		@@ -960,7 +960,7 @@ static Word16 imax_fx( /* o: The location, relative to the
		Word16 n_real_interp_tail;

		#ifdef WMOPS
		BASOP_sub_sub_start("PhECU::spec_ana_fx(1st)");
		push_wmops("PhECU::spec_ana_fx(1st)");
		#endif
		#ifdef DYNMEM_COUNT
		Dyn_Mem_In("spec_ana_fx", sizeof(struct {
		@@ -1009,7 +1009,7 @@ static Word16 imax_fx( /* o: The location, relative to the
		/* The length of the rectangular portion of the Hamming-Rectangular window. */
		{
		#ifdef WMOPS
		BASOP_sub_sub_start("PhECU::WhrAnaWin+fft");
		push_wmops("PhECU::WhrAnaWin+fft");
		#endif

		/* Apply hamming-rect window */
		@@ -1053,7 +1053,7 @@ static Word16 imax_fx( /* o: The location, relative to the


		#ifdef WMOPS
		BASOP_sub_sub_start("PhECU::Peaks_refine");
		push_wmops("PhECU::Peaks_refine");
		#endif

		/* Refine peaks */
		@@ -1308,13 +1308,13 @@ static Word16 imax_fx( /* o: The location, relative to the
		if (time_offs == 0)
		{
		#ifdef WMOPS
		BASOP_sub_sub_start("PhECU::subst_spec_fx(1st)");
		push_wmops("PhECU::subst_spec_fx(1st)");
		#endif
		}
		else
		{
		#ifdef WMOPS
		BASOP_sub_sub_start("PhECU::subst_spec_fx(N)");
		push_wmops("PhECU::subst_spec_fx(N)");
		#endif
		}

		@@ -1701,7 +1701,7 @@ static Word16 imax_fx( /* o: The location, relative to the
		#endif

		#ifdef WMOPS
		BASOP_sub_sub_start("PhECU::my_wtda_fx");
		push_wmops("PhECU::my_wtda_fx");
		#endif

		L_w_audio = (Word32 )scratchAlign(scratchBuffer, 0); / Size = 4 * 2 * MAX_L_FRAME */
		@@ -1808,7 +1808,7 @@ static Word16 imax_fx( /* o: The location, relative to the
		#endif

		#ifdef WMOPS
		BASOP_sub_sub_start("PhECU::rec_wtda_fx");
		push_wmops("PhECU::rec_wtda_fx");
		#endif

		rec_buf = scratchAlign(scratchBuffer, 0); /* Size = 2 * 2 * MAX_L_FRAME */
		@@ -1894,7 +1894,7 @@ static Word16 imax_fx( /* o: The location, relative to the
		#endif

		#ifdef WMOPS
		BASOP_sub_sub_start("PhECU::rec_frame_fx");
		push_wmops("PhECU::rec_frame_fx");
		#endif

		L_x = (Word32 )scratchAlign(scratchBuffer, 0); / Size = 4 * MAX_LPROT */
		@@ -1913,7 +1913,7 @@ static Word16 imax_fx( /* o: The location, relative to the
		fft_scale = -1; move16();

		#ifdef WMOPS
		BASOP_sub_sub_start("PhECU::IFFT_fx");
		push_wmops("PhECU::IFFT_fx");
		#endif
		BASOP_irfftN(L_x, Lprot, &fft_scale, buffer_fft);
		#ifdef WMOPS
		@@ -2037,13 +2037,13 @@ static Word16 imax_fx( /* o: The location, relative to the
		if (!prev_bfi)
		{
		#ifdef WMOPS
		BASOP_sub_sub_start("PhECU::hq_phase_ecu_fx(1st)");
		push_wmops("PhECU::hq_phase_ecu_fx(1st)");
		#endif
		}
		else
		{
		#ifdef WMOPS
		BASOP_sub_sub_start("PhECU::hq_phase_ecu_fx(N)");
		push_wmops("PhECU::hq_phase_ecu_fx(N)");
		#endif
		}

		@@ -2257,7 +2257,7 @@ static Word16 imax_fx( /* o: The location, relative to the
		Word32 acc;
		Word16 z;
		#ifdef WMOPS
		BASOP_sub_sub_start("PhECU::sqrt2ndOrder");
		push_wmops("PhECU::sqrt2ndOrder");
		#endif

		ASSERT(x >= 16384);
		@@ -2298,7 +2298,7 @@ static Word16 imax_fx( /* o: The location, relative to the
		#endif

		#ifdef WMOPS
		BASOP_sub_sub_start("PhECU::windowing_L");
		push_wmops("PhECU::windowing_L");
		#endif

		pX = x;
		@@ -2360,7 +2360,7 @@ static Word16 imax_fx( /* o: The location, relative to the
		#endif

		#ifdef WMOPS
		BASOP_sub_sub_start("PhECU::windowing_ola");
		push_wmops("PhECU::windowing_ola");
		#endif

		pX = x;
		@@ -2461,7 +2461,7 @@ static Word16 imax_fx( /* o: The location, relative to the
		#endif

		#ifdef WMOPS
		BASOP_sub_sub_start("PhECU::sqrtMagnApprox_fx");
		push_wmops("PhECU::sqrtMagnApprox_fx");
		#endif

		/* Get values and move pointers */
		@@ -2521,7 +2521,7 @@ static Word16 imax_fx( /* o: The location, relative to the
		#endif

		#ifdef WMOPS
		BASOP_sub_sub_start("PhECU::fft_spec2_sqrt_approx_fx");
		push_wmops("PhECU::fft_spec2_sqrt_approx_fx");
		#endif

		/* Magnitude at 0. only real component */
		@@ -2585,7 +2585,7 @@ static Word16 imax_fx( /* o: The location, relative to the
		#endif

		#ifdef WMOPS
		BASOP_sub_sub_start("PhECU::imax2_jacobsen_mag_fx");
		push_wmops("PhECU::imax2_jacobsen_mag_fx");
		#endif

		/* Jacobsen estimates peak offset relative y_0 using
		@@ -2693,7 +2693,7 @@ static Word16 imax_fx( /* o: The location, relative to the
		#define FHG_FFT_UPSHIFT 2

		#ifdef WMOPS
		BASOP_sub_sub_start("PhECU::intlvW32_2_flippedW16");
		push_wmops("PhECU::intlvW32_2_flippedW16");
		#endif
		#ifdef DYNMEM_COUNT
		Dyn_Mem_In("intlvW32_2_flippedW16", sizeof(struct {
		@@ -2767,7 +2767,7 @@ static Word16 imax_fx( /* o: The location, relative to the
		Word32 *pX_L;
		Word16 pX_re, pX_im;
		#ifdef WMOPS
		BASOP_sub_sub_start("PhECU::flippedW16_2_intlvW32");
		push_wmops("PhECU::flippedW16_2_intlvW32");
		#endif
		#ifdef DYNMEM_COUNT
		Dyn_Mem_In("flippedW16_2_intlvW32", sizeof(struct {
		@@ -2819,7 +2819,7 @@ static Word16 imax_fx( /* o: The location, relative to the
		#endif

		#ifdef WMOPS
		BASOP_sub_sub_start("PhECU::get_sin_cosQ10opt");
		push_wmops("PhECU::get_sin_cosQ10opt");
		#endif

		/* sin table has a range up to pi/2 (256+1)=257 coeffs*/
		@@ -2903,7 +2903,7 @@ static Word16 imax_fx( /* o: The location, relative to the
		#endif

		#ifdef WMOPS
		BASOP_sub_sub_start("PhEcu::nonpure_tone_ana_fx");
		push_wmops("PhEcu::nonpure_tone_ana_fx");
		#endif

		Word16 nonpure_tone_detect; /* output variable */

lib_lc3plus/plc_phecu_peak_locator_fx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -66,7 +66,7 @@ void plc_phEcu_peak_locator_fx(const Word16 inp, / i: vector with values >=0
		}));
		#endif
		#ifdef WMOPS
		BASOP_sub_sub_start("PhECU::peak_locator_fx(1st)");
		push_wmops("PhECU::peak_locator_fx(1st)");
		#endif
		sc_idx = (Word16 )scratchAlign(scratchBuffer, 0); / ByteSize = 2 * (1+ inp_len+1) */
		cand_pairs_buf = (Word16 )scratchAlign(sc_idx, sizeof(sc_idx) * (1+inp_len+1)); /* ByteSize = 2 * (1+ 1+ inp_len+1 ) */