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>
124 lines
5.3 KiB
C
124 lines
5.3 KiB
C
/* Copyright (c) 2007-2008 CSIRO
|
|
Copyright (c) 2007-2009 Xiph.Org Foundation
|
|
Copyright (c) 2008-2009 Gregory Maxwell
|
|
Written by Jean-Marc Valin and Gregory Maxwell */
|
|
/*
|
|
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.
|
|
*/
|
|
|
|
#ifndef BANDS_H
|
|
#define BANDS_H
|
|
|
|
#include "arch.h"
|
|
#include "modes.h"
|
|
#include "entenc.h"
|
|
#include "entdec.h"
|
|
#include "rate.h"
|
|
|
|
opus_int16 bitexact_cos(opus_int16 x);
|
|
int bitexact_log2tan(int isin,int icos);
|
|
|
|
/** Compute the amplitude (sqrt energy) in each of the bands
|
|
* @param m Mode data
|
|
* @param X Spectrum
|
|
* @param bandE Square root of the energy for each band (returned)
|
|
*/
|
|
void compute_band_energies(const CELTMode *m, const celt_sig *X, celt_ener *bandE, int end, int C, int LM, int arch);
|
|
|
|
/*void compute_noise_energies(const CELTMode *m, const celt_sig *X, const opus_val16 *tonality, celt_ener *bandE);*/
|
|
|
|
/** Normalise each band of X such that the energy in each band is
|
|
equal to 1
|
|
* @param m Mode data
|
|
* @param X Spectrum (returned normalised)
|
|
* @param bandE Square root of the energy for each band
|
|
*/
|
|
void normalise_bands(const CELTMode *m, const celt_sig * OPUS_RESTRICT freq, celt_norm * OPUS_RESTRICT X, const celt_ener *bandE, int end, int C, int M);
|
|
|
|
/** Denormalise each band of X to restore full amplitude
|
|
* @param m Mode data
|
|
* @param X Spectrum (returned de-normalised)
|
|
* @param bandE Square root of the energy for each band
|
|
*/
|
|
void denormalise_bands(const CELTMode *m, const celt_norm * OPUS_RESTRICT X,
|
|
celt_sig * OPUS_RESTRICT freq, const opus_val16 *bandE, int start,
|
|
int end, int M, int downsample, int silence);
|
|
|
|
#define SPREAD_NONE (0)
|
|
#define SPREAD_LIGHT (1)
|
|
#define SPREAD_NORMAL (2)
|
|
#define SPREAD_AGGRESSIVE (3)
|
|
|
|
int spreading_decision(const CELTMode *m, const celt_norm *X, int *average,
|
|
int last_decision, int *hf_average, int *tapset_decision, int update_hf,
|
|
int end, int C, int M, const int *spread_weight);
|
|
|
|
#ifdef MEASURE_NORM_MSE
|
|
void measure_norm_mse(const CELTMode *m, float *X, float *X0, float *bandE, float *bandE0, int M, int N, int C);
|
|
#endif
|
|
|
|
void haar1(celt_norm *X, int N0, int stride);
|
|
|
|
/** Quantisation/encoding of the residual spectrum
|
|
* @param encode flag that indicates whether we're encoding (1) or decoding (0)
|
|
* @param m Mode data
|
|
* @param start First band to process
|
|
* @param end Last band to process + 1
|
|
* @param X Residual (normalised)
|
|
* @param Y Residual (normalised) for second channel (or NULL for mono)
|
|
* @param collapse_masks Anti-collapse tracking mask
|
|
* @param bandE Square root of the energy for each band
|
|
* @param pulses Bit allocation (per band) for PVQ
|
|
* @param shortBlocks Zero for long blocks, non-zero for short blocks
|
|
* @param spread Amount of spreading to use
|
|
* @param dual_stereo Zero for MS stereo, non-zero for dual stereo
|
|
* @param intensity First band to use intensity stereo
|
|
* @param tf_res Time-frequency resolution change
|
|
* @param total_bits Total number of bits that can be used for the frame (including the ones already spent)
|
|
* @param balance Number of unallocated bits
|
|
* @param en Entropy coder state
|
|
* @param LM log2() of the number of 2.5 subframes in the frame
|
|
* @param codedBands Last band to receive bits + 1
|
|
* @param seed Random generator seed
|
|
* @param arch Run-time architecture (see opus_select_arch())
|
|
*/
|
|
void quant_all_bands(int encode, const CELTMode *m, int start, int end,
|
|
celt_norm * X, celt_norm * Y, unsigned char *collapse_masks,
|
|
const celt_ener *bandE, int *pulses, int shortBlocks, int spread,
|
|
int dual_stereo, int intensity, int *tf_res, opus_int32 total_bits,
|
|
opus_int32 balance, ec_ctx *ec, int M, int codedBands, opus_uint32 *seed,
|
|
int complexity, int arch, int disable_inv);
|
|
|
|
void anti_collapse(const CELTMode *m, celt_norm *X_,
|
|
unsigned char *collapse_masks, int LM, int C, int size, int start,
|
|
int end, const opus_val16 *logE, const opus_val16 *prev1logE,
|
|
const opus_val16 *prev2logE, const int *pulses, opus_uint32 seed,
|
|
int arch);
|
|
|
|
opus_uint32 celt_lcg_rand(opus_uint32 seed);
|
|
|
|
int hysteresis_decision(opus_val16 val, const opus_val16 *thresholds, const opus_val16 *hysteresis, int N, int prev);
|
|
|
|
#endif /* BANDS_H */
|