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>
115 lines
7.0 KiB
C
115 lines
7.0 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.
|
|
***********************************************************************/
|
|
|
|
#ifndef SILK_TABLES_H
|
|
#define SILK_TABLES_H
|
|
|
|
#include "define.h"
|
|
#include "structs.h"
|
|
|
|
#ifdef __cplusplus
|
|
extern "C"
|
|
{
|
|
#endif
|
|
|
|
/* Entropy coding tables (with size in bytes indicated) */
|
|
extern const opus_uint8 silk_gain_iCDF[ 3 ][ N_LEVELS_QGAIN / 8 ]; /* 24 */
|
|
extern const opus_uint8 silk_delta_gain_iCDF[ MAX_DELTA_GAIN_QUANT - MIN_DELTA_GAIN_QUANT + 1 ]; /* 41 */
|
|
|
|
extern const opus_uint8 silk_pitch_lag_iCDF[ 2 * ( PITCH_EST_MAX_LAG_MS - PITCH_EST_MIN_LAG_MS ) ];/* 32 */
|
|
extern const opus_uint8 silk_pitch_delta_iCDF[ 21 ]; /* 21 */
|
|
extern const opus_uint8 silk_pitch_contour_iCDF[ 34 ]; /* 34 */
|
|
extern const opus_uint8 silk_pitch_contour_NB_iCDF[ 11 ]; /* 11 */
|
|
extern const opus_uint8 silk_pitch_contour_10_ms_iCDF[ 12 ]; /* 12 */
|
|
extern const opus_uint8 silk_pitch_contour_10_ms_NB_iCDF[ 3 ]; /* 3 */
|
|
|
|
extern const opus_uint8 silk_pulses_per_block_iCDF[ N_RATE_LEVELS ][ SILK_MAX_PULSES + 2 ]; /* 180 */
|
|
extern const opus_uint8 silk_pulses_per_block_BITS_Q5[ N_RATE_LEVELS - 1 ][ SILK_MAX_PULSES + 2 ]; /* 162 */
|
|
|
|
extern const opus_uint8 silk_rate_levels_iCDF[ 2 ][ N_RATE_LEVELS - 1 ]; /* 18 */
|
|
extern const opus_uint8 silk_rate_levels_BITS_Q5[ 2 ][ N_RATE_LEVELS - 1 ]; /* 18 */
|
|
|
|
extern const opus_uint8 silk_max_pulses_table[ 4 ]; /* 4 */
|
|
|
|
extern const opus_uint8 silk_shell_code_table0[ 152 ]; /* 152 */
|
|
extern const opus_uint8 silk_shell_code_table1[ 152 ]; /* 152 */
|
|
extern const opus_uint8 silk_shell_code_table2[ 152 ]; /* 152 */
|
|
extern const opus_uint8 silk_shell_code_table3[ 152 ]; /* 152 */
|
|
extern const opus_uint8 silk_shell_code_table_offsets[ SILK_MAX_PULSES + 1 ]; /* 17 */
|
|
|
|
extern const opus_uint8 silk_lsb_iCDF[ 2 ]; /* 2 */
|
|
|
|
extern const opus_uint8 silk_sign_iCDF[ 42 ]; /* 42 */
|
|
|
|
extern const opus_uint8 silk_uniform3_iCDF[ 3 ]; /* 3 */
|
|
extern const opus_uint8 silk_uniform4_iCDF[ 4 ]; /* 4 */
|
|
extern const opus_uint8 silk_uniform5_iCDF[ 5 ]; /* 5 */
|
|
extern const opus_uint8 silk_uniform6_iCDF[ 6 ]; /* 6 */
|
|
extern const opus_uint8 silk_uniform8_iCDF[ 8 ]; /* 8 */
|
|
|
|
extern const opus_uint8 silk_NLSF_EXT_iCDF[ 7 ]; /* 7 */
|
|
|
|
extern const opus_uint8 silk_LTP_per_index_iCDF[ 3 ]; /* 3 */
|
|
extern const opus_uint8 * const silk_LTP_gain_iCDF_ptrs[ NB_LTP_CBKS ]; /* 3 */
|
|
extern const opus_uint8 * const silk_LTP_gain_BITS_Q5_ptrs[ NB_LTP_CBKS ]; /* 3 */
|
|
extern const opus_int8 * const silk_LTP_vq_ptrs_Q7[ NB_LTP_CBKS ]; /* 168 */
|
|
extern const opus_uint8 * const silk_LTP_vq_gain_ptrs_Q7[NB_LTP_CBKS];
|
|
extern const opus_int8 silk_LTP_vq_sizes[ NB_LTP_CBKS ]; /* 3 */
|
|
|
|
extern const opus_uint8 silk_LTPscale_iCDF[ 3 ]; /* 4 */
|
|
extern const opus_int16 silk_LTPScales_table_Q14[ 3 ]; /* 6 */
|
|
|
|
extern const opus_uint8 silk_type_offset_VAD_iCDF[ 4 ]; /* 4 */
|
|
extern const opus_uint8 silk_type_offset_no_VAD_iCDF[ 2 ]; /* 2 */
|
|
|
|
extern const opus_int16 silk_stereo_pred_quant_Q13[ STEREO_QUANT_TAB_SIZE ]; /* 32 */
|
|
extern const opus_uint8 silk_stereo_pred_joint_iCDF[ 25 ]; /* 25 */
|
|
extern const opus_uint8 silk_stereo_only_code_mid_iCDF[ 2 ]; /* 2 */
|
|
|
|
extern const opus_uint8 * const silk_LBRR_flags_iCDF_ptr[ 2 ]; /* 10 */
|
|
|
|
extern const opus_uint8 silk_NLSF_interpolation_factor_iCDF[ 5 ]; /* 5 */
|
|
|
|
extern const silk_NLSF_CB_struct silk_NLSF_CB_WB; /* 1040 */
|
|
extern const silk_NLSF_CB_struct silk_NLSF_CB_NB_MB; /* 728 */
|
|
|
|
/* Quantization offsets */
|
|
extern const opus_int16 silk_Quantization_Offsets_Q10[ 2 ][ 2 ]; /* 8 */
|
|
|
|
/* Interpolation points for filter coefficients used in the bandwidth transition smoother */
|
|
extern const opus_int32 silk_Transition_LP_B_Q28[ TRANSITION_INT_NUM ][ TRANSITION_NB ]; /* 60 */
|
|
extern const opus_int32 silk_Transition_LP_A_Q28[ TRANSITION_INT_NUM ][ TRANSITION_NA ]; /* 60 */
|
|
|
|
/* Rom table with cosine values */
|
|
extern const opus_int16 silk_LSFCosTab_FIX_Q12[ LSF_COS_TAB_SZ_FIX + 1 ]; /* 258 */
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif
|