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>
113 lines
4.7 KiB
C
113 lines
4.7 KiB
C
/* Copyright (c) 2007-2008 CSIRO
|
|
Copyright (c) 2007-2008 Xiph.Org Foundation
|
|
Written by Jean-Marc Valin */
|
|
/*
|
|
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.
|
|
|
|
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.
|
|
*/
|
|
|
|
/* This is a simple MDCT implementation that uses a N/4 complex FFT
|
|
to do most of the work. It should be relatively straightforward to
|
|
plug in pretty much and FFT here.
|
|
|
|
This replaces the Vorbis FFT (and uses the exact same API), which
|
|
was a bit too messy and that was ending up duplicating code
|
|
(might as well use the same FFT everywhere).
|
|
|
|
The algorithm is similar to (and inspired from) Fabrice Bellard's
|
|
MDCT implementation in FFMPEG, but has differences in signs, ordering
|
|
and scaling in many places.
|
|
*/
|
|
|
|
#ifndef MDCT_H
|
|
#define MDCT_H
|
|
|
|
#include "opus_defines.h"
|
|
#include "kiss_fft.h"
|
|
#include "arch.h"
|
|
|
|
typedef struct {
|
|
int n;
|
|
int maxshift;
|
|
const kiss_fft_state *kfft[4];
|
|
const kiss_twiddle_scalar * OPUS_RESTRICT trig;
|
|
} mdct_lookup;
|
|
|
|
#if defined(HAVE_ARM_NE10)
|
|
#include "arm/mdct_arm.h"
|
|
#endif
|
|
|
|
|
|
int clt_mdct_init(mdct_lookup *l,int N, int maxshift, int arch);
|
|
void clt_mdct_clear(mdct_lookup *l, int arch);
|
|
|
|
/** Compute a forward MDCT and scale by 4/N, trashes the input array */
|
|
void clt_mdct_forward_c(const mdct_lookup *l, kiss_fft_scalar *in,
|
|
kiss_fft_scalar * OPUS_RESTRICT out,
|
|
const opus_val16 *window, int overlap,
|
|
int shift, int stride, int arch);
|
|
|
|
/** Compute a backward MDCT (no scaling) and performs weighted overlap-add
|
|
(scales implicitly by 1/2) */
|
|
void clt_mdct_backward_c(const mdct_lookup *l, kiss_fft_scalar *in,
|
|
kiss_fft_scalar * OPUS_RESTRICT out,
|
|
const opus_val16 * OPUS_RESTRICT window,
|
|
int overlap, int shift, int stride, int arch);
|
|
|
|
#if !defined(OVERRIDE_OPUS_MDCT)
|
|
/* Is run-time CPU detection enabled on this platform? */
|
|
#if defined(OPUS_HAVE_RTCD) && defined(HAVE_ARM_NE10)
|
|
|
|
extern void (*const CLT_MDCT_FORWARD_IMPL[OPUS_ARCHMASK+1])(
|
|
const mdct_lookup *l, kiss_fft_scalar *in,
|
|
kiss_fft_scalar * OPUS_RESTRICT out, const opus_val16 *window,
|
|
int overlap, int shift, int stride, int arch);
|
|
|
|
#define clt_mdct_forward(_l, _in, _out, _window, _overlap, _shift, _stride, _arch) \
|
|
((*CLT_MDCT_FORWARD_IMPL[(arch)&OPUS_ARCHMASK])(_l, _in, _out, \
|
|
_window, _overlap, _shift, \
|
|
_stride, _arch))
|
|
|
|
extern void (*const CLT_MDCT_BACKWARD_IMPL[OPUS_ARCHMASK+1])(
|
|
const mdct_lookup *l, kiss_fft_scalar *in,
|
|
kiss_fft_scalar * OPUS_RESTRICT out, const opus_val16 *window,
|
|
int overlap, int shift, int stride, int arch);
|
|
|
|
#define clt_mdct_backward(_l, _in, _out, _window, _overlap, _shift, _stride, _arch) \
|
|
(*CLT_MDCT_BACKWARD_IMPL[(arch)&OPUS_ARCHMASK])(_l, _in, _out, \
|
|
_window, _overlap, _shift, \
|
|
_stride, _arch)
|
|
|
|
#else /* if defined(OPUS_HAVE_RTCD) && defined(HAVE_ARM_NE10) */
|
|
|
|
#define clt_mdct_forward(_l, _in, _out, _window, _overlap, _shift, _stride, _arch) \
|
|
clt_mdct_forward_c(_l, _in, _out, _window, _overlap, _shift, _stride, _arch)
|
|
|
|
#define clt_mdct_backward(_l, _in, _out, _window, _overlap, _shift, _stride, _arch) \
|
|
clt_mdct_backward_c(_l, _in, _out, _window, _overlap, _shift, _stride, _arch)
|
|
|
|
#endif /* end if defined(OPUS_HAVE_RTCD) && defined(HAVE_ARM_NE10) && !defined(FIXED_POINT) */
|
|
#endif /* end if !defined(OVERRIDE_OPUS_MDCT) */
|
|
|
|
#endif
|