From 5b353253c634f52b393c8afe68023d964715dfec Mon Sep 17 00:00:00 2001 From: Archit Tamarapu Date: Thu, 20 Feb 2025 13:35:37 +0100 Subject: [PATCH 1/9] rename WMOPS_LC3PLUS back to WMOPS --- lib_lc3plus/basop_util_lc3plus.h | 8 +- lib_lc3plus/dec_lc3.c | 94 ++++++++++---------- lib_lc3plus/enc_lc3.c | 112 ++++++++++++------------ lib_lc3plus/plc_classify_fx.c | 16 ++-- lib_lc3plus/plc_phecu_fec_hq_fx.c | 106 +++++++++++----------- lib_lc3plus/plc_phecu_peak_locator_fx.c | 4 +- lib_lc3plus/plc_phecu_setf0hz_fx.c | 4 +- lib_lc3plus/plc_phecu_tools_fx.c | 4 +- lib_lc3plus/plc_update_aft_imdct_fx.c | 8 +- lib_lc3plus/plc_update_fx.c | 4 +- lib_lc3plus/plc_xcorr_fx.c | 8 +- lib_lc3plus/pvq_enc_fx.c | 4 +- lib_lc3plus/pvq_index_fx.c | 8 +- lib_lc3plus/sns_quantize_scf_fx.c | 20 ++--- 14 files changed, 200 insertions(+), 200 deletions(-) diff --git a/lib_lc3plus/basop_util_lc3plus.h b/lib_lc3plus/basop_util_lc3plus.h index f22d531cf..5f4f5c56b 100644 --- a/lib_lc3plus/basop_util_lc3plus.h +++ b/lib_lc3plus/basop_util_lc3plus.h @@ -316,14 +316,14 @@ void BASOP_cfft_lc3plus(Word32 *re, Word32 *im, Word16 sizeOfFft, Word16 s, Word void BASOP_rfftN(Word32 *re, Word16 sizeOfFft, Word16 *scale, Word8 *scratchBuffer); void BASOP_irfftN(Word32 *re, Word16 sizeOfFft, Word16 *scale, Word8 *scratchBuffer); -#if WMOPS_LC3PLUS +#if WMOPS extern BASIC_OP multiCounter[MAXCOUNTERS]; extern int currCounter; #endif static __inline void basop_memcpy(void *dst, const void *src, size_t n) { -#if WMOPS_LC3PLUS +#if WMOPS multiCounter[currCounter].move16 += (UWord32)n / 2; #endif /* check for overlapping memory */ @@ -333,7 +333,7 @@ static __inline void basop_memcpy(void *dst, const void *src, size_t n) static __inline void basop_memmove(void *dst, const void *src, size_t n) { -#if WMOPS_LC3PLUS +#if WMOPS multiCounter[currCounter].move16 += (UWord32)n / 2; #endif memmove(dst, src, n); @@ -341,7 +341,7 @@ static __inline void basop_memmove(void *dst, const void *src, size_t n) static __inline void basop_memset(void *dst, int val, size_t n) { -#if WMOPS_LC3PLUS +#if WMOPS multiCounter[currCounter].move16 += (UWord32)n / 2; #endif memset(dst, val, n); diff --git a/lib_lc3plus/dec_lc3.c b/lib_lc3plus/dec_lc3.c index 59a061862..40818106e 100644 --- a/lib_lc3plus/dec_lc3.c +++ b/lib_lc3plus/dec_lc3.c @@ -148,7 +148,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s memset(q_d_fx, 0, decoder->frame_length * sizeof(*q_d_fx)); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("Decoder"); #endif @@ -164,18 +164,18 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s if (bfi != 1) { -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("Dec(bfi=0)"); #endif } else { -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("Dec(bfi=1)"); #endif } -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("Entropy dec"); #endif IF (sub(bfi, 1) != 0) @@ -186,11 +186,11 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s BW_cutoff_idx_nf = BW_cutoff_idx; move16(); } -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); /* Entropy dec */ #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("Ari dec"); #endif IF (sub(bfi, 1) != 0) @@ -243,11 +243,11 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s processAriDecoderScaling_fx(sqQdec, decoder->yLen, q_d_fx, &q_fx_exp); } } -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); /* Ari dec */ #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("SnsQuantScfDec"); #endif IF (sub(bfi, 1) != 0) @@ -260,11 +260,11 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s processSnsQuantizeScfDecoder_fx(L_scf_idx, scf_q, currentScratch); #endif } -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("PLC::ComputeStabFac"); #endif if (h_DecSetup->plcAd) @@ -272,11 +272,11 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s processPLCcomputeStabFac_main(scf_q, h_DecSetup->plcAd->old_scf_q, h_DecSetup->plcAd->old_old_scf_q, bfi, h_DecSetup->prev_bfi, h_DecSetup->prev_prev_bfi, &h_DecSetup->plcAd->stab_fac); } -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("Partial Concealment"); #endif IF (sub(bfi, 1) != 0) @@ -295,13 +295,13 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s &h_DecSetup->prev_gg_e, &BW_cutoff_idx_nf, &h_DecSetup->prev_BW_cutoff_idx_nf, fac_ns_idx, &h_DecSetup->prev_fac_ns_fx, &h_DecSetup->pc_nbLostFramesInRow); } -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif IF (sub(bfi, 1) != 0) { -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("Residual dec"); #endif processResidualDecoding_fx(q_d_fx, q_fx_exp, decoder->yLen, resBitBuf, fill_bits @@ -309,11 +309,11 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s , decoder->hrmode #endif ); -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("Noisefill"); #endif /* currentScratch Size = 2 * MAX_LEN bytes */ @@ -326,19 +326,19 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s #endif ); } -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("applyGlobalGain"); #endif processApplyGlobalGain_fx(q_d_fx, &q_fx_exp, decoder->yLen, gg_idx, h_DecSetup->quantizedGainOff); -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("Tns_dec"); #endif /* currentScratch Size = 48 bytes */ @@ -348,45 +348,45 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s , decoder->hrmode #endif ); -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif #ifdef ENABLE_HR_MODE -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("SnsInterpScfDec"); #endif processSnsInterpolateScf_fx(scf_q_ip, int_scf_fx_ip, int_scf_fx_exp, 0, decoder->bands_number, currentScratch); -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("Mdct shaping_dec"); #endif processScfScaling(int_scf_fx_exp, decoder->bands_number, &q_fx_exp); processMdctShaping_fx(q_d_fx, int_scf_fx_ip, int_scf_fx_exp, decoder->bands_offset, decoder->bands_number); -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif #else -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("SnsInterpScfDec"); #endif /* currentScratch Size = 128 bytes */ processSnsInterpolateScf_fx(scf_q, int_scf_fx, int_scf_fx_exp, 0, decoder->bands_number, currentScratch); -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("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); -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif /* end int_scf_fx */ @@ -406,7 +406,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s } #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("PLC::Main"); #endif /* currentScratch Size = 2 * MAX_LGW + 8 * MAX_LPROT + 12 * MAX_L_FRAME */ @@ -432,7 +432,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s , decoder->alpha_type_2_table #endif ); -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif @@ -446,7 +446,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s } #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("PLC/PC::DampingScrambling"); #endif if (h_DecSetup->plcAd) @@ -462,11 +462,11 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s #endif ); } -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("Imdct"); #endif /* currentScratch Size = 4 * MAX_LEN */ @@ -499,11 +499,11 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s } #endif /* ENABLE_HR_MODE */ -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("PLC::Update"); #endif @@ -514,11 +514,11 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s , decoder->hrmode #endif ); -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("LtpfDec"); #endif /* currentScratch Size = 0.5 * MAX_LEN + 20 bytes */ @@ -533,7 +533,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s &h_DecSetup->rel_pitch_change, decoder->hrmode, decoder->frame_dms, #endif currentScratch); -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif @@ -547,7 +547,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s } #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("Output scaling"); #endif { @@ -579,15 +579,15 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s } } } -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); /* Output scaling */ #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); /* Decoder */ #endif @@ -623,7 +623,7 @@ LC3PLUS_Error Dec_LC3PLUS(LC3PLUS_Dec *decoder, UWord8 *input, int num_bytes, vo { fec_num_bytes = num_bytes; -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("fec_dec"); #endif @@ -632,7 +632,7 @@ LC3PLUS_Error Dec_LC3PLUS(LC3PLUS_Dec *decoder, UWord8 *input, int num_bytes, vo &decoder->n_pccw, &bfi, &decoder->be_bp_left, &decoder->be_bp_right, &decoder->n_pc, &decoder->m_fec, scratch); -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif @@ -668,7 +668,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_LC3PLUS +#ifdef WMOPS BASOP_sub_start("fec_dec"); #endif @@ -679,7 +679,7 @@ LC3PLUS_Error Dec_LC3PLUS(LC3PLUS_Dec *decoder, UWord8 *input, int num_bytes, vo &decoder->n_pccw, &channel_bfi, &decoder->be_bp_left, &decoder->be_bp_right, &decoder->n_pc, &decoder->m_fec, scratch); -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif diff --git a/lib_lc3plus/enc_lc3.c b/lib_lc3plus/enc_lc3.c index ada4bf87e..30ff9971b 100644 --- a/lib_lc3plus/enc_lc3.c +++ b/lib_lc3plus/enc_lc3.c @@ -61,7 +61,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ # endif #endif /* CR8_F_ADAPT_MDCT_DCT_PRECISION */ -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("Encoder"); #endif @@ -134,7 +134,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ /* Scale 24-bit input data */ IF (sub(bits_per_sample, 24) == 0) { -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("Scale_signal24"); #endif scale_signal24_fx(s_in, s_in_scaled, &h_EncSetup->x_exp, h_EncSetup->stEnc_mdct_mem, @@ -142,7 +142,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ h_EncSetup->r12k8_mem_50, h_EncSetup->r12k8_mem_out, encoder->r12k8_mem_out_len, h_EncSetup->mdct_mem32, encoder->frame_length, h_EncSetup->resamp_mem32, h_EncSetup->olpa_mem_s12k8, &h_EncSetup->resamp_exp); -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif } @@ -161,7 +161,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ #endif } -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("Mdct"); #endif @@ -174,12 +174,12 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ #endif encoder->W_fx, encoder->W_size, h_EncSetup->stEnc_mdct_mem, encoder->stEnc_mdct_mem_len, d_fx, &d_fx_exp, currentScratch); -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif /* begin s_12k8 */ -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("Resamp12k8"); #endif /* currentScratch Size = 2.25 * MAX_LEN bytes */ @@ -198,11 +198,11 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ , bits_per_sample ); #endif /* ENABLE_HR_MODE */ -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("Olpa"); #endif /* currentScratch Size = 392 bytes */ @@ -212,11 +212,11 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ &h_EncSetup->pitch_flag, #endif h_EncSetup->resamp_exp, encoder->frame_dms, currentScratch); -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("LtpfEnc"); #endif /* currentScratch Size = 512 bytes */ @@ -229,12 +229,12 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ ,encoder->hrmode #endif ); -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif /* end s_12k8 */ -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("AttackDetector"); #endif /* currentScratch Size = ??? bytes */ @@ -243,12 +243,12 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ #else attack_detector_fx(encoder, h_EncSetup, s_in_scaled, sub(h_EncSetup->x_exp, 15), currentScratch); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif /* begin ener_fx */ -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("PerBandEnergy"); #endif /* currentScratch Size = 160 bytes */ @@ -258,11 +258,11 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ , encoder->hrmode #endif ); -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("Near Nyquist Detector"); #endif /* Near Nyquist Detector */ @@ -283,10 +283,10 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ h_EncSetup->ltpf_mem_ltpf_on = 0; move16(); ltpf_idx[1] = 0; move16(); } -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("BW Cutoff-Detection"); #endif IF (h_EncSetup->lfe == 0) @@ -311,11 +311,11 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ { BW_cutoff_idx = 0; } -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("SnsCompScf"); #endif @@ -324,39 +324,39 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ processSnsComputeScf_fx(ener_fx, ener_fx_exp, encoder->fs_idx, encoder->bands_number, scf, h_EncSetup->attdec_detected, encoder->attdec_damping, currentScratch, encoder->sns_damping ); -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("SnsQuantScfEnc"); #endif /* currentScratch Size = 500 bytes */ processSnsQuantizeScfEncoder_fx(scf, L_scf_idx, scf_q, currentScratch); -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("SnsInterpScfEnc"); #endif /* currentScratch Size = 128 bytes */ processSnsInterpolateScf_fx(scf_q, int_scf_fx, int_scf_fx_exp, 1, encoder->bands_number, currentScratch); -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("Mdct shaping_enc"); #endif processMdctShaping_fx(d_fx, int_scf_fx, int_scf_fx_exp, encoder->bands_offset, encoder->bands_number); -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif /* end int_scf_fx_exp */ -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("BandwidthControl_enc"); #endif if (encoder->bandwidth < L_shr_pos(encoder->fs, 1)) @@ -364,10 +364,10 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ process_cutoff_bandwidth(d_fx, encoder->yLen, encoder->bw_ctrl_cutoff_bin); BW_cutoff_idx = s_min(BW_cutoff_idx, encoder->bw_index); } -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("Tns_enc"); #endif /* currentScratch Size = 2 * MAX_LEN + 220 */ @@ -392,11 +392,11 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ h_EncSetup->tns_bits = tns_numfilters; move16(); } -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("Est. Global Gain"); #endif /* currentScratch Size = 4 * MAX_LEN bytes */ @@ -430,12 +430,12 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ , encoder->hrmode, h_EncSetup->regBits, encoder->frame_dms #endif ); -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif /* begin q_d_fx16 */ -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("Quant. 1"); #endif #ifdef ENABLE_HR_MODE @@ -448,11 +448,11 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ h_EncSetup->targetBitsAri, &h_EncSetup->mem_specBits, &nBits, encoder->fs_idx, &lastnz, codingdata, &lsbMode, -1); #endif /* ENABLE_HR_MODE */ -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("Adj. Global Gain"); #endif #ifdef ENABLE_HR_MODE @@ -466,11 +466,11 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ processAdjustGlobalGain_fx(&quantizedGain, quantizedGainMin, h_EncSetup->quantizedGainOff, &gain, &gain_e, h_EncSetup->targetBitsQuant, h_EncSetup->mem_specBits, &gainChange, encoder->fs_idx); #endif /* ENABLE_HR_MODE */ -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("Quant. 2"); #endif IF (sub(gainChange, 1) == 0) @@ -485,11 +485,11 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ 0); #endif /* ENABLE_HR_MODE */ } -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("Res. Cod."); #endif IF (lsbMode == 0) @@ -516,11 +516,11 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ numResBits = 0; move16(); } -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("Noise fac"); #endif /* currentScratch Size = 2 * MAX_LEN bytes */ @@ -543,21 +543,21 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ fac_ns_idx = 7; move16(); } -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("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, fac_ns_idx, quantizedGain, BW_cutoff_idx, ltpf_idx, L_scf_idx, bfi_ext, encoder->fs_idx); -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("Ari cod"); #endif processAriEncoder_fx(bytes, bp_side, mask_side, h_EncSetup->targetBitsAri, @@ -568,17 +568,17 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ #endif tns_order, tns_numfilters, indexes, lastnz, codingdata, resBits, numResBits, lsbMode, h_EncSetup->enable_lpc_weighting, currentScratch); -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("Reorder Bitstream Enc"); #endif test(); IF (encoder->combined_channel_coding == 0 && h_EncSetup->n_pc > 0) { -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("Reorder Ari dec"); #endif @@ -606,17 +606,17 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ ); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); /* Ari dec */ #endif processReorderBitstream_fx(bytes, h_EncSetup->n_pccw, h_EncSetup->n_pc, b_left, currentScratch); } -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif /* end q_d_fx16 */ -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif @@ -638,14 +638,14 @@ int Enc_LC3PLUS(LC3PLUS_Enc *encoder, void **input, int bits_per_sample, UWord8 if (encoder->epmode && encoder->combined_channel_coding == 0) { output_size2 = totalBytes / encoder->channels + (ch < (totalBytes % encoder->channels)); -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_start("fec_enc"); #endif fec_encoder(encoder->epmode, encoder->epmr, lc3buf, encoder->channel_setup[ch]->targetBytes, output_size2, encoder->channel_setup[ch]->n_pccw, scratch); -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif @@ -663,14 +663,14 @@ 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_LC3PLUS +#ifdef WMOPS BASOP_sub_start("fec_enc"); #endif fec_encoder(encoder->epmode, encoder->epmr, output, input_size, output_size, encoder->channel_setup[0]->n_pccw, scratch); -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_end(); #endif } diff --git a/lib_lc3plus/plc_classify_fx.c b/lib_lc3plus/plc_classify_fx.c index d30b516a4..bbb01826a 100644 --- a/lib_lc3plus/plc_classify_fx.c +++ b/lib_lc3plus/plc_classify_fx.c @@ -45,7 +45,7 @@ static void array_insert_and_shift(Word32 *array, UWord8 value, Word16 longterm_ { Word32 current_byte = 0; -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("PLC::array_insert_and_shift"); #endif @@ -58,7 +58,7 @@ static void array_insert_and_shift(Word32 *array, UWord8 value, Word16 longterm_ current_byte = change_bit_at_position(current_byte, *bit_position, value); array[*byte_position] = current_byte; move16(); -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif } @@ -73,7 +73,7 @@ static void array_calculate(Word32 *array_tdc, Word32 *array_ns, int length, Wor Word32 current_byte_tdc = 0, current_byte_ns = 0; Word16 counter_loc_tdc = 0, counter_loc_ns = 0, counter_tmp = 0; -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("PLC::array_calculate"); #endif @@ -104,7 +104,7 @@ static void array_calculate(Word32 *array_tdc, Word32 *array_ns, int length, Wor #ifndef CR9_L_RETRAIN_FADEOUT_TYPE_CLASSIFIER *counter_phecu = sub(sub(overall_counter, counter_loc_tdc), counter_loc_ns); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif } @@ -130,7 +130,7 @@ void processPLCclassify_fx(Word16 plcMeth, Word16 *concealMethod, Word16 *nbLost Word32 class; ); -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("PLC::processPLCclassify_fx"); #endif @@ -246,7 +246,7 @@ void processPLCclassify_fx(Word16 plcMeth, Word16 *concealMethod, Word16 *nbLost } Dyn_Mem_Deluxe_Out(); -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif } @@ -268,7 +268,7 @@ Word16 spectral_centroid_fx_lc(Word16 old_scf_q[], const Word16 *band_offsets, W Word16 *old_scf_q_mod_exp; Word16 *band_offsets_local; ); -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("PLC::spectral_centroid_fx_lc"); #endif @@ -415,7 +415,7 @@ Word16 spectral_centroid_fx_lc(Word16 old_scf_q[], const Word16 *band_offsets, W # endif Dyn_Mem_Deluxe_Out(); -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif return sc; diff --git a/lib_lc3plus/plc_phecu_fec_hq_fx.c b/lib_lc3plus/plc_phecu_fec_hq_fx.c index aaf6a9bd0..ca2a345f4 100644 --- a/lib_lc3plus/plc_phecu_fec_hq_fx.c +++ b/lib_lc3plus/plc_phecu_fec_hq_fx.c @@ -127,12 +127,12 @@ static Word16 plc_phEcu_nonpure_tone_ana_fx(const Word16* plocs, const Word16 static void rotate_W16_fx(Word16 re_in, Word16 im_in, Word16 cosFactor, Word16 sinFactor, Word16 *re_out_ptr, Word16 *im_out_ptr) { -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("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 */ -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif return; @@ -141,7 +141,7 @@ static void rotate_W16_fx(Word16 re_in, Word16 im_in, Word16 cosFactor, Word16 s static void valley_magnitude_adj_fx(Word16 *re_ptr, Word16 *im_ptr, Word16 uniFactor, Word16 cosFactor) { Word16 scale_fx; -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("PhECU::valley_magnitude_adj_fx"); #endif @@ -158,7 +158,7 @@ static void valley_magnitude_adj_fx(Word16 *re_ptr, Word16 *im_ptr, Word16 uniFa *re_ptr = mult_r(scale_fx, shl_sat(*re_ptr, 1)); /* no moves , should be inlined */ *im_ptr = mult_r(scale_fx, shl_sat(*im_ptr, 1)); /* no moves , should be inlined */ -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif return; @@ -188,7 +188,7 @@ Word16 rand_phase_fx(const Word16 seed, Word16 *sin_F, Word16 *cos_F) })); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("PhECU::rand_phase_fx"); #endif @@ -201,7 +201,7 @@ Word16 rand_phase_fx(const Word16 seed, Word16 *sin_F, Word16 *cos_F) #ifdef DYNMEM_COUNT Dyn_Mem_Out(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif return seed2; @@ -354,13 +354,13 @@ void trans_burst_ana_fx( if (time_offs == 0) { -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("PhECU::trans_burst_ana_fx(1st)"); #endif } else { -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("PhECU::trans_burst_ana_fx(N)"); #endif } @@ -699,7 +699,7 @@ void trans_burst_ana_fx( L_acc = L_sub((INT32_MAX >> 1) + 1, L_mult0(alpha[k], alpha[k])); { - /* use lower complex(WMOPS_LC3PLUS/ROM) 2nd-order sqrt approximation */ + /* use lower complex(WMOPS/ROM) 2nd-order sqrt approximation */ Word32 L_man, L_acc2 = L_acc; Word16 tmp, expo_in, expo2, man_in, man; /* updated code using the 2nd order approximation routine */ @@ -797,7 +797,7 @@ void trans_burst_ana_fx( #ifdef DYNMEM_COUNT Dyn_Mem_Out(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif } @@ -826,7 +826,7 @@ static Word16 imax_fx( /* o: The location, relative to the })); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("PhECU::imax_fx"); #endif @@ -913,7 +913,7 @@ static Word16 imax_fx( /* o: The location, relative to the #ifdef DYNMEM_COUNT Dyn_Mem_Out(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif return posi; @@ -959,7 +959,7 @@ static Word16 imax_fx( /* o: The location, relative to the Word16 P_in_plocs; Word16 n_real_interp_tail; -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("PhECU::spec_ana_fx(1st)"); #endif #ifdef DYNMEM_COUNT @@ -1008,7 +1008,7 @@ static Word16 imax_fx( /* o: The location, relative to the rectLength = sub(Lprot, shl_pos(hamm_len2, 1)); /* The length of the rectangular portion of the Hamming-Rectangular window. */ { -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("PhECU::WhrAnaWin+fft"); #endif @@ -1016,7 +1016,7 @@ static Word16 imax_fx( /* o: The location, relative to the windowing_L(xfp, L_xfp, sp_ana_win, rectLength, hamm_len2); BASOP_rfftN(L_xfp, Lprot, &fft_scale, buffer_fft); } -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); /* anawin+fft */ #endif @@ -1035,7 +1035,7 @@ static Word16 imax_fx( /* o: The location, relative to the basop_memset(xfp + stop_band_start, 0, (stop_band_length) * sizeof(Word16)); } - peak_range_1 = s_min(Lprot2p1, MAX_LPROT_RED / 2 + 1); /* limit preliminary only active for 48k to save WMOPS_LC3PLUS */ + peak_range_1 = s_min(Lprot2p1, MAX_LPROT_RED / 2 + 1); /* limit preliminary only active for 48k to save WMOPS */ basop_memmove(X_sav, xfp, (Lprot) * sizeof(Word16)); @@ -1052,7 +1052,7 @@ static Word16 imax_fx( /* o: The location, relative to the plc_phEcu_peak_locator_fx(xfp, peak_range_1, plocs, num_plocs, sens, Xmax, Xmin, MAX_LPROT_RED, buffer_fft); -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("PhECU::Peaks_refine"); #endif @@ -1173,7 +1173,7 @@ static Word16 imax_fx( /* o: The location, relative to the } } -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); /* peaks refine */ #endif @@ -1217,7 +1217,7 @@ static Word16 imax_fx( /* o: The location, relative to the #ifdef DYNMEM_COUNT Dyn_Mem_Out(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif } @@ -1307,13 +1307,13 @@ static Word16 imax_fx( /* o: The location, relative to the if (time_offs == 0) { -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("PhECU::subst_spec_fx(1st)"); #endif } else { -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("PhECU::subst_spec_fx(N)"); #endif } @@ -1669,7 +1669,7 @@ static Word16 imax_fx( /* o: The location, relative to the #ifdef DYNMEM_COUNT Dyn_Mem_Out(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif } @@ -1700,7 +1700,7 @@ static Word16 imax_fx( /* o: The location, relative to the })); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("PhECU::my_wtda_fx"); #endif @@ -1760,7 +1760,7 @@ static Word16 imax_fx( /* o: The location, relative to the #ifdef DYNMEM_COUNT Dyn_Mem_Out(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif return; @@ -1807,7 +1807,7 @@ static Word16 imax_fx( /* o: The location, relative to the })); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("PhECU::rec_wtda_fx"); #endif @@ -1849,7 +1849,7 @@ static Word16 imax_fx( /* o: The location, relative to the #ifdef DYNMEM_COUNT Dyn_Mem_Out(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif @@ -1893,7 +1893,7 @@ static Word16 imax_fx( /* o: The location, relative to the })); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("PhECU::rec_frame_fx"); #endif @@ -1912,11 +1912,11 @@ static Word16 imax_fx( /* o: The location, relative to the fft_scale = -1; move16(); -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("PhECU::IFFT_fx"); #endif BASOP_irfftN(L_x, Lprot, &fft_scale, buffer_fft); -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif @@ -1955,7 +1955,7 @@ static Word16 imax_fx( /* o: The location, relative to the #ifdef DYNMEM_COUNT Dyn_Mem_Out(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif return; @@ -2036,13 +2036,13 @@ static Word16 imax_fx( /* o: The location, relative to the if (!prev_bfi) { -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("PhECU::hq_phase_ecu_fx(1st)"); #endif } else { -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("PhECU::hq_phase_ecu_fx(N)"); #endif } @@ -2244,7 +2244,7 @@ static Word16 imax_fx( /* o: The location, relative to the #ifdef DYNMEM_COUNT Dyn_Mem_Out(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif } @@ -2256,7 +2256,7 @@ static Word16 imax_fx( /* o: The location, relative to the { Word32 acc; Word16 z; -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("PhECU::sqrt2ndOrder"); #endif @@ -2268,7 +2268,7 @@ static Word16 imax_fx( /* o: The location, relative to the z = mac_r(acc, z, x); /* in Q15 */ -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif return z; @@ -2297,7 +2297,7 @@ static Word16 imax_fx( /* o: The location, relative to the })); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("PhECU::windowing_L"); #endif @@ -2335,7 +2335,7 @@ static Word16 imax_fx( /* o: The location, relative to the #ifdef DYNMEM_COUNT Dyn_Mem_Out(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif } @@ -2359,7 +2359,7 @@ static Word16 imax_fx( /* o: The location, relative to the })); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("PhECU::windowing_ola"); #endif @@ -2375,7 +2375,7 @@ static Word16 imax_fx( /* o: The location, relative to the #ifdef DYNMEM_COUNT Dyn_Mem_Out(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif } @@ -2460,7 +2460,7 @@ static Word16 imax_fx( /* o: The location, relative to the })); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("PhECU::sqrtMagnApprox_fx"); #endif @@ -2478,7 +2478,7 @@ static Word16 imax_fx( /* o: The location, relative to the #ifdef DYNMEM_COUNT Dyn_Mem_Out(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif return sum; @@ -2520,7 +2520,7 @@ static Word16 imax_fx( /* o: The location, relative to the })); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("PhECU::fft_spec2_sqrt_approx_fx"); #endif @@ -2547,7 +2547,7 @@ static Word16 imax_fx( /* o: The location, relative to the #ifdef DYNMEM_COUNT Dyn_Mem_Out(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif return; @@ -2584,7 +2584,7 @@ static Word16 imax_fx( /* o: The location, relative to the })); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("PhECU::imax2_jacobsen_mag_fx"); #endif @@ -2667,7 +2667,7 @@ static Word16 imax_fx( /* o: The location, relative to the #ifdef DYNMEM_COUNT Dyn_Mem_Out(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif return posi; /* Q15. The position either left or right relative to the index of the middle of the 3 given @@ -2692,7 +2692,7 @@ static Word16 imax_fx( /* o: The location, relative to the #define FHG_FFT_UPSHIFT 2 -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("PhECU::intlvW32_2_flippedW16"); #endif #ifdef DYNMEM_COUNT @@ -2750,7 +2750,7 @@ static Word16 imax_fx( /* o: The location, relative to the #ifdef DYNMEM_COUNT Dyn_Mem_Out(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif } @@ -2766,7 +2766,7 @@ static Word16 imax_fx( /* o: The location, relative to the Counter numPairsLocal; Word32 *pX_L; Word16 *pX_re, *pX_im; -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("PhECU::flippedW16_2_intlvW32"); #endif #ifdef DYNMEM_COUNT @@ -2802,7 +2802,7 @@ static Word16 imax_fx( /* o: The location, relative to the #ifdef DYNMEM_COUNT Dyn_Mem_Out(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif } @@ -2818,7 +2818,7 @@ static Word16 imax_fx( /* o: The location, relative to the Dyn_Mem_In("get_sin_cosQ10", sizeof(struct { Word16 sign_val, idx, idx2, idx3; })); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("PhECU::get_sin_cosQ10opt"); #endif @@ -2871,7 +2871,7 @@ static Word16 imax_fx( /* o: The location, relative to the #ifdef DYNMEM_COUNT Dyn_Mem_Out(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif } @@ -2902,7 +2902,7 @@ static Word16 imax_fx( /* o: The location, relative to the })); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("PhEcu::nonpure_tone_ana_fx"); #endif @@ -3144,7 +3144,7 @@ static Word16 imax_fx( /* o: The location, relative to the } /* bands available*/ -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif diff --git a/lib_lc3plus/plc_phecu_peak_locator_fx.c b/lib_lc3plus/plc_phecu_peak_locator_fx.c index 78a6ec281..531ee8f6f 100644 --- a/lib_lc3plus/plc_phecu_peak_locator_fx.c +++ b/lib_lc3plus/plc_phecu_peak_locator_fx.c @@ -65,7 +65,7 @@ void plc_phEcu_peak_locator_fx(const Word16 *inp, /* i: vector with values >=0 Word16 *fsc_idx; })); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("PhECU::peak_locator_fx(1st)"); #endif sc_idx = (Word16 *)scratchAlign(scratchBuffer, 0); /* ByteSize = 2 * (1+ inp_len+1) */ @@ -378,7 +378,7 @@ void plc_phEcu_peak_locator_fx(const Word16 *inp, /* i: vector with values >=0 #ifdef DYNMEM_COUNT Dyn_Mem_Out(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif } diff --git a/lib_lc3plus/plc_phecu_setf0hz_fx.c b/lib_lc3plus/plc_phecu_setf0hz_fx.c index 264aa19c3..6fffe632c 100644 --- a/lib_lc3plus/plc_phecu_setf0hz_fx.c +++ b/lib_lc3plus/plc_phecu_setf0hz_fx.c @@ -32,7 +32,7 @@ plc_phEcuSetF0Hz_fx(/* output Q7 bin frequency [0.. 255.xxxx] "1 sign, 8 bits })); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("PhECU::plc_phEcuSetF0Hz_fx"); #endif @@ -50,7 +50,7 @@ plc_phEcuSetF0Hz_fx(/* output Q7 bin frequency [0.. 255.xxxx] "1 sign, 8 bits #ifdef DYNMEM_COUNT Dyn_Mem_Out(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif diff --git a/lib_lc3plus/plc_phecu_tools_fx.c b/lib_lc3plus/plc_phecu_tools_fx.c index 32eff68f2..9574499c9 100644 --- a/lib_lc3plus/plc_phecu_tools_fx.c +++ b/lib_lc3plus/plc_phecu_tools_fx.c @@ -167,7 +167,7 @@ Word32 winEnCalc( /* o: output summed energy Ltot */ #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("PhECU::winEnCalc"); #endif @@ -235,7 +235,7 @@ Word32 winEnCalc( /* o: output summed energy Ltot */ L_tot = L_shl(L_tot,tmp); *exp = sub(*exp, tmp); move16(); -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif #ifdef DYNMEM_COUNT diff --git a/lib_lc3plus/plc_update_aft_imdct_fx.c b/lib_lc3plus/plc_update_aft_imdct_fx.c index 6be74bb61..2bdab6eaf 100644 --- a/lib_lc3plus/plc_update_aft_imdct_fx.c +++ b/lib_lc3plus/plc_update_aft_imdct_fx.c @@ -37,7 +37,7 @@ void processPLCUpdateAfterIMDCT_fx(Word16 x_fx[], Word16 q_fx_exp, Word16 concea -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("processPLCUpdateAfterIMDCT "); #endif @@ -160,7 +160,7 @@ void processPLCUpdateAfterIMDCT_fx(Word16 x_fx[], Word16 q_fx_exp, Word16 concea *prev_prev_bfi = *prev_bfi; move16(); *prev_bfi = bfi; move16(); -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif @@ -254,7 +254,7 @@ void processPLCUpdateXFP_w_E_hist_fx(Word16 prev_bfi, Word16 bfi, Word16 *xfp_fx Word16 exp_out; })); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("PhECU::UpdateXfp_w_E_hist_fx"); #endif @@ -331,7 +331,7 @@ void processPLCUpdateXFP_w_E_hist_fx(Word16 prev_bfi, Word16 bfi, Word16 *xfp_fx } } -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif #ifdef DYNMEM_COUNT diff --git a/lib_lc3plus/plc_update_fx.c b/lib_lc3plus/plc_update_fx.c index b219aa674..305140ce7 100644 --- a/lib_lc3plus/plc_update_fx.c +++ b/lib_lc3plus/plc_update_fx.c @@ -85,7 +85,7 @@ void processPLCspec2shape_fx(Word16 prev_bfi, Word16 bfi, Word16 q_old_d_fx[], W Word16 fs_idx,local_prev_bfi; })); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("PhECU::GF::process_plc_spec_2_shape_fx"); #endif @@ -210,7 +210,7 @@ void processPLCspec2shape_fx(Word16 prev_bfi, Word16 bfi, Word16 q_old_d_fx[], W } -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif #ifdef DYNMEM_COUNT diff --git a/lib_lc3plus/plc_xcorr_fx.c b/lib_lc3plus/plc_xcorr_fx.c index 92fc0fc16..1a4782c32 100644 --- a/lib_lc3plus/plc_xcorr_fx.c +++ b/lib_lc3plus/plc_xcorr_fx.c @@ -52,7 +52,7 @@ Word16 plc_norm_corr_blocks_fx( /* o: norm_corr range [-1 })); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("plc_norm_corr_blocks_fx"); #endif @@ -166,7 +166,7 @@ Word16 plc_norm_corr_blocks_fx( /* o: norm_corr range [-1 #ifdef DYNMEM_COUNT Dyn_Mem_Out(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif return norm_corr; @@ -192,7 +192,7 @@ Word16 plc_xcorr_lc_fx( /* o: quantized output xcorr in Q })); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("plc_xcorr_lc_fx"); #endif @@ -241,7 +241,7 @@ Word16 plc_xcorr_lc_fx( /* o: quantized output xcorr in Q #ifdef DYNMEM_COUNT Dyn_Mem_Out(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif return norm_xcorr_est_q; diff --git a/lib_lc3plus/pvq_enc_fx.c b/lib_lc3plus/pvq_enc_fx.c index 3f073eb57..9c164dda5 100644 --- a/lib_lc3plus/pvq_enc_fx.c +++ b/lib_lc3plus/pvq_enc_fx.c @@ -144,7 +144,7 @@ void pvq_enc_search_fx( Word16 pulses_far, pulses, pulsesA, pulsesB; ); -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("pvq_enc_search_fx"); #endif @@ -362,7 +362,7 @@ void pvq_enc_search_fx( } Dyn_Mem_Deluxe_Out(); -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif } diff --git a/lib_lc3plus/pvq_index_fx.c b/lib_lc3plus/pvq_index_fx.c index 200862977..c7d63c840 100644 --- a/lib_lc3plus/pvq_index_fx.c +++ b/lib_lc3plus/pvq_index_fx.c @@ -318,7 +318,7 @@ void mpvq_deindex_fx( /* o : void #ifdef DYNMEM_COUNT Dyn_Mem_In("mpvq_deindex_fx", sizeof(struct { Word16 leading_sign; })); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("mpvq_deindex_fx"); #endif @@ -337,7 +337,7 @@ void mpvq_deindex_fx( /* o : void #ifdef DYNMEM_COUNT Dyn_Mem_Out(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif } @@ -488,7 +488,7 @@ PvqEntry_fx mpvq_index_fx( /* o : leading_sign_index, i UWord32 lead_sign_ind; })); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("mpvq_index_fx"); #endif @@ -504,7 +504,7 @@ PvqEntry_fx mpvq_index_fx( /* o : leading_sign_index, i #ifdef DYNMEM_COUNT Dyn_Mem_Out(); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif diff --git a/lib_lc3plus/sns_quantize_scf_fx.c b/lib_lc3plus/sns_quantize_scf_fx.c index fe8b38344..991381285 100644 --- a/lib_lc3plus/sns_quantize_scf_fx.c +++ b/lib_lc3plus/sns_quantize_scf_fx.c @@ -36,7 +36,7 @@ static Word16 stage1_base( /* o : idx Word32 L_min_mse, L_mse; })); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("stage1_base"); #endif @@ -89,7 +89,7 @@ static Word16 stage1_base( /* o : idx } ASSERT(idx >= 0 && idx < R); -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif #ifdef DYNMEM_COUNT @@ -183,7 +183,7 @@ static void processQuantize_stage1ScfEncStage1_fx(const Word16 *target_st1, Word16 *st1_idx0Ptr, Word16 *st1_idx1Ptr) { -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("processQuantize_stage1ScfEncStage1_fx"); #endif @@ -201,7 +201,7 @@ static void processQuantize_stage1ScfEncStage1_fx(const Word16 *target_st1, *st1_idx1Ptr, st1_vector); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif @@ -306,7 +306,7 @@ static void pvq_enc_find_best_submode_pre_post_fx( shape_far = (Word16 *)scratchAlign(pulses_far, sizeof(*pulses_far) * M); /* Size = 2 * M */ #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("pvq_enc_find_best_submode_pre_post_fx"); #endif @@ -414,7 +414,7 @@ static void pvq_enc_find_best_submode_pre_post_fx( *sub_mode_ptr = extract_l(L_section); move16(); /* 0,1,2,3 */ -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif #ifdef DYNMEM_COUNT @@ -505,7 +505,7 @@ static void processQuantize_stage2ScfEncStage2_fx( proc_target_lp = (Word16 *)buffer_pvq_enc_find_best_submode_pre_post_fx; /* size = 2*M */ #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("processQuantize_stage2ScfEncStage2_fx"); #endif @@ -631,7 +631,7 @@ static void processQuantize_stage2ScfEncStage2_fx( L_prm_idx[2] = L_deposit_l(enc_PVQ_OA.lead_sign_ind); /* LS shape single bit */ } -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif #ifdef DYNMEM_COUNT @@ -676,7 +676,7 @@ static Word16 scfdec_stage2_fx( /* o: ber flag */ ); #endif -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_start("scfdec_stage2_fx"); #endif @@ -740,7 +740,7 @@ static Word16 scfdec_stage2_fx( /* o: ber flag */ /* scaling aligend with encoder search */ pvq_dec_scale_vec_fx(dec_adj_glob_vec, gValQ13, st2_vector); -#ifdef WMOPS_LC3PLUS +#ifdef WMOPS BASOP_sub_sub_end(); #endif Dyn_Mem_Deluxe_Out(); -- GitLab From 8e5805db34d06087c111e94bd73c445ba9d4609c Mon Sep 17 00:00:00 2001 From: Archit Tamarapu Date: Thu, 20 Feb 2025 13:36:09 +0100 Subject: [PATCH 2/9] change #if WMOPS to #ifdef WMOPS --- lib_lc3plus/basop_util_lc3plus.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib_lc3plus/basop_util_lc3plus.h b/lib_lc3plus/basop_util_lc3plus.h index 5f4f5c56b..3ff6d8d06 100644 --- a/lib_lc3plus/basop_util_lc3plus.h +++ b/lib_lc3plus/basop_util_lc3plus.h @@ -316,14 +316,14 @@ void BASOP_cfft_lc3plus(Word32 *re, Word32 *im, Word16 sizeOfFft, Word16 s, Word void BASOP_rfftN(Word32 *re, Word16 sizeOfFft, Word16 *scale, Word8 *scratchBuffer); void BASOP_irfftN(Word32 *re, Word16 sizeOfFft, Word16 *scale, Word8 *scratchBuffer); -#if WMOPS +#ifdef WMOPS extern BASIC_OP multiCounter[MAXCOUNTERS]; extern int currCounter; #endif static __inline void basop_memcpy(void *dst, const void *src, size_t n) { -#if WMOPS +#ifdef WMOPS multiCounter[currCounter].move16 += (UWord32)n / 2; #endif /* check for overlapping memory */ @@ -333,7 +333,7 @@ static __inline void basop_memcpy(void *dst, const void *src, size_t n) static __inline void basop_memmove(void *dst, const void *src, size_t n) { -#if WMOPS +#ifdef WMOPS multiCounter[currCounter].move16 += (UWord32)n / 2; #endif memmove(dst, src, n); @@ -341,7 +341,7 @@ static __inline void basop_memmove(void *dst, const void *src, size_t n) static __inline void basop_memset(void *dst, int val, size_t n) { -#if WMOPS +#ifdef WMOPS multiCounter[currCounter].move16 += (UWord32)n / 2; #endif memset(dst, val, n); -- GitLab From ad9e2d665f986dce90e10a35cada7f2e3744d89b Mon Sep 17 00:00:00 2001 From: Archit Tamarapu Date: Thu, 20 Feb 2025 13:37:18 +0100 Subject: [PATCH 3/9] rename BASOP_sub(_sub)_start() to push_wmops() --- lib_lc3plus/dec_lc3.c | 48 ++++++++++----------- lib_lc3plus/enc_lc3.c | 56 ++++++++++++------------- lib_lc3plus/plc_classify_fx.c | 8 ++-- lib_lc3plus/plc_phecu_fec_hq_fx.c | 54 ++++++++++++------------ lib_lc3plus/plc_phecu_peak_locator_fx.c | 2 +- lib_lc3plus/plc_phecu_setf0hz_fx.c | 2 +- lib_lc3plus/plc_phecu_tools_fx.c | 2 +- lib_lc3plus/plc_update_aft_imdct_fx.c | 4 +- lib_lc3plus/plc_update_fx.c | 2 +- lib_lc3plus/plc_xcorr_fx.c | 4 +- lib_lc3plus/pvq_enc_fx.c | 2 +- lib_lc3plus/pvq_index_fx.c | 4 +- lib_lc3plus/sns_quantize_scf_fx.c | 10 ++--- 13 files changed, 99 insertions(+), 99 deletions(-) diff --git a/lib_lc3plus/dec_lc3.c b/lib_lc3plus/dec_lc3.c index 40818106e..1f302608a 100644 --- a/lib_lc3plus/dec_lc3.c +++ b/lib_lc3plus/dec_lc3.c @@ -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; diff --git a/lib_lc3plus/enc_lc3.c b/lib_lc3plus/enc_lc3.c index 30ff9971b..46d011d4f 100644 --- a/lib_lc3plus/enc_lc3.c +++ b/lib_lc3plus/enc_lc3.c @@ -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(<pf_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, diff --git a/lib_lc3plus/plc_classify_fx.c b/lib_lc3plus/plc_classify_fx.c index bbb01826a..d902df10b 100644 --- a/lib_lc3plus/plc_classify_fx.c +++ b/lib_lc3plus/plc_classify_fx.c @@ -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 diff --git a/lib_lc3plus/plc_phecu_fec_hq_fx.c b/lib_lc3plus/plc_phecu_fec_hq_fx.c index ca2a345f4..a2e65aa42 100644 --- a/lib_lc3plus/plc_phecu_fec_hq_fx.c +++ b/lib_lc3plus/plc_phecu_fec_hq_fx.c @@ -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*((2*rand(1,10000) + 1*cos(2*pi*x)) - 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 */ diff --git a/lib_lc3plus/plc_phecu_peak_locator_fx.c b/lib_lc3plus/plc_phecu_peak_locator_fx.c index 531ee8f6f..0670aac38 100644 --- a/lib_lc3plus/plc_phecu_peak_locator_fx.c +++ b/lib_lc3plus/plc_phecu_peak_locator_fx.c @@ -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 ) */ diff --git a/lib_lc3plus/plc_phecu_setf0hz_fx.c b/lib_lc3plus/plc_phecu_setf0hz_fx.c index 6fffe632c..ecfa6e108 100644 --- a/lib_lc3plus/plc_phecu_setf0hz_fx.c +++ b/lib_lc3plus/plc_phecu_setf0hz_fx.c @@ -33,7 +33,7 @@ plc_phEcuSetF0Hz_fx(/* output Q7 bin frequency [0.. 255.xxxx] "1 sign, 8 bits #endif #ifdef WMOPS - BASOP_sub_sub_start("PhECU::plc_phEcuSetF0Hz_fx"); + push_wmops("PhECU::plc_phEcuSetF0Hz_fx"); #endif result = 0; move16(); diff --git a/lib_lc3plus/plc_phecu_tools_fx.c b/lib_lc3plus/plc_phecu_tools_fx.c index 9574499c9..40c25bdb0 100644 --- a/lib_lc3plus/plc_phecu_tools_fx.c +++ b/lib_lc3plus/plc_phecu_tools_fx.c @@ -168,7 +168,7 @@ Word32 winEnCalc( /* o: output summed energy Ltot */ #ifdef WMOPS - BASOP_sub_sub_start("PhECU::winEnCalc"); + push_wmops("PhECU::winEnCalc"); #endif L_tot = INT32_MAX; move32(); /*acc is on negative side , but as all accumulation is positive, we make use of one extra bit */ diff --git a/lib_lc3plus/plc_update_aft_imdct_fx.c b/lib_lc3plus/plc_update_aft_imdct_fx.c index 2bdab6eaf..9a0c60b28 100644 --- a/lib_lc3plus/plc_update_aft_imdct_fx.c +++ b/lib_lc3plus/plc_update_aft_imdct_fx.c @@ -38,7 +38,7 @@ void processPLCUpdateAfterIMDCT_fx(Word16 x_fx[], Word16 q_fx_exp, Word16 concea #ifdef WMOPS - BASOP_sub_sub_start("processPLCUpdateAfterIMDCT "); + push_wmops("processPLCUpdateAfterIMDCT "); #endif @@ -255,7 +255,7 @@ void processPLCUpdateXFP_w_E_hist_fx(Word16 prev_bfi, Word16 bfi, Word16 *xfp_fx })); #endif #ifdef WMOPS - BASOP_sub_sub_start("PhECU::UpdateXfp_w_E_hist_fx"); + push_wmops("PhECU::UpdateXfp_w_E_hist_fx"); #endif IF (sub(bfi,1) != 0) diff --git a/lib_lc3plus/plc_update_fx.c b/lib_lc3plus/plc_update_fx.c index 305140ce7..85e20020f 100644 --- a/lib_lc3plus/plc_update_fx.c +++ b/lib_lc3plus/plc_update_fx.c @@ -86,7 +86,7 @@ void processPLCspec2shape_fx(Word16 prev_bfi, Word16 bfi, Word16 q_old_d_fx[], W })); #endif #ifdef WMOPS - BASOP_sub_sub_start("PhECU::GF::process_plc_spec_2_shape_fx"); + push_wmops("PhECU::GF::process_plc_spec_2_shape_fx"); #endif IF(sub(bfi, 1) != 0) diff --git a/lib_lc3plus/plc_xcorr_fx.c b/lib_lc3plus/plc_xcorr_fx.c index 1a4782c32..882bfced4 100644 --- a/lib_lc3plus/plc_xcorr_fx.c +++ b/lib_lc3plus/plc_xcorr_fx.c @@ -53,7 +53,7 @@ Word16 plc_norm_corr_blocks_fx( /* o: norm_corr range [-1 #endif #ifdef WMOPS - BASOP_sub_sub_start("plc_norm_corr_blocks_fx"); + push_wmops("plc_norm_corr_blocks_fx"); #endif /* Calculate normalized correlation with added shift and block interleaving possibility */ @@ -193,7 +193,7 @@ Word16 plc_xcorr_lc_fx( /* o: quantized output xcorr in Q #endif #ifdef WMOPS - BASOP_sub_sub_start("plc_xcorr_lc_fx"); + push_wmops("plc_xcorr_lc_fx"); #endif norm_xcorr_est_q = 0; move16(); diff --git a/lib_lc3plus/pvq_enc_fx.c b/lib_lc3plus/pvq_enc_fx.c index 9c164dda5..4f6a0aac3 100644 --- a/lib_lc3plus/pvq_enc_fx.c +++ b/lib_lc3plus/pvq_enc_fx.c @@ -145,7 +145,7 @@ void pvq_enc_search_fx( ); #ifdef WMOPS - BASOP_sub_sub_start("pvq_enc_search_fx"); + push_wmops("pvq_enc_search_fx"); #endif pulses_far = pulses_fin[0]; move16(); diff --git a/lib_lc3plus/pvq_index_fx.c b/lib_lc3plus/pvq_index_fx.c index c7d63c840..0a4bc6694 100644 --- a/lib_lc3plus/pvq_index_fx.c +++ b/lib_lc3plus/pvq_index_fx.c @@ -319,7 +319,7 @@ void mpvq_deindex_fx( /* o : void Dyn_Mem_In("mpvq_deindex_fx", sizeof(struct { Word16 leading_sign; })); #endif #ifdef WMOPS - BASOP_sub_sub_start("mpvq_deindex_fx"); + push_wmops("mpvq_deindex_fx"); #endif basop_memset(vec_out, 0, (entry->dim) * sizeof(Word16)); @@ -489,7 +489,7 @@ PvqEntry_fx mpvq_index_fx( /* o : leading_sign_index, i })); #endif #ifdef WMOPS - BASOP_sub_sub_start("mpvq_index_fx"); + push_wmops("mpvq_index_fx"); #endif ASSERT(k_val_local <= KMAX_FX); diff --git a/lib_lc3plus/sns_quantize_scf_fx.c b/lib_lc3plus/sns_quantize_scf_fx.c index 991381285..db18777bd 100644 --- a/lib_lc3plus/sns_quantize_scf_fx.c +++ b/lib_lc3plus/sns_quantize_scf_fx.c @@ -37,7 +37,7 @@ static Word16 stage1_base( /* o : idx })); #endif #ifdef WMOPS - BASOP_sub_sub_start("stage1_base"); + push_wmops("stage1_base"); #endif /* find first vector error energy for */ @@ -184,7 +184,7 @@ static void processQuantize_stage1ScfEncStage1_fx(const Word16 *target_st1, { #ifdef WMOPS - BASOP_sub_sub_start("processQuantize_stage1ScfEncStage1_fx"); + push_wmops("processQuantize_stage1ScfEncStage1_fx"); #endif #ifdef ENABLE_HR_MODE @@ -307,7 +307,7 @@ static void pvq_enc_find_best_submode_pre_post_fx( #endif #ifdef WMOPS - BASOP_sub_sub_start("pvq_enc_find_best_submode_pre_post_fx"); + push_wmops("pvq_enc_find_best_submode_pre_post_fx"); #endif /* construct pulse vectors and en1 normalized shape vectors */ /* use shape Q in Q14 */ @@ -506,7 +506,7 @@ static void processQuantize_stage2ScfEncStage2_fx( #endif #ifdef WMOPS - BASOP_sub_sub_start("processQuantize_stage2ScfEncStage2_fx"); + push_wmops("processQuantize_stage2ScfEncStage2_fx"); #endif /* fixed setup for a given bitrate of 38 , no moves needed */ @@ -677,7 +677,7 @@ static Word16 scfdec_stage2_fx( /* o: ber flag */ #endif #ifdef WMOPS - BASOP_sub_sub_start("scfdec_stage2_fx"); + push_wmops("scfdec_stage2_fx"); #endif dec_pulses = (Word16 *)scratchAlign(scratchBuffer, 0); /* Size = 2 * M = 32 bytes */ -- GitLab From d450a2d5abf83cf55ad4be84d1d48ebecf65ef6c Mon Sep 17 00:00:00 2001 From: Archit Tamarapu Date: Thu, 20 Feb 2025 13:37:41 +0100 Subject: [PATCH 4/9] rename BASOP_sub(_sub)_end() to pop_wmops() --- lib_lc3plus/dec_lc3.c | 46 ++++++++++---------- lib_lc3plus/enc_lc3.c | 56 ++++++++++++------------- lib_lc3plus/plc_classify_fx.c | 8 ++-- lib_lc3plus/plc_phecu_fec_hq_fx.c | 48 ++++++++++----------- lib_lc3plus/plc_phecu_peak_locator_fx.c | 2 +- lib_lc3plus/plc_phecu_setf0hz_fx.c | 2 +- lib_lc3plus/plc_phecu_tools_fx.c | 2 +- lib_lc3plus/plc_update_aft_imdct_fx.c | 4 +- lib_lc3plus/plc_update_fx.c | 2 +- lib_lc3plus/plc_xcorr_fx.c | 4 +- lib_lc3plus/pvq_enc_fx.c | 2 +- lib_lc3plus/pvq_index_fx.c | 4 +- lib_lc3plus/sns_quantize_scf_fx.c | 10 ++--- 13 files changed, 95 insertions(+), 95 deletions(-) diff --git a/lib_lc3plus/dec_lc3.c b/lib_lc3plus/dec_lc3.c index 1f302608a..1b23927c6 100644 --- a/lib_lc3plus/dec_lc3.c +++ b/lib_lc3plus/dec_lc3.c @@ -187,7 +187,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s move16(); } #ifdef WMOPS - BASOP_sub_end(); /* Entropy dec */ + pop_wmops(); /* Entropy dec */ #endif #ifdef WMOPS @@ -244,7 +244,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s } } #ifdef WMOPS - BASOP_sub_end(); /* Ari dec */ + pop_wmops(); /* Ari dec */ #endif #ifdef WMOPS @@ -261,7 +261,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s #endif } #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif #ifdef WMOPS @@ -273,7 +273,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s h_DecSetup->prev_bfi, h_DecSetup->prev_prev_bfi, &h_DecSetup->plcAd->stab_fac); } #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif #ifdef WMOPS @@ -296,7 +296,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s &h_DecSetup->prev_fac_ns_fx, &h_DecSetup->pc_nbLostFramesInRow); } #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif IF (sub(bfi, 1) != 0) @@ -310,7 +310,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s #endif ); #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif #ifdef WMOPS @@ -327,7 +327,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s ); } #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif #ifdef WMOPS @@ -335,7 +335,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s #endif processApplyGlobalGain_fx(q_d_fx, &q_fx_exp, decoder->yLen, gg_idx, h_DecSetup->quantizedGainOff); #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif #ifdef WMOPS @@ -349,7 +349,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s #endif ); #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif #ifdef ENABLE_HR_MODE @@ -359,7 +359,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s processSnsInterpolateScf_fx(scf_q_ip, int_scf_fx_ip, int_scf_fx_exp, 0, decoder->bands_number, currentScratch); #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif #ifdef WMOPS @@ -369,7 +369,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s processMdctShaping_fx(q_d_fx, int_scf_fx_ip, int_scf_fx_exp, decoder->bands_offset, decoder->bands_number); #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif #else #ifdef WMOPS @@ -378,7 +378,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s /* currentScratch Size = 128 bytes */ processSnsInterpolateScf_fx(scf_q, int_scf_fx, int_scf_fx_exp, 0, decoder->bands_number, currentScratch); #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif #ifdef WMOPS @@ -387,7 +387,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s 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); #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif /* end int_scf_fx */ #endif /* ENABLE_HR_MODE */ @@ -433,7 +433,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s #endif ); #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif #ifdef ENABLE_HR_MODE @@ -463,7 +463,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s ); } #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif #ifdef WMOPS @@ -500,7 +500,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s #endif /* ENABLE_HR_MODE */ #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif #ifdef WMOPS @@ -515,7 +515,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s #endif ); #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif #ifdef WMOPS @@ -534,7 +534,7 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s #endif currentScratch); #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif #ifdef ENABLE_HR_MODE @@ -580,15 +580,15 @@ static int Dec_LC3PLUS_Channel(LC3PLUS_Dec *decoder, int channel, int bits_per_s } } #ifdef WMOPS - BASOP_sub_end(); /* Output scaling */ + pop_wmops(); /* Output scaling */ #endif #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif #ifdef WMOPS - BASOP_sub_end(); /* Decoder */ + pop_wmops(); /* Decoder */ #endif @@ -633,7 +633,7 @@ LC3PLUS_Error Dec_LC3PLUS(LC3PLUS_Dec *decoder, UWord8 *input, int num_bytes, vo &decoder->m_fec, scratch); #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif for (ch = 0; ch < decoder->channels; ch++) @@ -680,7 +680,7 @@ LC3PLUS_Error Dec_LC3PLUS(LC3PLUS_Dec *decoder, UWord8 *input, int num_bytes, vo &decoder->n_pc, &decoder->m_fec, scratch); #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif decoder->epmr = MIN(decoder->epmr, channel_epmr); diff --git a/lib_lc3plus/enc_lc3.c b/lib_lc3plus/enc_lc3.c index 46d011d4f..f2276a2ed 100644 --- a/lib_lc3plus/enc_lc3.c +++ b/lib_lc3plus/enc_lc3.c @@ -143,7 +143,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ h_EncSetup->mdct_mem32, encoder->frame_length, h_EncSetup->resamp_mem32, h_EncSetup->olpa_mem_s12k8, &h_EncSetup->resamp_exp); #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif } ELSE @@ -175,7 +175,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ encoder->W_fx, encoder->W_size, h_EncSetup->stEnc_mdct_mem, encoder->stEnc_mdct_mem_len, d_fx, &d_fx_exp, currentScratch); #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif /* begin s_12k8 */ @@ -199,7 +199,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ ); #endif /* ENABLE_HR_MODE */ #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif #ifdef WMOPS @@ -213,7 +213,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ #endif h_EncSetup->resamp_exp, encoder->frame_dms, currentScratch); #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif #ifdef WMOPS @@ -230,7 +230,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ #endif ); #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif /* end s_12k8 */ @@ -244,7 +244,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ attack_detector_fx(encoder, h_EncSetup, s_in_scaled, sub(h_EncSetup->x_exp, 15), currentScratch); #endif #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif /* begin ener_fx */ @@ -259,7 +259,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ #endif ); #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif #ifdef WMOPS @@ -284,7 +284,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ ltpf_idx[1] = 0; move16(); } #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif #ifdef WMOPS push_wmops("BW Cutoff-Detection"); @@ -312,7 +312,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ BW_cutoff_idx = 0; } #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif #ifdef WMOPS @@ -325,7 +325,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ h_EncSetup->attdec_detected, encoder->attdec_damping, currentScratch, encoder->sns_damping ); #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif #ifdef WMOPS @@ -335,7 +335,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ processSnsQuantizeScfEncoder_fx(scf, L_scf_idx, scf_q, currentScratch); #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif #ifdef WMOPS @@ -344,7 +344,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ /* currentScratch Size = 128 bytes */ processSnsInterpolateScf_fx(scf_q, int_scf_fx, int_scf_fx_exp, 1, encoder->bands_number, currentScratch); #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif #ifdef WMOPS @@ -353,7 +353,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ processMdctShaping_fx(d_fx, int_scf_fx, int_scf_fx_exp, encoder->bands_offset, encoder->bands_number); #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif /* end int_scf_fx_exp */ #ifdef WMOPS @@ -365,7 +365,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ BW_cutoff_idx = s_min(BW_cutoff_idx, encoder->bw_index); } #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif #ifdef WMOPS push_wmops("Tns_enc"); @@ -393,7 +393,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ move16(); } #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif #ifdef WMOPS @@ -431,7 +431,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ #endif ); #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif /* begin q_d_fx16 */ @@ -449,7 +449,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ codingdata, &lsbMode, -1); #endif /* ENABLE_HR_MODE */ #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif #ifdef WMOPS @@ -467,7 +467,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ h_EncSetup->targetBitsQuant, h_EncSetup->mem_specBits, &gainChange, encoder->fs_idx); #endif /* ENABLE_HR_MODE */ #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif #ifdef WMOPS @@ -486,7 +486,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ #endif /* ENABLE_HR_MODE */ } #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif #ifdef WMOPS @@ -517,7 +517,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ move16(); } #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif #ifdef WMOPS @@ -544,7 +544,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ move16(); } #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif #ifdef WMOPS @@ -554,7 +554,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ encoder->yLen, encoder->BW_cutoff_bits, tns_numfilters, lsbMode, lastnz, tns_order, fac_ns_idx, quantizedGain, BW_cutoff_idx, ltpf_idx, L_scf_idx, bfi_ext, encoder->fs_idx); #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif #ifdef WMOPS @@ -569,7 +569,7 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ tns_order, tns_numfilters, indexes, lastnz, codingdata, resBits, numResBits, lsbMode, h_EncSetup->enable_lpc_weighting, currentScratch); #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif #ifdef WMOPS @@ -607,17 +607,17 @@ static void Enc_LC3PLUS_Channel(LC3PLUS_Enc *encoder, int channel, int bits_per_ #endif #ifdef WMOPS - BASOP_sub_end(); /* Ari dec */ + pop_wmops(); /* Ari dec */ #endif processReorderBitstream_fx(bytes, h_EncSetup->n_pccw, h_EncSetup->n_pc, b_left, currentScratch); } #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif /* end q_d_fx16 */ #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif Dyn_Mem_Deluxe_Out(); @@ -646,7 +646,7 @@ int Enc_LC3PLUS(LC3PLUS_Enc *encoder, void **input, int bits_per_sample, UWord8 encoder->channel_setup[ch]->n_pccw, scratch); #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif lc3buf += output_size2; @@ -671,7 +671,7 @@ int Enc_LC3PLUS(LC3PLUS_Enc *encoder, void **input, int bits_per_sample, UWord8 scratch); #ifdef WMOPS - BASOP_sub_end(); + pop_wmops(); #endif } diff --git a/lib_lc3plus/plc_classify_fx.c b/lib_lc3plus/plc_classify_fx.c index d902df10b..cf455e68d 100644 --- a/lib_lc3plus/plc_classify_fx.c +++ b/lib_lc3plus/plc_classify_fx.c @@ -59,7 +59,7 @@ static void array_insert_and_shift(Word32 *array, UWord8 value, Word16 longterm_ array[*byte_position] = current_byte; move16(); #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif } @@ -105,7 +105,7 @@ static void array_calculate(Word32 *array_tdc, Word32 *array_ns, int length, Wor *counter_phecu = sub(sub(overall_counter, counter_loc_tdc), counter_loc_ns); #endif #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif } #endif @@ -247,7 +247,7 @@ void processPLCclassify_fx(Word16 plcMeth, Word16 *concealMethod, Word16 *nbLost Dyn_Mem_Deluxe_Out(); #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif } @@ -416,7 +416,7 @@ Word16 spectral_centroid_fx_lc(Word16 old_scf_q[], const Word16 *band_offsets, W Dyn_Mem_Deluxe_Out(); #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif return sc; } diff --git a/lib_lc3plus/plc_phecu_fec_hq_fx.c b/lib_lc3plus/plc_phecu_fec_hq_fx.c index a2e65aa42..e73a1faa8 100644 --- a/lib_lc3plus/plc_phecu_fec_hq_fx.c +++ b/lib_lc3plus/plc_phecu_fec_hq_fx.c @@ -133,7 +133,7 @@ static void rotate_W16_fx(Word16 re_in, Word16 im_in, Word16 cosFactor, Word16 s *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 */ #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif return; } @@ -159,7 +159,7 @@ static void valley_magnitude_adj_fx(Word16 *re_ptr, Word16 *im_ptr, Word16 uniFa *im_ptr = mult_r(scale_fx, shl_sat(*im_ptr, 1)); /* no moves , should be inlined */ #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif return; } @@ -202,7 +202,7 @@ Word16 rand_phase_fx(const Word16 seed, Word16 *sin_F, Word16 *cos_F) Dyn_Mem_Out(); #endif #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif return seed2; } @@ -798,7 +798,7 @@ void trans_burst_ana_fx( Dyn_Mem_Out(); #endif #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif } @@ -914,7 +914,7 @@ static Word16 imax_fx( /* o: The location, relative to the Dyn_Mem_Out(); #endif #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif return posi; /* Q15. The position either left or right relative to the index of the middle of the 3 given data points. */ @@ -1017,7 +1017,7 @@ static Word16 imax_fx( /* o: The location, relative to the BASOP_rfftN(L_xfp, Lprot, &fft_scale, buffer_fft); } #ifdef WMOPS - BASOP_sub_sub_end(); /* anawin+fft */ + pop_wmops(); /* anawin+fft */ #endif /* Convert 32 Bit intlv FFT into phecu 16 bit flipped fft format */ @@ -1174,7 +1174,7 @@ static Word16 imax_fx( /* o: The location, relative to the } #ifdef WMOPS - BASOP_sub_sub_end(); /* peaks refine */ + pop_wmops(); /* peaks refine */ #endif logic16(); @@ -1218,7 +1218,7 @@ static Word16 imax_fx( /* o: The location, relative to the Dyn_Mem_Out(); #endif #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif } @@ -1670,7 +1670,7 @@ static Word16 imax_fx( /* o: The location, relative to the Dyn_Mem_Out(); #endif #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif } @@ -1761,7 +1761,7 @@ static Word16 imax_fx( /* o: The location, relative to the Dyn_Mem_Out(); #endif #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif return; } @@ -1850,7 +1850,7 @@ static Word16 imax_fx( /* o: The location, relative to the Dyn_Mem_Out(); #endif #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif return; @@ -1917,7 +1917,7 @@ static Word16 imax_fx( /* o: The location, relative to the #endif BASOP_irfftN(L_x, Lprot, &fft_scale, buffer_fft); #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif pX_L = &L_x[0]; @@ -1956,7 +1956,7 @@ static Word16 imax_fx( /* o: The location, relative to the Dyn_Mem_Out(); #endif #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif return; } @@ -2245,7 +2245,7 @@ static Word16 imax_fx( /* o: The location, relative to the Dyn_Mem_Out(); #endif #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif } @@ -2269,7 +2269,7 @@ static Word16 imax_fx( /* o: The location, relative to the #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif return z; } @@ -2336,7 +2336,7 @@ static Word16 imax_fx( /* o: The location, relative to the Dyn_Mem_Out(); #endif #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif } @@ -2376,7 +2376,7 @@ static Word16 imax_fx( /* o: The location, relative to the Dyn_Mem_Out(); #endif #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif } @@ -2479,7 +2479,7 @@ static Word16 imax_fx( /* o: The location, relative to the Dyn_Mem_Out(); #endif #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif return sum; } @@ -2548,7 +2548,7 @@ static Word16 imax_fx( /* o: The location, relative to the Dyn_Mem_Out(); #endif #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif return; } @@ -2668,7 +2668,7 @@ static Word16 imax_fx( /* o: The location, relative to the Dyn_Mem_Out(); #endif #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif return posi; /* Q15. The position either left or right relative to the index of the middle of the 3 given data points. */ @@ -2751,7 +2751,7 @@ static Word16 imax_fx( /* o: The location, relative to the Dyn_Mem_Out(); #endif #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif } @@ -2803,7 +2803,7 @@ static Word16 imax_fx( /* o: The location, relative to the Dyn_Mem_Out(); #endif #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif } @@ -2872,7 +2872,7 @@ static Word16 imax_fx( /* o: The location, relative to the Dyn_Mem_Out(); #endif #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif } @@ -3145,7 +3145,7 @@ static Word16 imax_fx( /* o: The location, relative to the } /* bands available*/ #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif return nonpure_tone_detect; diff --git a/lib_lc3plus/plc_phecu_peak_locator_fx.c b/lib_lc3plus/plc_phecu_peak_locator_fx.c index 0670aac38..42729e800 100644 --- a/lib_lc3plus/plc_phecu_peak_locator_fx.c +++ b/lib_lc3plus/plc_phecu_peak_locator_fx.c @@ -379,7 +379,7 @@ void plc_phEcu_peak_locator_fx(const Word16 *inp, /* i: vector with values >=0 Dyn_Mem_Out(); #endif #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif } diff --git a/lib_lc3plus/plc_phecu_setf0hz_fx.c b/lib_lc3plus/plc_phecu_setf0hz_fx.c index ecfa6e108..3dd5b1a08 100644 --- a/lib_lc3plus/plc_phecu_setf0hz_fx.c +++ b/lib_lc3plus/plc_phecu_setf0hz_fx.c @@ -51,7 +51,7 @@ plc_phEcuSetF0Hz_fx(/* output Q7 bin frequency [0.. 255.xxxx] "1 sign, 8 bits Dyn_Mem_Out(); #endif #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif return result; /*Q7*/ diff --git a/lib_lc3plus/plc_phecu_tools_fx.c b/lib_lc3plus/plc_phecu_tools_fx.c index 40c25bdb0..c78d406a4 100644 --- a/lib_lc3plus/plc_phecu_tools_fx.c +++ b/lib_lc3plus/plc_phecu_tools_fx.c @@ -236,7 +236,7 @@ Word32 winEnCalc( /* o: output summed energy Ltot */ *exp = sub(*exp, tmp); move16(); #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif #ifdef DYNMEM_COUNT Dyn_Mem_Out(); diff --git a/lib_lc3plus/plc_update_aft_imdct_fx.c b/lib_lc3plus/plc_update_aft_imdct_fx.c index 9a0c60b28..9ba483792 100644 --- a/lib_lc3plus/plc_update_aft_imdct_fx.c +++ b/lib_lc3plus/plc_update_aft_imdct_fx.c @@ -161,7 +161,7 @@ void processPLCUpdateAfterIMDCT_fx(Word16 x_fx[], Word16 q_fx_exp, Word16 concea *prev_bfi = bfi; move16(); #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif #ifdef DYNMEM_COUNT @@ -332,7 +332,7 @@ void processPLCUpdateXFP_w_E_hist_fx(Word16 prev_bfi, Word16 bfi, Word16 *xfp_fx } #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif #ifdef DYNMEM_COUNT Dyn_Mem_Out(); diff --git a/lib_lc3plus/plc_update_fx.c b/lib_lc3plus/plc_update_fx.c index 85e20020f..7abb2b613 100644 --- a/lib_lc3plus/plc_update_fx.c +++ b/lib_lc3plus/plc_update_fx.c @@ -211,7 +211,7 @@ void processPLCspec2shape_fx(Word16 prev_bfi, Word16 bfi, Word16 q_old_d_fx[], W } #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif #ifdef DYNMEM_COUNT Dyn_Mem_Out(); diff --git a/lib_lc3plus/plc_xcorr_fx.c b/lib_lc3plus/plc_xcorr_fx.c index 882bfced4..d8c6d8390 100644 --- a/lib_lc3plus/plc_xcorr_fx.c +++ b/lib_lc3plus/plc_xcorr_fx.c @@ -167,7 +167,7 @@ Word16 plc_norm_corr_blocks_fx( /* o: norm_corr range [-1 Dyn_Mem_Out(); #endif #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif return norm_corr; } @@ -242,7 +242,7 @@ Word16 plc_xcorr_lc_fx( /* o: quantized output xcorr in Q Dyn_Mem_Out(); #endif #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif return norm_xcorr_est_q; } diff --git a/lib_lc3plus/pvq_enc_fx.c b/lib_lc3plus/pvq_enc_fx.c index 4f6a0aac3..b41d5ad0e 100644 --- a/lib_lc3plus/pvq_enc_fx.c +++ b/lib_lc3plus/pvq_enc_fx.c @@ -363,7 +363,7 @@ void pvq_enc_search_fx( Dyn_Mem_Deluxe_Out(); #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif } diff --git a/lib_lc3plus/pvq_index_fx.c b/lib_lc3plus/pvq_index_fx.c index 0a4bc6694..966dd7d13 100644 --- a/lib_lc3plus/pvq_index_fx.c +++ b/lib_lc3plus/pvq_index_fx.c @@ -338,7 +338,7 @@ void mpvq_deindex_fx( /* o : void Dyn_Mem_Out(); #endif #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif } @@ -505,7 +505,7 @@ PvqEntry_fx mpvq_index_fx( /* o : leading_sign_index, i Dyn_Mem_Out(); #endif #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif return result; diff --git a/lib_lc3plus/sns_quantize_scf_fx.c b/lib_lc3plus/sns_quantize_scf_fx.c index db18777bd..f1f0ba423 100644 --- a/lib_lc3plus/sns_quantize_scf_fx.c +++ b/lib_lc3plus/sns_quantize_scf_fx.c @@ -90,7 +90,7 @@ static Word16 stage1_base( /* o : idx ASSERT(idx >= 0 && idx < R); #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif #ifdef DYNMEM_COUNT Dyn_Mem_Out(); @@ -202,7 +202,7 @@ static void processQuantize_stage1ScfEncStage1_fx(const Word16 *target_st1, #endif #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif return; @@ -415,7 +415,7 @@ static void pvq_enc_find_best_submode_pre_post_fx( move16(); /* 0,1,2,3 */ #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif #ifdef DYNMEM_COUNT Dyn_Mem_Out(); @@ -632,7 +632,7 @@ static void processQuantize_stage2ScfEncStage2_fx( } #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif #ifdef DYNMEM_COUNT Dyn_Mem_Out(); @@ -741,7 +741,7 @@ static Word16 scfdec_stage2_fx( /* o: ber flag */ pvq_dec_scale_vec_fx(dec_adj_glob_vec, gValQ13, st2_vector); #ifdef WMOPS - BASOP_sub_sub_end(); + pop_wmops(); #endif Dyn_Mem_Deluxe_Out(); return BER_dec; -- GitLab From 22de76b1337866c8b7623585aa9fd6fb47eb0fdf Mon Sep 17 00:00:00 2001 From: Archit Tamarapu Date: Thu, 20 Feb 2025 13:39:10 +0100 Subject: [PATCH 5/9] remove LC3plus multiCounter declaration --- lib_lc3plus/basop_util_lc3plus.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lib_lc3plus/basop_util_lc3plus.h b/lib_lc3plus/basop_util_lc3plus.h index 3ff6d8d06..d9abc7f5d 100644 --- a/lib_lc3plus/basop_util_lc3plus.h +++ b/lib_lc3plus/basop_util_lc3plus.h @@ -316,11 +316,6 @@ void BASOP_cfft_lc3plus(Word32 *re, Word32 *im, Word16 sizeOfFft, Word16 s, Word void BASOP_rfftN(Word32 *re, Word16 sizeOfFft, Word16 *scale, Word8 *scratchBuffer); void BASOP_irfftN(Word32 *re, Word16 sizeOfFft, Word16 *scale, Word8 *scratchBuffer); -#ifdef WMOPS -extern BASIC_OP multiCounter[MAXCOUNTERS]; -extern int currCounter; -#endif - static __inline void basop_memcpy(void *dst, const void *src, size_t n) { #ifdef WMOPS -- GitLab From 0a66c422a7dad11ee3f7a6c945c4ba61ef242eef Mon Sep 17 00:00:00 2001 From: Archit Tamarapu Date: Thu, 20 Feb 2025 14:12:32 +0100 Subject: [PATCH 6/9] fix functions which do not have a return statement at the end which causes issues with WMC tool --- lib_dec/ivas_sba_dirac_stereo_dec_fx.c | 2 ++ lib_lc3plus/lc3.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/lib_dec/ivas_sba_dirac_stereo_dec_fx.c b/lib_dec/ivas_sba_dirac_stereo_dec_fx.c index 5867a44b3..6dbcde371 100644 --- a/lib_dec/ivas_sba_dirac_stereo_dec_fx.c +++ b/lib_dec/ivas_sba_dirac_stereo_dec_fx.c @@ -277,6 +277,8 @@ static Word16 get_panning_tangent_gain( lim_r = sub( idx, 1 ); /*Q0*/ } } + assert("should not be reached, added to avoid issues with WMC tool instrumentation"); + return 0; /* should not be reached, added to avoid issues with WMC tool instrumentation */ } static Word16 get_panning( diff --git a/lib_lc3plus/lc3.c b/lib_lc3plus/lc3.c index 68dd8a0bb..88ccc186e 100644 --- a/lib_lc3plus/lc3.c +++ b/lib_lc3plus/lc3.c @@ -86,6 +86,8 @@ int lc3plus_samplerate_supported(int samplerate) #endif default: return 0; } + assert("should not be reached, added to avoid issues with WMC tool instrumentation"); + return 0; /* should not be reached, added to avoid issues with WMC tool instrumentation */ } static int lc3plus_plc_mode_supported(LC3PLUS_PlcMode plc_mode) @@ -96,6 +98,8 @@ static int lc3plus_plc_mode_supported(LC3PLUS_PlcMode plc_mode) return 1; default: return 0; } + assert("should not be reached, added to avoid issues with WMC tool instrumentation"); + return 0; /* should not be reached, added to avoid issues with WMC tool instrumentation */ } static int lc3plus_frame_size_supported(int frame_dms) @@ -111,6 +115,8 @@ static int lc3plus_frame_size_supported(int frame_dms) return 1; default: return 0; } + assert("should not be reached, added to avoid issues with WMC tool instrumentation"); + return 0; /* should not be reached, added to avoid issues with WMC tool instrumentation */ } static int null_in_list(void **list, int n) -- GitLab From 5d864fbb54b790235e5c81aea5437e1cd2df45ff Mon Sep 17 00:00:00 2001 From: Archit Tamarapu Date: Thu, 20 Feb 2025 14:21:52 +0100 Subject: [PATCH 7/9] clang-format --- lib_dec/ivas_sba_dirac_stereo_dec_fx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_dec/ivas_sba_dirac_stereo_dec_fx.c b/lib_dec/ivas_sba_dirac_stereo_dec_fx.c index 6dbcde371..9ddaa5c7e 100644 --- a/lib_dec/ivas_sba_dirac_stereo_dec_fx.c +++ b/lib_dec/ivas_sba_dirac_stereo_dec_fx.c @@ -277,7 +277,7 @@ static Word16 get_panning_tangent_gain( lim_r = sub( idx, 1 ); /*Q0*/ } } - assert("should not be reached, added to avoid issues with WMC tool instrumentation"); + assert( "should not be reached, added to avoid issues with WMC tool instrumentation" ); return 0; /* should not be reached, added to avoid issues with WMC tool instrumentation */ } -- GitLab From 1a093686ea84d43dc8234f81cad8b2456e75211c Mon Sep 17 00:00:00 2001 From: Archit Tamarapu Date: Fri, 28 Feb 2025 12:07:10 +0100 Subject: [PATCH 8/9] rename sWB constants to ssWB to avoid macro redefinition after WMC tool --- lib_lc3plus/constants.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib_lc3plus/constants.c b/lib_lc3plus/constants.c index c13c4e49e..c02cf5c69 100644 --- a/lib_lc3plus/constants.c +++ b/lib_lc3plus/constants.c @@ -1439,7 +1439,7 @@ RAM_ALIGN const Word16 PhECU_whr16ms_WB_Q15[Lprot_hamm_len2_16k] = {/* From matl #define PhECU_whr16ms_WB_Q15 NULL #endif #ifdef SUBSET_SSWB -RAM_ALIGN const Word16 PhECU_whr16ms_sWB_Q15[Lprot_hamm_len2_24k] = +RAM_ALIGN const Word16 PhECU_whr16ms_ssWB_Q15[Lprot_hamm_len2_24k] = {/* From matlab */ 2621, 2636, 2679, 2750, 2850, 2979, 3135, 3319, 3530, 3769, 4034, 4325, 4641, 4982, 5347, 5736, 6148, 6582, 7036, 7511, 8006, 8519, 9049, 9596, 10158, 10735, 11324, 11926, 12539, 13162, @@ -1560,7 +1560,7 @@ RAM_ALIGN const Word16 PhECU_preTdaFx16ms_WB_Q14[256] = { #define PhECU_preTdaFx16ms_WB_Q14 NULL #endif #ifdef SUBSET_SSWB -RAM_ALIGN const Word16 PhECU_preTdaFx16ms_sWB_Q14[384] = { +RAM_ALIGN const Word16 PhECU_preTdaFx16ms_ssWB_Q14[384] = { -22499, -22471, -22152, -21551, -20715, -19688, -18527, -17277, -15982, -14679, -13393, -12145, -10954, -9826, -8760, -7763, -6831, -5958, -5149, -4394, -3688, -3029, -2410, -1831, -1285, -769, -279, 186, 630, 1055, 1462, 1856, 2236, 2606, 2966, 3317, 3662, 3999, 4330, 4658, 4981, 5301, @@ -1699,7 +1699,7 @@ RAM_ALIGN const Word16 *const PhECU_wins[5][3] = { /* 3ms hamm(left part) , 16ms(center IWHR(periodic)*MDCT-anaQ14) , 2ms(initial MDCT-ana in Q14) */ /*8 kHz*/ {PhECU_whr16ms_NB_Q15, PhECU_preTdaFx16ms_NB_Q14, PhECU_preTdaFx16ms_128_pre_Q14}, /*16 kHz*/ {PhECU_whr16ms_WB_Q15, PhECU_preTdaFx16ms_WB_Q14, PhECU_preTdaFx16ms_256_pre_Q14}, - /*24 kHz*/ {PhECU_whr16ms_sWB_Q15, PhECU_preTdaFx16ms_sWB_Q14, PhECU_preTdaFx16ms_384_pre_Q14}, + /*24 kHz*/ {PhECU_whr16ms_ssWB_Q15, PhECU_preTdaFx16ms_ssWB_Q14, PhECU_preTdaFx16ms_384_pre_Q14}, /*32 kHz*/ {PhECU_whr16ms_SWB_Q15, PhECU_preTdaFx16ms_SWB_Q14, PhECU_preTdaFx16ms_512_pre_Q14}, /*48 kHz*/ {PhECU_whr16ms_FB_Q15, PhECU_preTdaFx16ms_FB_Q14, PhECU_preTdaFx16ms_768_pre_Q14}}; -- GitLab From aab3f53c7208ea1ffbbb053ab70d6e86d912f1e9 Mon Sep 17 00:00:00 2001 From: Archit Tamarapu Date: Wed, 5 Mar 2025 12:13:28 +0100 Subject: [PATCH 9/9] add missing free() in ivas_destroy_handle_isar() --- lib_dec/lib_dec_fx.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib_dec/lib_dec_fx.c b/lib_dec/lib_dec_fx.c index e182a471b..9753893e2 100644 --- a/lib_dec/lib_dec_fx.c +++ b/lib_dec/lib_dec_fx.c @@ -4277,6 +4277,9 @@ static void ivas_destroy_handle_isar( free( ( *hSplitBinRend )->hCldfbDataOut ); ( *hSplitBinRend )->hCldfbDataOut = NULL; } + + free( *hSplitBinRend ); + *hSplitBinRend = NULL; } return; -- GitLab