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>
78 lines
3.6 KiB
C
78 lines
3.6 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
|
|
|
|
/***********************************************************
|
|
* Pitch analyser function
|
|
********************************************************** */
|
|
#include "SigProc_FIX.h"
|
|
#include "pitch_est_defines.h"
|
|
|
|
void silk_decode_pitch(
|
|
opus_int16 lagIndex, /* I */
|
|
opus_int8 contourIndex, /* O */
|
|
opus_int pitch_lags[], /* O 4 pitch values */
|
|
const opus_int Fs_kHz, /* I sampling frequency (kHz) */
|
|
const opus_int nb_subfr /* I number of sub frames */
|
|
)
|
|
{
|
|
opus_int lag, k, min_lag, max_lag, cbk_size;
|
|
const opus_int8 *Lag_CB_ptr;
|
|
|
|
if( Fs_kHz == 8 ) {
|
|
if( nb_subfr == PE_MAX_NB_SUBFR ) {
|
|
Lag_CB_ptr = &silk_CB_lags_stage2[ 0 ][ 0 ];
|
|
cbk_size = PE_NB_CBKS_STAGE2_EXT;
|
|
} else {
|
|
celt_assert( nb_subfr == PE_MAX_NB_SUBFR >> 1 );
|
|
Lag_CB_ptr = &silk_CB_lags_stage2_10_ms[ 0 ][ 0 ];
|
|
cbk_size = PE_NB_CBKS_STAGE2_10MS;
|
|
}
|
|
} else {
|
|
if( nb_subfr == PE_MAX_NB_SUBFR ) {
|
|
Lag_CB_ptr = &silk_CB_lags_stage3[ 0 ][ 0 ];
|
|
cbk_size = PE_NB_CBKS_STAGE3_MAX;
|
|
} else {
|
|
celt_assert( nb_subfr == PE_MAX_NB_SUBFR >> 1 );
|
|
Lag_CB_ptr = &silk_CB_lags_stage3_10_ms[ 0 ][ 0 ];
|
|
cbk_size = PE_NB_CBKS_STAGE3_10MS;
|
|
}
|
|
}
|
|
|
|
min_lag = silk_SMULBB( PE_MIN_LAG_MS, Fs_kHz );
|
|
max_lag = silk_SMULBB( PE_MAX_LAG_MS, Fs_kHz );
|
|
lag = min_lag + lagIndex;
|
|
|
|
for( k = 0; k < nb_subfr; k++ ) {
|
|
pitch_lags[ k ] = lag + matrix_ptr( Lag_CB_ptr, k, contourIndex, cbk_size );
|
|
pitch_lags[ k ] = silk_LIMIT( pitch_lags[ k ], min_lag, max_lag );
|
|
}
|
|
}
|