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>
116 lines
5.4 KiB
C
116 lines
5.4 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"
|
|
|
|
/*#define silk_enc_map(a) ((a) > 0 ? 1 : 0)*/
|
|
/*#define silk_dec_map(a) ((a) > 0 ? 1 : -1)*/
|
|
/* shifting avoids if-statement */
|
|
#define silk_enc_map(a) ( silk_RSHIFT( (a), 15 ) + 1 )
|
|
#define silk_dec_map(a) ( silk_LSHIFT( (a), 1 ) - 1 )
|
|
|
|
/* Encodes signs of excitation */
|
|
void silk_encode_signs(
|
|
ec_enc *psRangeEnc, /* I/O Compressor data structure */
|
|
const opus_int8 pulses[], /* I pulse signal */
|
|
opus_int length, /* I length of input */
|
|
const opus_int signalType, /* I Signal type */
|
|
const opus_int quantOffsetType, /* I Quantization offset type */
|
|
const opus_int sum_pulses[ MAX_NB_SHELL_BLOCKS ] /* I Sum of absolute pulses per block */
|
|
)
|
|
{
|
|
opus_int i, j, p;
|
|
opus_uint8 icdf[ 2 ];
|
|
const opus_int8 *q_ptr;
|
|
const opus_uint8 *icdf_ptr;
|
|
|
|
icdf[ 1 ] = 0;
|
|
q_ptr = pulses;
|
|
i = silk_SMULBB( 7, silk_ADD_LSHIFT( quantOffsetType, signalType, 1 ) );
|
|
icdf_ptr = &silk_sign_iCDF[ i ];
|
|
length = silk_RSHIFT( length + SHELL_CODEC_FRAME_LENGTH/2, LOG2_SHELL_CODEC_FRAME_LENGTH );
|
|
for( i = 0; i < length; i++ ) {
|
|
p = sum_pulses[ i ];
|
|
if( p > 0 ) {
|
|
icdf[ 0 ] = icdf_ptr[ silk_min( p & 0x1F, 6 ) ];
|
|
for( j = 0; j < SHELL_CODEC_FRAME_LENGTH; j++ ) {
|
|
if( q_ptr[ j ] != 0 ) {
|
|
ec_enc_icdf( psRangeEnc, silk_enc_map( q_ptr[ j ]), icdf, 8 );
|
|
}
|
|
}
|
|
}
|
|
q_ptr += SHELL_CODEC_FRAME_LENGTH;
|
|
}
|
|
}
|
|
|
|
/* Decodes signs of excitation */
|
|
void silk_decode_signs(
|
|
ec_dec *psRangeDec, /* I/O Compressor data structure */
|
|
opus_int16 pulses[], /* I/O pulse signal */
|
|
opus_int length, /* I length of input */
|
|
const opus_int signalType, /* I Signal type */
|
|
const opus_int quantOffsetType, /* I Quantization offset type */
|
|
const opus_int sum_pulses[ MAX_NB_SHELL_BLOCKS ] /* I Sum of absolute pulses per block */
|
|
)
|
|
{
|
|
opus_int i, j, p;
|
|
opus_uint8 icdf[ 2 ];
|
|
opus_int16 *q_ptr;
|
|
const opus_uint8 *icdf_ptr;
|
|
|
|
icdf[ 1 ] = 0;
|
|
q_ptr = pulses;
|
|
i = silk_SMULBB( 7, silk_ADD_LSHIFT( quantOffsetType, signalType, 1 ) );
|
|
icdf_ptr = &silk_sign_iCDF[ i ];
|
|
length = silk_RSHIFT( length + SHELL_CODEC_FRAME_LENGTH/2, LOG2_SHELL_CODEC_FRAME_LENGTH );
|
|
for( i = 0; i < length; i++ ) {
|
|
p = sum_pulses[ i ];
|
|
if( p > 0 ) {
|
|
icdf[ 0 ] = icdf_ptr[ silk_min( p & 0x1F, 6 ) ];
|
|
for( j = 0; j < SHELL_CODEC_FRAME_LENGTH; j++ ) {
|
|
if( q_ptr[ j ] > 0 ) {
|
|
/* attach sign */
|
|
#if 0
|
|
/* conditional implementation */
|
|
if( ec_dec_icdf( psRangeDec, icdf, 8 ) == 0 ) {
|
|
q_ptr[ j ] = -q_ptr[ j ];
|
|
}
|
|
#else
|
|
/* implementation with shift, subtraction, multiplication */
|
|
q_ptr[ j ] *= silk_dec_map( ec_dec_icdf( psRangeDec, icdf, 8 ) );
|
|
#endif
|
|
}
|
|
}
|
|
}
|
|
q_ptr += SHELL_CODEC_FRAME_LENGTH;
|
|
}
|
|
}
|