rename WMOPS_LC3PLUS back to WMOPS (5b353253) · Commits · SA4 / Audio / IVAS BASOP

lib_lc3plus/basop_util_lc3plus.h

+4 −4

Original line number	Diff line number	Diff line
		@@ -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);

lib_lc3plus/dec_lc3.c

+47 −47

Original line number	Diff line number	Diff line
		@@ -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

lib_lc3plus/enc_lc3.c

+56 −56

Original line number	Diff line number	Diff line
		@@ -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
		}

lib_lc3plus/plc_classify_fx.c

+8 −8

Original line number	Diff line number	Diff line
		@@ -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;

lib_lc3plus/plc_phecu_fec_hq_fx.c

+53 −53

File changed.

Preview size limit exceeded, changes collapsed.