fix(windows): vendor audiopus_sys + patch libopus for clang-cl SIMD
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>
This commit is contained in:
Siavash Sameni
112
vendor/audiopus_sys/opus/silk/float/structs_FLP.h
vendored
Normal file
112
vendor/audiopus_sys/opus/silk/float/structs_FLP.h
vendored
Normal file
@@ -0,0 +1,112 @@
|
||||
/***********************************************************************
|
||||
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_STRUCTS_FLP_H
|
||||
#define SILK_STRUCTS_FLP_H
|
||||
|
||||
#include "typedef.h"
|
||||
#include "main.h"
|
||||
#include "structs.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
{
|
||||
#endif
|
||||
|
||||
/********************************/
|
||||
/* Noise shaping analysis state */
|
||||
/********************************/
|
||||
typedef struct {
|
||||
opus_int8 LastGainIndex;
|
||||
silk_float HarmShapeGain_smth;
|
||||
silk_float Tilt_smth;
|
||||
} silk_shape_state_FLP;
|
||||
|
||||
/********************************/
|
||||
/* Encoder state FLP */
|
||||
/********************************/
|
||||
typedef struct {
|
||||
silk_encoder_state sCmn; /* Common struct, shared with fixed-point code */
|
||||
silk_shape_state_FLP sShape; /* Noise shaping state */
|
||||
|
||||
/* Buffer for find pitch and noise shape analysis */
|
||||
silk_float x_buf[ 2 * MAX_FRAME_LENGTH + LA_SHAPE_MAX ];/* Buffer for find pitch and noise shape analysis */
|
||||
silk_float LTPCorr; /* Normalized correlation from pitch lag estimator */
|
||||
} silk_encoder_state_FLP;
|
||||
|
||||
/************************/
|
||||
/* Encoder control FLP */
|
||||
/************************/
|
||||
typedef struct {
|
||||
/* Prediction and coding parameters */
|
||||
silk_float Gains[ MAX_NB_SUBFR ];
|
||||
silk_float PredCoef[ 2 ][ MAX_LPC_ORDER ]; /* holds interpolated and final coefficients */
|
||||
silk_float LTPCoef[LTP_ORDER * MAX_NB_SUBFR];
|
||||
silk_float LTP_scale;
|
||||
opus_int pitchL[ MAX_NB_SUBFR ];
|
||||
|
||||
/* Noise shaping parameters */
|
||||
silk_float AR[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ];
|
||||
silk_float LF_MA_shp[ MAX_NB_SUBFR ];
|
||||
silk_float LF_AR_shp[ MAX_NB_SUBFR ];
|
||||
silk_float Tilt[ MAX_NB_SUBFR ];
|
||||
silk_float HarmShapeGain[ MAX_NB_SUBFR ];
|
||||
silk_float Lambda;
|
||||
silk_float input_quality;
|
||||
silk_float coding_quality;
|
||||
|
||||
/* Measures */
|
||||
silk_float predGain;
|
||||
silk_float LTPredCodGain;
|
||||
silk_float ResNrg[ MAX_NB_SUBFR ]; /* Residual energy per subframe */
|
||||
|
||||
/* Parameters for CBR mode */
|
||||
opus_int32 GainsUnq_Q16[ MAX_NB_SUBFR ];
|
||||
opus_int8 lastGainIndexPrev;
|
||||
} silk_encoder_control_FLP;
|
||||
|
||||
/************************/
|
||||
/* Encoder Super Struct */
|
||||
/************************/
|
||||
typedef struct {
|
||||
silk_encoder_state_FLP state_Fxx[ ENCODER_NUM_CHANNELS ];
|
||||
stereo_enc_state sStereo;
|
||||
opus_int32 nBitsUsedLBRR;
|
||||
opus_int32 nBitsExceeded;
|
||||
opus_int nChannelsAPI;
|
||||
opus_int nChannelsInternal;
|
||||
opus_int nPrevChannelsInternal;
|
||||
opus_int timeSinceSwitchAllowed_ms;
|
||||
opus_int allowBandwidthSwitch;
|
||||
opus_int prev_decode_only_middle;
|
||||
} silk_encoder;
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user