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>
109 lines
4.9 KiB
C
109 lines
4.9 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 "main.h"
|
|
|
|
/* Set decoder sampling rate */
|
|
opus_int silk_decoder_set_fs(
|
|
silk_decoder_state *psDec, /* I/O Decoder state pointer */
|
|
opus_int fs_kHz, /* I Sampling frequency (kHz) */
|
|
opus_int32 fs_API_Hz /* I API Sampling frequency (Hz) */
|
|
)
|
|
{
|
|
opus_int frame_length, ret = 0;
|
|
|
|
celt_assert( fs_kHz == 8 || fs_kHz == 12 || fs_kHz == 16 );
|
|
celt_assert( psDec->nb_subfr == MAX_NB_SUBFR || psDec->nb_subfr == MAX_NB_SUBFR/2 );
|
|
|
|
/* New (sub)frame length */
|
|
psDec->subfr_length = silk_SMULBB( SUB_FRAME_LENGTH_MS, fs_kHz );
|
|
frame_length = silk_SMULBB( psDec->nb_subfr, psDec->subfr_length );
|
|
|
|
/* Initialize resampler when switching internal or external sampling frequency */
|
|
if( psDec->fs_kHz != fs_kHz || psDec->fs_API_hz != fs_API_Hz ) {
|
|
/* Initialize the resampler for dec_API.c preparing resampling from fs_kHz to API_fs_Hz */
|
|
ret += silk_resampler_init( &psDec->resampler_state, silk_SMULBB( fs_kHz, 1000 ), fs_API_Hz, 0 );
|
|
|
|
psDec->fs_API_hz = fs_API_Hz;
|
|
}
|
|
|
|
if( psDec->fs_kHz != fs_kHz || frame_length != psDec->frame_length ) {
|
|
if( fs_kHz == 8 ) {
|
|
if( psDec->nb_subfr == MAX_NB_SUBFR ) {
|
|
psDec->pitch_contour_iCDF = silk_pitch_contour_NB_iCDF;
|
|
} else {
|
|
psDec->pitch_contour_iCDF = silk_pitch_contour_10_ms_NB_iCDF;
|
|
}
|
|
} else {
|
|
if( psDec->nb_subfr == MAX_NB_SUBFR ) {
|
|
psDec->pitch_contour_iCDF = silk_pitch_contour_iCDF;
|
|
} else {
|
|
psDec->pitch_contour_iCDF = silk_pitch_contour_10_ms_iCDF;
|
|
}
|
|
}
|
|
if( psDec->fs_kHz != fs_kHz ) {
|
|
psDec->ltp_mem_length = silk_SMULBB( LTP_MEM_LENGTH_MS, fs_kHz );
|
|
if( fs_kHz == 8 || fs_kHz == 12 ) {
|
|
psDec->LPC_order = MIN_LPC_ORDER;
|
|
psDec->psNLSF_CB = &silk_NLSF_CB_NB_MB;
|
|
} else {
|
|
psDec->LPC_order = MAX_LPC_ORDER;
|
|
psDec->psNLSF_CB = &silk_NLSF_CB_WB;
|
|
}
|
|
if( fs_kHz == 16 ) {
|
|
psDec->pitch_lag_low_bits_iCDF = silk_uniform8_iCDF;
|
|
} else if( fs_kHz == 12 ) {
|
|
psDec->pitch_lag_low_bits_iCDF = silk_uniform6_iCDF;
|
|
} else if( fs_kHz == 8 ) {
|
|
psDec->pitch_lag_low_bits_iCDF = silk_uniform4_iCDF;
|
|
} else {
|
|
/* unsupported sampling rate */
|
|
celt_assert( 0 );
|
|
}
|
|
psDec->first_frame_after_reset = 1;
|
|
psDec->lagPrev = 100;
|
|
psDec->LastGainIndex = 10;
|
|
psDec->prevSignalType = TYPE_NO_VOICE_ACTIVITY;
|
|
silk_memset( psDec->outBuf, 0, sizeof(psDec->outBuf));
|
|
silk_memset( psDec->sLPC_Q14_buf, 0, sizeof(psDec->sLPC_Q14_buf) );
|
|
}
|
|
|
|
psDec->fs_kHz = fs_kHz;
|
|
psDec->frame_length = frame_length;
|
|
}
|
|
|
|
/* Check that settings are valid */
|
|
celt_assert( psDec->frame_length > 0 && psDec->frame_length <= MAX_FRAME_LENGTH );
|
|
|
|
return ret;
|
|
}
|
|
|