third_party/opus/src/silk/fixed/main_FIX.h - Issue 2962373002: [Opus] Update to v1.2.1

Unified Diff: third_party/opus/src/silk/fixed/main_FIX.h

Issue 2962373002: [Opus] Update to v1.2.1 (Closed)

Patch Set: Pre-increment instead of post-increment Created 3 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « third_party/opus/src/silk/fixed/k2a_Q16_FIX.c ('k') | third_party/opus/src/silk/fixed/mips/noise_shape_analysis_FIX_mipsr1.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/opus/src/silk/fixed/main_FIX.h

diff --git a/third_party/opus/src/silk/fixed/main_FIX.h b/third_party/opus/src/silk/fixed/main_FIX.h

index 375b5eb32ee6c6aec6247bf680b4e9332c82d34b..780afa39c3f0200bf4e96248a1596da1ba881e17 100644

--- a/third_party/opus/src/silk/fixed/main_FIX.h

+++ b/third_party/opus/src/silk/fixed/main_FIX.h

@@ -36,6 +36,11 @@ POSSIBILITY OF SUCH DAMAGE.

#include "debug.h"

#include "entenc.h"

+#if ((defined(OPUS_ARM_ASM) && defined(FIXED_POINT)) \

+ || defined(OPUS_ARM_MAY_HAVE_NEON_INTR))

+#include "fixed/arm/warped_autocorrelation_FIX_arm.h"

+#endif

#ifndef FORCE_CPP_BUILD

#ifdef __cplusplus

extern "C"

@@ -47,6 +52,9 @@ extern "C"

#define silk_encode_do_VAD_Fxx silk_encode_do_VAD_FIX

#define silk_encode_frame_Fxx silk_encode_frame_FIX

+#define QC 10

+#define QS 13

/*********************/

/* Encoder Functions */

/*********************/

@@ -81,33 +89,11 @@ opus_int silk_init_encoder(

opus_int silk_control_encoder(

silk_encoder_state_Fxx *psEnc, /* I/O Pointer to Silk encoder state */

silk_EncControlStruct *encControl, /* I Control structure */

- const opus_int32 TargetRate_bps, /* I Target max bitrate (bps) */

const opus_int allow_bw_switch, /* I Flag to allow switching audio bandwidth */

const opus_int channelNb, /* I Channel number */

const opus_int force_fs_kHz

);

-/****************/

-/* Prefiltering */

-/****************/

-void silk_prefilter_FIX(

- silk_encoder_state_FIX *psEnc, /* I/O Encoder state */

- const silk_encoder_control_FIX *psEncCtrl, /* I Encoder control */

- opus_int32 xw_Q10[], /* O Weighted signal */

- const opus_int16 x[] /* I Speech signal */

-);

-void silk_warped_LPC_analysis_filter_FIX_c(

- opus_int32 state[], /* I/O State [order + 1] */

- opus_int32 res_Q2[], /* O Residual signal [length] */

- const opus_int16 coef_Q13[], /* I Coefficients [order] */

- const opus_int16 input[], /* I Input signal [length] */

- const opus_int16 lambda_Q16, /* I Warping factor */

- const opus_int length, /* I Length of input signal */

- const opus_int order /* I Filter order (even) */

-);

/**************************/

/* Noise shaping analysis */

/**************************/

@@ -121,7 +107,7 @@ void silk_noise_shape_analysis_FIX(

);

/* Autocorrelations for a warped frequency axis */

-void silk_warped_autocorrelation_FIX(

+void silk_warped_autocorrelation_FIX_c(

opus_int32 *corr, /* O Result [order + 1] */

opus_int *scale, /* O Scaling of the correlation vector */

const opus_int16 *input, /* I Input data to correlate */

@@ -130,6 +116,11 @@ void silk_warped_autocorrelation_FIX(

const opus_int order /* I Correlation order (even) */

);

+#if !defined(OVERRIDE_silk_warped_autocorrelation_FIX)

+#define silk_warped_autocorrelation_FIX(corr, scale, input, warping_Q16, length, order, arch) \

+ ((void)(arch), silk_warped_autocorrelation_FIX_c(corr, scale, input, warping_Q16, length, order))

+#endif

/* Calculation of LTP state scaling */

void silk_LTP_scale_ctrl_FIX(

silk_encoder_state_FIX *psEnc, /* I/O encoder state */

@@ -168,16 +159,12 @@ void silk_find_LPC_FIX(

/* LTP analysis */

void silk_find_LTP_FIX(

- opus_int16 b_Q14[ MAX_NB_SUBFR * LTP_ORDER ], /* O LTP coefs */

- opus_int32 WLTP[ MAX_NB_SUBFR * LTP_ORDER * LTP_ORDER ], /* O Weight for LTP quantization */

- opus_int *LTPredCodGain_Q7, /* O LTP coding gain */

- const opus_int16 r_lpc[], /* I residual signal after LPC signal + state for first 10 ms */

+ opus_int32 XXLTP_Q17[ MAX_NB_SUBFR * LTP_ORDER * LTP_ORDER ], /* O Correlation matrix */

+ opus_int32 xXLTP_Q17[ MAX_NB_SUBFR * LTP_ORDER ], /* O Correlation vector */

+ const opus_int16 r_lpc[], /* I Residual signal after LPC */

const opus_int lag[ MAX_NB_SUBFR ], /* I LTP lags */

- const opus_int32 Wght_Q15[ MAX_NB_SUBFR ], /* I weights */

- const opus_int subfr_length, /* I subframe length */

- const opus_int nb_subfr, /* I number of subframes */

- const opus_int mem_offset, /* I number of samples in LTP memory */

- opus_int corr_rshifts[ MAX_NB_SUBFR ], /* O right shifts applied to correlations */

+ const opus_int subfr_length, /* I Subframe length */

+ const opus_int nb_subfr, /* I Number of subframes */

int arch /* I Run-time architecture */

);

@@ -231,9 +218,9 @@ void silk_corrMatrix_FIX(

const opus_int16 *x, /* I x vector [L + order - 1] used to form data matrix X */

const opus_int L, /* I Length of vectors */

const opus_int order, /* I Max lag for correlation */

- const opus_int head_room, /* I Desired headroom */

opus_int32 *XX, /* O Pointer to X'*X correlation matrix [ order x order ] */

- opus_int *rshifts, /* I/O Right shifts of correlations */

+ opus_int32 *nrg, /* O Energy of x vector */

+ opus_int *rshifts, /* O Right shifts of correlations */

int arch /* I Run-time architecture */

);

@@ -248,22 +235,6 @@ void silk_corrVector_FIX(

int arch /* I Run-time architecture */

);

-/* Add noise to matrix diagonal */

-void silk_regularize_correlations_FIX(

- opus_int32 *XX, /* I/O Correlation matrices */

- opus_int32 *xx, /* I/O Correlation values */

- opus_int32 noise, /* I Noise to add */

- opus_int D /* I Dimension of XX */

-);

-/* Solves Ax = b, assuming A is symmetric */

-void silk_solve_LDL_FIX(

- opus_int32 *A, /* I Pointer to symetric square matrix A */

- opus_int M, /* I Size of matrix */

- const opus_int32 *b, /* I Pointer to b vector */

- opus_int32 *x_Q16 /* O Pointer to x solution vector */

-);

#ifndef FORCE_CPP_BUILD

#ifdef __cplusplus

}