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>
151 lines
6.0 KiB
C
151 lines
6.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_CONTROL_H
|
|
#define SILK_CONTROL_H
|
|
|
|
#include "typedef.h"
|
|
|
|
#ifdef __cplusplus
|
|
extern "C"
|
|
{
|
|
#endif
|
|
|
|
/* Decoder API flags */
|
|
#define FLAG_DECODE_NORMAL 0
|
|
#define FLAG_PACKET_LOST 1
|
|
#define FLAG_DECODE_LBRR 2
|
|
|
|
/***********************************************/
|
|
/* Structure for controlling encoder operation */
|
|
/***********************************************/
|
|
typedef struct {
|
|
/* I: Number of channels; 1/2 */
|
|
opus_int32 nChannelsAPI;
|
|
|
|
/* I: Number of channels; 1/2 */
|
|
opus_int32 nChannelsInternal;
|
|
|
|
/* I: Input signal sampling rate in Hertz; 8000/12000/16000/24000/32000/44100/48000 */
|
|
opus_int32 API_sampleRate;
|
|
|
|
/* I: Maximum internal sampling rate in Hertz; 8000/12000/16000 */
|
|
opus_int32 maxInternalSampleRate;
|
|
|
|
/* I: Minimum internal sampling rate in Hertz; 8000/12000/16000 */
|
|
opus_int32 minInternalSampleRate;
|
|
|
|
/* I: Soft request for internal sampling rate in Hertz; 8000/12000/16000 */
|
|
opus_int32 desiredInternalSampleRate;
|
|
|
|
/* I: Number of samples per packet in milliseconds; 10/20/40/60 */
|
|
opus_int payloadSize_ms;
|
|
|
|
/* I: Bitrate during active speech in bits/second; internally limited */
|
|
opus_int32 bitRate;
|
|
|
|
/* I: Uplink packet loss in percent (0-100) */
|
|
opus_int packetLossPercentage;
|
|
|
|
/* I: Complexity mode; 0 is lowest, 10 is highest complexity */
|
|
opus_int complexity;
|
|
|
|
/* I: Flag to enable in-band Forward Error Correction (FEC); 0/1 */
|
|
opus_int useInBandFEC;
|
|
|
|
/* I: Flag to actually code in-band Forward Error Correction (FEC) in the current packet; 0/1 */
|
|
opus_int LBRR_coded;
|
|
|
|
/* I: Flag to enable discontinuous transmission (DTX); 0/1 */
|
|
opus_int useDTX;
|
|
|
|
/* I: Flag to use constant bitrate */
|
|
opus_int useCBR;
|
|
|
|
/* I: Maximum number of bits allowed for the frame */
|
|
opus_int maxBits;
|
|
|
|
/* I: Causes a smooth downmix to mono */
|
|
opus_int toMono;
|
|
|
|
/* I: Opus encoder is allowing us to switch bandwidth */
|
|
opus_int opusCanSwitch;
|
|
|
|
/* I: Make frames as independent as possible (but still use LPC) */
|
|
opus_int reducedDependency;
|
|
|
|
/* O: Internal sampling rate used, in Hertz; 8000/12000/16000 */
|
|
opus_int32 internalSampleRate;
|
|
|
|
/* O: Flag that bandwidth switching is allowed (because low voice activity) */
|
|
opus_int allowBandwidthSwitch;
|
|
|
|
/* O: Flag that SILK runs in WB mode without variable LP filter (use for switching between WB/SWB/FB) */
|
|
opus_int inWBmodeWithoutVariableLP;
|
|
|
|
/* O: Stereo width */
|
|
opus_int stereoWidth_Q14;
|
|
|
|
/* O: Tells the Opus encoder we're ready to switch */
|
|
opus_int switchReady;
|
|
|
|
/* O: SILK Signal type */
|
|
opus_int signalType;
|
|
|
|
/* O: SILK offset (dithering) */
|
|
opus_int offset;
|
|
} silk_EncControlStruct;
|
|
|
|
/**************************************************************************/
|
|
/* Structure for controlling decoder operation and reading decoder status */
|
|
/**************************************************************************/
|
|
typedef struct {
|
|
/* I: Number of channels; 1/2 */
|
|
opus_int32 nChannelsAPI;
|
|
|
|
/* I: Number of channels; 1/2 */
|
|
opus_int32 nChannelsInternal;
|
|
|
|
/* I: Output signal sampling rate in Hertz; 8000/12000/16000/24000/32000/44100/48000 */
|
|
opus_int32 API_sampleRate;
|
|
|
|
/* I: Internal sampling rate used, in Hertz; 8000/12000/16000 */
|
|
opus_int32 internalSampleRate;
|
|
|
|
/* I: Number of samples per packet in milliseconds; 10/20/40/60 */
|
|
opus_int payloadSize_ms;
|
|
|
|
/* O: Pitch lag of previous frame (0 if unvoiced), measured in samples at 48 kHz */
|
|
opus_int prevPitchLag;
|
|
} silk_DecControlStruct;
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif
|