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>
102 lines
3.2 KiB
C
102 lines
3.2 KiB
C
/* Copyright (c) 2007-2008 CSIRO
|
|
Copyright (c) 2007-2009 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.
|
|
*/
|
|
|
|
#ifndef RATE_H
|
|
#define RATE_H
|
|
|
|
#define MAX_PSEUDO 40
|
|
#define LOG_MAX_PSEUDO 6
|
|
|
|
#define CELT_MAX_PULSES 128
|
|
|
|
#define MAX_FINE_BITS 8
|
|
|
|
#define FINE_OFFSET 21
|
|
#define QTHETA_OFFSET 4
|
|
#define QTHETA_OFFSET_TWOPHASE 16
|
|
|
|
#include "cwrs.h"
|
|
#include "modes.h"
|
|
|
|
void compute_pulse_cache(CELTMode *m, int LM);
|
|
|
|
static OPUS_INLINE int get_pulses(int i)
|
|
{
|
|
return i<8 ? i : (8 + (i&7)) << ((i>>3)-1);
|
|
}
|
|
|
|
static OPUS_INLINE int bits2pulses(const CELTMode *m, int band, int LM, int bits)
|
|
{
|
|
int i;
|
|
int lo, hi;
|
|
const unsigned char *cache;
|
|
|
|
LM++;
|
|
cache = m->cache.bits + m->cache.index[LM*m->nbEBands+band];
|
|
|
|
lo = 0;
|
|
hi = cache[0];
|
|
bits--;
|
|
for (i=0;i<LOG_MAX_PSEUDO;i++)
|
|
{
|
|
int mid = (lo+hi+1)>>1;
|
|
/* OPT: Make sure this is implemented with a conditional move */
|
|
if ((int)cache[mid] >= bits)
|
|
hi = mid;
|
|
else
|
|
lo = mid;
|
|
}
|
|
if (bits- (lo == 0 ? -1 : (int)cache[lo]) <= (int)cache[hi]-bits)
|
|
return lo;
|
|
else
|
|
return hi;
|
|
}
|
|
|
|
static OPUS_INLINE int pulses2bits(const CELTMode *m, int band, int LM, int pulses)
|
|
{
|
|
const unsigned char *cache;
|
|
|
|
LM++;
|
|
cache = m->cache.bits + m->cache.index[LM*m->nbEBands+band];
|
|
return pulses == 0 ? 0 : cache[pulses]+1;
|
|
}
|
|
|
|
/** Compute the pulse allocation, i.e. how many pulses will go in each
|
|
* band.
|
|
@param m mode
|
|
@param offsets Requested increase or decrease in the number of bits for
|
|
each band
|
|
@param total Number of bands
|
|
@param pulses Number of pulses per band (returned)
|
|
@return Total number of bits allocated
|
|
*/
|
|
int clt_compute_allocation(const CELTMode *m, int start, int end, const int *offsets, const int *cap, int alloc_trim, int *intensity, int *dual_stereo,
|
|
opus_int32 total, opus_int32 *balance, int *pulses, int *ebits, int *fine_priority, int C, int LM, ec_ctx *ec, int encode, int prev, int signalBandwidth);
|
|
|
|
#endif
|