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:
70
vendor/audiopus_sys/opus/silk/table_LSF_cos.c
vendored
Normal file
70
vendor/audiopus_sys/opus/silk/table_LSF_cos.c
vendored
Normal file
@@ -0,0 +1,70 @@
|
||||
/***********************************************************************
|
||||
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.
|
||||
***********************************************************************/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include "tables.h"
|
||||
|
||||
/* Cosine approximation table for LSF conversion */
|
||||
/* Q12 values (even) */
|
||||
const opus_int16 silk_LSFCosTab_FIX_Q12[ LSF_COS_TAB_SZ_FIX + 1 ] = {
|
||||
8192, 8190, 8182, 8170,
|
||||
8152, 8130, 8104, 8072,
|
||||
8034, 7994, 7946, 7896,
|
||||
7840, 7778, 7714, 7644,
|
||||
7568, 7490, 7406, 7318,
|
||||
7226, 7128, 7026, 6922,
|
||||
6812, 6698, 6580, 6458,
|
||||
6332, 6204, 6070, 5934,
|
||||
5792, 5648, 5502, 5352,
|
||||
5198, 5040, 4880, 4718,
|
||||
4552, 4382, 4212, 4038,
|
||||
3862, 3684, 3502, 3320,
|
||||
3136, 2948, 2760, 2570,
|
||||
2378, 2186, 1990, 1794,
|
||||
1598, 1400, 1202, 1002,
|
||||
802, 602, 402, 202,
|
||||
0, -202, -402, -602,
|
||||
-802, -1002, -1202, -1400,
|
||||
-1598, -1794, -1990, -2186,
|
||||
-2378, -2570, -2760, -2948,
|
||||
-3136, -3320, -3502, -3684,
|
||||
-3862, -4038, -4212, -4382,
|
||||
-4552, -4718, -4880, -5040,
|
||||
-5198, -5352, -5502, -5648,
|
||||
-5792, -5934, -6070, -6204,
|
||||
-6332, -6458, -6580, -6698,
|
||||
-6812, -6922, -7026, -7128,
|
||||
-7226, -7318, -7406, -7490,
|
||||
-7568, -7644, -7714, -7778,
|
||||
-7840, -7896, -7946, -7994,
|
||||
-8034, -8072, -8104, -8130,
|
||||
-8152, -8170, -8182, -8190,
|
||||
-8192
|
||||
};
|
||||
Reference in New Issue
Block a user