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>
132 lines
7.0 KiB
C
132 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.
|
|
***********************************************************************/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#include "main.h"
|
|
|
|
/* Entropy constrained matrix-weighted VQ, hard-coded to 5-element vectors, for a single input data vector */
|
|
void silk_VQ_WMat_EC_c(
|
|
opus_int8 *ind, /* O index of best codebook vector */
|
|
opus_int32 *res_nrg_Q15, /* O best residual energy */
|
|
opus_int32 *rate_dist_Q8, /* O best total bitrate */
|
|
opus_int *gain_Q7, /* O sum of absolute LTP coefficients */
|
|
const opus_int32 *XX_Q17, /* I correlation matrix */
|
|
const opus_int32 *xX_Q17, /* I correlation vector */
|
|
const opus_int8 *cb_Q7, /* I codebook */
|
|
const opus_uint8 *cb_gain_Q7, /* I codebook effective gain */
|
|
const opus_uint8 *cl_Q5, /* I code length for each codebook vector */
|
|
const opus_int subfr_len, /* I number of samples per subframe */
|
|
const opus_int32 max_gain_Q7, /* I maximum sum of absolute LTP coefficients */
|
|
const opus_int L /* I number of vectors in codebook */
|
|
)
|
|
{
|
|
opus_int k, gain_tmp_Q7;
|
|
const opus_int8 *cb_row_Q7;
|
|
opus_int32 neg_xX_Q24[ 5 ];
|
|
opus_int32 sum1_Q15, sum2_Q24;
|
|
opus_int32 bits_res_Q8, bits_tot_Q8;
|
|
|
|
/* Negate and convert to new Q domain */
|
|
neg_xX_Q24[ 0 ] = -silk_LSHIFT32( xX_Q17[ 0 ], 7 );
|
|
neg_xX_Q24[ 1 ] = -silk_LSHIFT32( xX_Q17[ 1 ], 7 );
|
|
neg_xX_Q24[ 2 ] = -silk_LSHIFT32( xX_Q17[ 2 ], 7 );
|
|
neg_xX_Q24[ 3 ] = -silk_LSHIFT32( xX_Q17[ 3 ], 7 );
|
|
neg_xX_Q24[ 4 ] = -silk_LSHIFT32( xX_Q17[ 4 ], 7 );
|
|
|
|
/* Loop over codebook */
|
|
*rate_dist_Q8 = silk_int32_MAX;
|
|
*res_nrg_Q15 = silk_int32_MAX;
|
|
cb_row_Q7 = cb_Q7;
|
|
/* In things go really bad, at least *ind is set to something safe. */
|
|
*ind = 0;
|
|
for( k = 0; k < L; k++ ) {
|
|
opus_int32 penalty;
|
|
gain_tmp_Q7 = cb_gain_Q7[k];
|
|
/* Weighted rate */
|
|
/* Quantization error: 1 - 2 * xX * cb + cb' * XX * cb */
|
|
sum1_Q15 = SILK_FIX_CONST( 1.001, 15 );
|
|
|
|
/* Penalty for too large gain */
|
|
penalty = silk_LSHIFT32( silk_max( silk_SUB32( gain_tmp_Q7, max_gain_Q7 ), 0 ), 11 );
|
|
|
|
/* first row of XX_Q17 */
|
|
sum2_Q24 = silk_MLA( neg_xX_Q24[ 0 ], XX_Q17[ 1 ], cb_row_Q7[ 1 ] );
|
|
sum2_Q24 = silk_MLA( sum2_Q24, XX_Q17[ 2 ], cb_row_Q7[ 2 ] );
|
|
sum2_Q24 = silk_MLA( sum2_Q24, XX_Q17[ 3 ], cb_row_Q7[ 3 ] );
|
|
sum2_Q24 = silk_MLA( sum2_Q24, XX_Q17[ 4 ], cb_row_Q7[ 4 ] );
|
|
sum2_Q24 = silk_LSHIFT32( sum2_Q24, 1 );
|
|
sum2_Q24 = silk_MLA( sum2_Q24, XX_Q17[ 0 ], cb_row_Q7[ 0 ] );
|
|
sum1_Q15 = silk_SMLAWB( sum1_Q15, sum2_Q24, cb_row_Q7[ 0 ] );
|
|
|
|
/* second row of XX_Q17 */
|
|
sum2_Q24 = silk_MLA( neg_xX_Q24[ 1 ], XX_Q17[ 7 ], cb_row_Q7[ 2 ] );
|
|
sum2_Q24 = silk_MLA( sum2_Q24, XX_Q17[ 8 ], cb_row_Q7[ 3 ] );
|
|
sum2_Q24 = silk_MLA( sum2_Q24, XX_Q17[ 9 ], cb_row_Q7[ 4 ] );
|
|
sum2_Q24 = silk_LSHIFT32( sum2_Q24, 1 );
|
|
sum2_Q24 = silk_MLA( sum2_Q24, XX_Q17[ 6 ], cb_row_Q7[ 1 ] );
|
|
sum1_Q15 = silk_SMLAWB( sum1_Q15, sum2_Q24, cb_row_Q7[ 1 ] );
|
|
|
|
/* third row of XX_Q17 */
|
|
sum2_Q24 = silk_MLA( neg_xX_Q24[ 2 ], XX_Q17[ 13 ], cb_row_Q7[ 3 ] );
|
|
sum2_Q24 = silk_MLA( sum2_Q24, XX_Q17[ 14 ], cb_row_Q7[ 4 ] );
|
|
sum2_Q24 = silk_LSHIFT32( sum2_Q24, 1 );
|
|
sum2_Q24 = silk_MLA( sum2_Q24, XX_Q17[ 12 ], cb_row_Q7[ 2 ] );
|
|
sum1_Q15 = silk_SMLAWB( sum1_Q15, sum2_Q24, cb_row_Q7[ 2 ] );
|
|
|
|
/* fourth row of XX_Q17 */
|
|
sum2_Q24 = silk_MLA( neg_xX_Q24[ 3 ], XX_Q17[ 19 ], cb_row_Q7[ 4 ] );
|
|
sum2_Q24 = silk_LSHIFT32( sum2_Q24, 1 );
|
|
sum2_Q24 = silk_MLA( sum2_Q24, XX_Q17[ 18 ], cb_row_Q7[ 3 ] );
|
|
sum1_Q15 = silk_SMLAWB( sum1_Q15, sum2_Q24, cb_row_Q7[ 3 ] );
|
|
|
|
/* last row of XX_Q17 */
|
|
sum2_Q24 = silk_LSHIFT32( neg_xX_Q24[ 4 ], 1 );
|
|
sum2_Q24 = silk_MLA( sum2_Q24, XX_Q17[ 24 ], cb_row_Q7[ 4 ] );
|
|
sum1_Q15 = silk_SMLAWB( sum1_Q15, sum2_Q24, cb_row_Q7[ 4 ] );
|
|
|
|
/* find best */
|
|
if( sum1_Q15 >= 0 ) {
|
|
/* Translate residual energy to bits using high-rate assumption (6 dB ==> 1 bit/sample) */
|
|
bits_res_Q8 = silk_SMULBB( subfr_len, silk_lin2log( sum1_Q15 + penalty) - (15 << 7) );
|
|
/* In the following line we reduce the codelength component by half ("-1"); seems to slghtly improve quality */
|
|
bits_tot_Q8 = silk_ADD_LSHIFT32( bits_res_Q8, cl_Q5[ k ], 3-1 );
|
|
if( bits_tot_Q8 <= *rate_dist_Q8 ) {
|
|
*rate_dist_Q8 = bits_tot_Q8;
|
|
*res_nrg_Q15 = sum1_Q15 + penalty;
|
|
*ind = (opus_int8)k;
|
|
*gain_Q7 = gain_tmp_Q7;
|
|
}
|
|
}
|
|
|
|
/* Go to next cbk vector */
|
|
cb_row_Q7 += LTP_ORDER;
|
|
}
|
|
}
|