0683dde5d3
cargo-xwin drives the Windows MSVC cross-compile via clang-cl, under which CMake sets MSVC=1 — causing libopus 1.3.1's `if(NOT MSVC)` guards to skip the per-file `-msse4.1` / `-mssse3` COMPILE_FLAGS that its x86 SIMD source files need. Clang-cl (unlike real cl.exe) still honors Clang's target-feature system, so those files then fail to compile with "always_inline function '_mm_cvtepi16_epi32' requires target feature 'sse4.1'" errors across silk/NSQ_sse4_1.c, NSQ_del_dec_sse4_1.c, and VQ_WMat_EC_sse4_1.c. Earlier attempts to fix this downstream (cargo-xwin toolchain file, override.cmake CMAKE_C_COMPILE_OBJECT <FLAGS> replace, CFLAGS env vars) all failed because cargo-xwin rewrites override.cmake from scratch on every `cargo xwin build` invocation and cmake-rs's -DCMAKE_C_FLAGS= assembly happens before toolchain FORCE sets propagate. Fixing it upstream at the source: vendor audiopus_sys 0.2.2 into vendor/audiopus_sys, patch its bundled opus/CMakeLists.txt to introduce an MSVC_CL var (true only when CMAKE_C_COMPILER_ID == "MSVC", i.e. real cl.exe), and flip the eight `if(NOT MSVC)` SIMD guards to `if(NOT MSVC_CL)`. Clang-cl then gets the GCC-style per-file flags and the SSE4.1 sources build cleanly. Also flip the `if(MSVC)` global /arch block at line 445 to `if(MSVC_CL)` so only cl.exe applies /arch:AVX and clang-cl relies purely on per-file flags (no global/per-file mixing). Wire via [patch.crates-io] in the workspace root Cargo.toml; the patch is resolved relative to the workspace root as `vendor/audiopus_sys`. Upstream context: xiph/opus#256, xiph/opus PR #257 (both stale). Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
198 lines
9.4 KiB
C
198 lines
9.4 KiB
C
/***********************************************************************
|
|
Copyright (c) 2006-2011, Skype Limited. All rights reserved.
|
|
Redistribution and use in source and binary forms, with or without
|
|
modification, are permitted provided that the following conditions
|
|
are met:
|
|
- Redistributions of source code must retain the above copyright notice,
|
|
this list of conditions and the following disclaimer.
|
|
- Redistributions in binary form must reproduce the above copyright
|
|
notice, this list of conditions and the following disclaimer in the
|
|
documentation and/or other materials provided with the distribution.
|
|
- Neither the name of Internet Society, IETF or IETF Trust, nor the
|
|
names of specific contributors, may be used to endorse or promote
|
|
products derived from this software without specific prior written
|
|
permission.
|
|
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
|
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
POSSIBILITY OF SUCH DAMAGE.
|
|
***********************************************************************/
|
|
|
|
#ifndef SILK_SIGPROC_FLP_H
|
|
#define SILK_SIGPROC_FLP_H
|
|
|
|
#include "SigProc_FIX.h"
|
|
#include "float_cast.h"
|
|
#include <math.h>
|
|
|
|
#ifdef __cplusplus
|
|
extern "C"
|
|
{
|
|
#endif
|
|
|
|
/********************************************************************/
|
|
/* SIGNAL PROCESSING FUNCTIONS */
|
|
/********************************************************************/
|
|
|
|
/* Chirp (bw expand) LP AR filter */
|
|
void silk_bwexpander_FLP(
|
|
silk_float *ar, /* I/O AR filter to be expanded (without leading 1) */
|
|
const opus_int d, /* I length of ar */
|
|
const silk_float chirp /* I chirp factor (typically in range (0..1) ) */
|
|
);
|
|
|
|
/* compute inverse of LPC prediction gain, and */
|
|
/* test if LPC coefficients are stable (all poles within unit circle) */
|
|
/* this code is based on silk_FLP_a2k() */
|
|
silk_float silk_LPC_inverse_pred_gain_FLP( /* O return inverse prediction gain, energy domain */
|
|
const silk_float *A, /* I prediction coefficients [order] */
|
|
opus_int32 order /* I prediction order */
|
|
);
|
|
|
|
silk_float silk_schur_FLP( /* O returns residual energy */
|
|
silk_float refl_coef[], /* O reflection coefficients (length order) */
|
|
const silk_float auto_corr[], /* I autocorrelation sequence (length order+1) */
|
|
opus_int order /* I order */
|
|
);
|
|
|
|
void silk_k2a_FLP(
|
|
silk_float *A, /* O prediction coefficients [order] */
|
|
const silk_float *rc, /* I reflection coefficients [order] */
|
|
opus_int32 order /* I prediction order */
|
|
);
|
|
|
|
/* compute autocorrelation */
|
|
void silk_autocorrelation_FLP(
|
|
silk_float *results, /* O result (length correlationCount) */
|
|
const silk_float *inputData, /* I input data to correlate */
|
|
opus_int inputDataSize, /* I length of input */
|
|
opus_int correlationCount /* I number of correlation taps to compute */
|
|
);
|
|
|
|
opus_int silk_pitch_analysis_core_FLP( /* O Voicing estimate: 0 voiced, 1 unvoiced */
|
|
const silk_float *frame, /* I Signal of length PE_FRAME_LENGTH_MS*Fs_kHz */
|
|
opus_int *pitch_out, /* O Pitch lag values [nb_subfr] */
|
|
opus_int16 *lagIndex, /* O Lag Index */
|
|
opus_int8 *contourIndex, /* O Pitch contour Index */
|
|
silk_float *LTPCorr, /* I/O Normalized correlation; input: value from previous frame */
|
|
opus_int prevLag, /* I Last lag of previous frame; set to zero is unvoiced */
|
|
const silk_float search_thres1, /* I First stage threshold for lag candidates 0 - 1 */
|
|
const silk_float search_thres2, /* I Final threshold for lag candidates 0 - 1 */
|
|
const opus_int Fs_kHz, /* I sample frequency (kHz) */
|
|
const opus_int complexity, /* I Complexity setting, 0-2, where 2 is highest */
|
|
const opus_int nb_subfr, /* I Number of 5 ms subframes */
|
|
int arch /* I Run-time architecture */
|
|
);
|
|
|
|
void silk_insertion_sort_decreasing_FLP(
|
|
silk_float *a, /* I/O Unsorted / Sorted vector */
|
|
opus_int *idx, /* O Index vector for the sorted elements */
|
|
const opus_int L, /* I Vector length */
|
|
const opus_int K /* I Number of correctly sorted positions */
|
|
);
|
|
|
|
/* Compute reflection coefficients from input signal */
|
|
silk_float silk_burg_modified_FLP( /* O returns residual energy */
|
|
silk_float A[], /* O prediction coefficients (length order) */
|
|
const silk_float x[], /* I input signal, length: nb_subfr*(D+L_sub) */
|
|
const silk_float minInvGain, /* I minimum inverse prediction gain */
|
|
const opus_int subfr_length, /* I input signal subframe length (incl. D preceding samples) */
|
|
const opus_int nb_subfr, /* I number of subframes stacked in x */
|
|
const opus_int D /* I order */
|
|
);
|
|
|
|
/* multiply a vector by a constant */
|
|
void silk_scale_vector_FLP(
|
|
silk_float *data1,
|
|
silk_float gain,
|
|
opus_int dataSize
|
|
);
|
|
|
|
/* copy and multiply a vector by a constant */
|
|
void silk_scale_copy_vector_FLP(
|
|
silk_float *data_out,
|
|
const silk_float *data_in,
|
|
silk_float gain,
|
|
opus_int dataSize
|
|
);
|
|
|
|
/* inner product of two silk_float arrays, with result as double */
|
|
double silk_inner_product_FLP(
|
|
const silk_float *data1,
|
|
const silk_float *data2,
|
|
opus_int dataSize
|
|
);
|
|
|
|
/* sum of squares of a silk_float array, with result as double */
|
|
double silk_energy_FLP(
|
|
const silk_float *data,
|
|
opus_int dataSize
|
|
);
|
|
|
|
/********************************************************************/
|
|
/* MACROS */
|
|
/********************************************************************/
|
|
|
|
#define PI (3.1415926536f)
|
|
|
|
#define silk_min_float( a, b ) (((a) < (b)) ? (a) : (b))
|
|
#define silk_max_float( a, b ) (((a) > (b)) ? (a) : (b))
|
|
#define silk_abs_float( a ) ((silk_float)fabs(a))
|
|
|
|
/* sigmoid function */
|
|
static OPUS_INLINE silk_float silk_sigmoid( silk_float x )
|
|
{
|
|
return (silk_float)(1.0 / (1.0 + exp(-x)));
|
|
}
|
|
|
|
/* floating-point to integer conversion (rounding) */
|
|
static OPUS_INLINE opus_int32 silk_float2int( silk_float x )
|
|
{
|
|
return (opus_int32)float2int( x );
|
|
}
|
|
|
|
/* floating-point to integer conversion (rounding) */
|
|
static OPUS_INLINE void silk_float2short_array(
|
|
opus_int16 *out,
|
|
const silk_float *in,
|
|
opus_int32 length
|
|
)
|
|
{
|
|
opus_int32 k;
|
|
for( k = length - 1; k >= 0; k-- ) {
|
|
out[k] = silk_SAT16( (opus_int32)float2int( in[k] ) );
|
|
}
|
|
}
|
|
|
|
/* integer to floating-point conversion */
|
|
static OPUS_INLINE void silk_short2float_array(
|
|
silk_float *out,
|
|
const opus_int16 *in,
|
|
opus_int32 length
|
|
)
|
|
{
|
|
opus_int32 k;
|
|
for( k = length - 1; k >= 0; k-- ) {
|
|
out[k] = (silk_float)in[k];
|
|
}
|
|
}
|
|
|
|
/* using log2() helps the fixed-point conversion */
|
|
static OPUS_INLINE silk_float silk_log2( double x )
|
|
{
|
|
return ( silk_float )( 3.32192809488736 * log10( x ) );
|
|
}
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif /* SILK_SIGPROC_FLP_H */
|