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>
125 lines
4.7 KiB
C
125 lines
4.7 KiB
C
/***********************************************************************
|
|
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 "structs.h"
|
|
#include "define.h"
|
|
#include "tables.h"
|
|
|
|
#ifdef __cplusplus
|
|
extern "C"
|
|
{
|
|
#endif
|
|
|
|
/* Tables for stereo predictor coding */
|
|
const opus_int16 silk_stereo_pred_quant_Q13[ STEREO_QUANT_TAB_SIZE ] = {
|
|
-13732, -10050, -8266, -7526, -6500, -5000, -2950, -820,
|
|
820, 2950, 5000, 6500, 7526, 8266, 10050, 13732
|
|
};
|
|
const opus_uint8 silk_stereo_pred_joint_iCDF[ 25 ] = {
|
|
249, 247, 246, 245, 244,
|
|
234, 210, 202, 201, 200,
|
|
197, 174, 82, 59, 56,
|
|
55, 54, 46, 22, 12,
|
|
11, 10, 9, 7, 0
|
|
};
|
|
const opus_uint8 silk_stereo_only_code_mid_iCDF[ 2 ] = { 64, 0 };
|
|
|
|
/* Tables for LBRR flags */
|
|
static const opus_uint8 silk_LBRR_flags_2_iCDF[ 3 ] = { 203, 150, 0 };
|
|
static const opus_uint8 silk_LBRR_flags_3_iCDF[ 7 ] = { 215, 195, 166, 125, 110, 82, 0 };
|
|
const opus_uint8 * const silk_LBRR_flags_iCDF_ptr[ 2 ] = {
|
|
silk_LBRR_flags_2_iCDF,
|
|
silk_LBRR_flags_3_iCDF
|
|
};
|
|
|
|
/* Table for LSB coding */
|
|
const opus_uint8 silk_lsb_iCDF[ 2 ] = { 120, 0 };
|
|
|
|
/* Tables for LTPScale */
|
|
const opus_uint8 silk_LTPscale_iCDF[ 3 ] = { 128, 64, 0 };
|
|
|
|
/* Tables for signal type and offset coding */
|
|
const opus_uint8 silk_type_offset_VAD_iCDF[ 4 ] = {
|
|
232, 158, 10, 0
|
|
};
|
|
const opus_uint8 silk_type_offset_no_VAD_iCDF[ 2 ] = {
|
|
230, 0
|
|
};
|
|
|
|
/* Tables for NLSF interpolation factor */
|
|
const opus_uint8 silk_NLSF_interpolation_factor_iCDF[ 5 ] = { 243, 221, 192, 181, 0 };
|
|
|
|
/* Quantization offsets */
|
|
const opus_int16 silk_Quantization_Offsets_Q10[ 2 ][ 2 ] = {
|
|
{ OFFSET_UVL_Q10, OFFSET_UVH_Q10 }, { OFFSET_VL_Q10, OFFSET_VH_Q10 }
|
|
};
|
|
|
|
/* Table for LTPScale */
|
|
const opus_int16 silk_LTPScales_table_Q14[ 3 ] = { 15565, 12288, 8192 };
|
|
|
|
/* Uniform entropy tables */
|
|
const opus_uint8 silk_uniform3_iCDF[ 3 ] = { 171, 85, 0 };
|
|
const opus_uint8 silk_uniform4_iCDF[ 4 ] = { 192, 128, 64, 0 };
|
|
const opus_uint8 silk_uniform5_iCDF[ 5 ] = { 205, 154, 102, 51, 0 };
|
|
const opus_uint8 silk_uniform6_iCDF[ 6 ] = { 213, 171, 128, 85, 43, 0 };
|
|
const opus_uint8 silk_uniform8_iCDF[ 8 ] = { 224, 192, 160, 128, 96, 64, 32, 0 };
|
|
|
|
const opus_uint8 silk_NLSF_EXT_iCDF[ 7 ] = { 100, 40, 16, 7, 3, 1, 0 };
|
|
|
|
/* Elliptic/Cauer filters designed with 0.1 dB passband ripple,
|
|
80 dB minimum stopband attenuation, and
|
|
[0.95 : 0.15 : 0.35] normalized cut off frequencies. */
|
|
|
|
/* Interpolation points for filter coefficients used in the bandwidth transition smoother */
|
|
const opus_int32 silk_Transition_LP_B_Q28[ TRANSITION_INT_NUM ][ TRANSITION_NB ] =
|
|
{
|
|
{ 250767114, 501534038, 250767114 },
|
|
{ 209867381, 419732057, 209867381 },
|
|
{ 170987846, 341967853, 170987846 },
|
|
{ 131531482, 263046905, 131531482 },
|
|
{ 89306658, 178584282, 89306658 }
|
|
};
|
|
|
|
/* Interpolation points for filter coefficients used in the bandwidth transition smoother */
|
|
const opus_int32 silk_Transition_LP_A_Q28[ TRANSITION_INT_NUM ][ TRANSITION_NA ] =
|
|
{
|
|
{ 506393414, 239854379 },
|
|
{ 411067935, 169683996 },
|
|
{ 306733530, 116694253 },
|
|
{ 185807084, 77959395 },
|
|
{ 35497197, 57401098 }
|
|
};
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|