Add fixed_compute_best_predictor_limit_residual_intrin_sse42
I couldn't find a fixed_compute_best_predictor_wide_intrin_sse42
that was faster than plain C, but I was able to find a working
variant for this function. Execution time is halved.
diff --git a/src/libFLAC/CMakeLists.txt b/src/libFLAC/CMakeLists.txt
index f39ca97..e6c2073 100644
--- a/src/libFLAC/CMakeLists.txt
+++ b/src/libFLAC/CMakeLists.txt
@@ -43,6 +43,7 @@
fixed.c
fixed_intrin_sse2.c
fixed_intrin_ssse3.c
+ fixed_intrin_sse42.c
fixed_intrin_avx2.c
float.c
format.c
diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am
index b122a64..40e3308 100644
--- a/src/libFLAC/Makefile.am
+++ b/src/libFLAC/Makefile.am
@@ -84,6 +84,7 @@
fixed.c \
fixed_intrin_sse2.c \
fixed_intrin_ssse3.c \
+ fixed_intrin_sse42.c \
fixed_intrin_avx2.c \
float.c \
format.c \
diff --git a/src/libFLAC/fixed.c b/src/libFLAC/fixed.c
index 99f1da9..d997640 100644
--- a/src/libFLAC/fixed.c
+++ b/src/libFLAC/fixed.c
@@ -385,12 +385,12 @@
uint32_t order = 0;
int i;
- for(i = 0; i < (int)data_len; i++) {
+ for(i = -4; i < (int)data_len; i++) {
error_0 = local_abs64((FLAC__int64)data[i]);
- error_1 = (i > 0) ? local_abs64((FLAC__int64)data[i] - data[i-1]) : 0 ;
- error_2 = (i > 1) ? local_abs64((FLAC__int64)data[i] - 2 * (FLAC__int64)data[i-1] + data[i-2]) : 0;
- error_3 = (i > 2) ? local_abs64((FLAC__int64)data[i] - 3 * (FLAC__int64)data[i-1] + 3 * (FLAC__int64)data[i-2] - data[i-3]) : 0;
- error_4 = (i > 3) ? local_abs64((FLAC__int64)data[i] - 4 * (FLAC__int64)data[i-1] + 6 * (FLAC__int64)data[i-2] - 4 * (FLAC__int64)data[i-3] + data[i-4]) : 0;
+ error_1 = (i > -4) ? local_abs64((FLAC__int64)data[i] - data[i-1]) : 0 ;
+ error_2 = (i > -3) ? local_abs64((FLAC__int64)data[i] - 2 * (FLAC__int64)data[i-1] + data[i-2]) : 0;
+ error_3 = (i > -2) ? local_abs64((FLAC__int64)data[i] - 3 * (FLAC__int64)data[i-1] + 3 * (FLAC__int64)data[i-2] - data[i-3]) : 0;
+ error_4 = (i > -1) ? local_abs64((FLAC__int64)data[i] - 4 * (FLAC__int64)data[i-1] + 6 * (FLAC__int64)data[i-2] - 4 * (FLAC__int64)data[i-3] + data[i-4]) : 0;
total_error_0 += error_0;
total_error_1 += error_1;
@@ -432,12 +432,12 @@
uint32_t order = 0;
int i;
- for(i = 0; i < (int)data_len; i++) {
+ for(i = -4; i < (int)data_len; i++) {
error_0 = local_abs64(data[i]);
- error_1 = (i > 0) ? local_abs64(data[i] - data[i-1]) : 0 ;
- error_2 = (i > 1) ? local_abs64(data[i] - 2 * data[i-1] + data[i-2]) : 0;
- error_3 = (i > 2) ? local_abs64(data[i] - 3 * data[i-1] + 3 * data[i-2] - data[i-3]) : 0;
- error_4 = (i > 3) ? local_abs64(data[i] - 4 * data[i-1] + 6 * data[i-2] - 4 * data[i-3] + data[i-4]) : 0;
+ error_1 = (i > -4) ? local_abs64(data[i] - data[i-1]) : 0 ;
+ error_2 = (i > -3) ? local_abs64(data[i] - 2 * data[i-1] + data[i-2]) : 0;
+ error_3 = (i > -2) ? local_abs64(data[i] - 3 * data[i-1] + 3 * data[i-2] - data[i-3]) : 0;
+ error_4 = (i > -1) ? local_abs64(data[i] - 4 * data[i-1] + 6 * data[i-2] - 4 * data[i-3] + data[i-4]) : 0;
total_error_0 += error_0;
total_error_1 += error_1;
diff --git a/src/libFLAC/fixed_intrin_sse42.c b/src/libFLAC/fixed_intrin_sse42.c
new file mode 100644
index 0000000..6be407e
--- /dev/null
+++ b/src/libFLAC/fixed_intrin_sse42.c
@@ -0,0 +1,223 @@
+/* libFLAC - Free Lossless Audio Codec library
+ * Copyright (C) 2000-2009 Josh Coalson
+ * Copyright (C) 2011-2022 Xiph.Org Foundation
+ *
+ * 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 the Xiph.org Foundation nor the names of its
+ * 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 FOUNDATION 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 "private/cpu.h"
+
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
+#ifndef FLAC__NO_ASM
+#if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && FLAC__HAS_X86INTRIN
+#include "private/fixed.h"
+#ifdef FLAC__SSE4_2_SUPPORTED
+
+#include <nmmintrin.h> /* SSE4.2 */
+#include <math.h>
+#include "private/macros.h"
+#include "share/compat.h"
+#include "FLAC/assert.h"
+
+#ifdef local_abs64
+#undef local_abs64
+#endif
+#define local_abs64(x) ((uint64_t)((x)<0? -(x) : (x)))
+
+#define CHECK_ORDER_IS_VALID(macro_order) \
+if(shadow_error_##macro_order <= INT32_MAX) { \
+ if(total_error_##macro_order < smallest_error) { \
+ order = macro_order; \
+ smallest_error = total_error_##macro_order ; \
+ } \
+ residual_bits_per_sample[ macro_order ] = (float)((total_error_0 > 0) ? log(M_LN2 * (double)total_error_0 / (double)data_len) / M_LN2 : 0.0); \
+} \
+else \
+ residual_bits_per_sample[ macro_order ] = 34.0f;
+
+FLAC__SSE_TARGET("sse4.2")
+uint32_t FLAC__fixed_compute_best_predictor_limit_residual_intrin_sse42(const FLAC__int32 data[], uint32_t data_len, float residual_bits_per_sample[FLAC__MAX_FIXED_ORDER + 1])
+{
+ FLAC__uint64 total_error_0 = 0, total_error_1 = 0, total_error_2 = 0, total_error_3 = 0, total_error_4 = 0, smallest_error = UINT64_MAX;
+ FLAC__uint64 shadow_error_0 = 0, shadow_error_1 = 0, shadow_error_2 = 0, shadow_error_3 = 0, shadow_error_4 = 0;
+ FLAC__uint64 error_0, error_1, error_2, error_3, error_4;
+ FLAC__int32 i, data_len_int;
+ uint32_t order = 0;
+ __m128i total_err0, total_err1, total_err2, total_err3, total_err4;
+ __m128i shadow_err0, shadow_err1, shadow_err2, shadow_err3, shadow_err4;
+ __m128i prev_err0, prev_err1, prev_err2, prev_err3;
+ __m128i tempA, tempB, bitmask;
+ FLAC__int64 data_scalar[2];
+ FLAC__int64 prev_err0_scalar[2];
+ FLAC__int64 prev_err1_scalar[2];
+ FLAC__int64 prev_err2_scalar[2];
+ FLAC__int64 prev_err3_scalar[2];
+ total_err0 = _mm_setzero_si128();
+ total_err1 = _mm_setzero_si128();
+ total_err2 = _mm_setzero_si128();
+ total_err3 = _mm_setzero_si128();
+ total_err4 = _mm_setzero_si128();
+ shadow_err0 = _mm_setzero_si128();
+ shadow_err1 = _mm_setzero_si128();
+ shadow_err2 = _mm_setzero_si128();
+ shadow_err3 = _mm_setzero_si128();
+ shadow_err4 = _mm_setzero_si128();
+ data_len_int = data_len;
+
+ /* First take care of preceding samples */
+ for(i = -4; i < 0; i++) {
+ error_0 = local_abs64((FLAC__int64)data[i]);
+ error_1 = (i > -4) ? local_abs64((FLAC__int64)data[i] - data[i-1]) : 0 ;
+ error_2 = (i > -3) ? local_abs64((FLAC__int64)data[i] - 2 * (FLAC__int64)data[i-1] + data[i-2]) : 0;
+ error_3 = (i > -2) ? local_abs64((FLAC__int64)data[i] - 3 * (FLAC__int64)data[i-1] + 3 * (FLAC__int64)data[i-2] - data[i-3]) : 0;
+
+ total_error_0 += error_0;
+ total_error_1 += error_1;
+ total_error_2 += error_2;
+ total_error_3 += error_3;
+
+ shadow_error_0 |= error_0;
+ shadow_error_1 |= error_1;
+ shadow_error_2 |= error_2;
+ shadow_error_3 |= error_3;
+ }
+
+ for(i = 0; i < 2; i++){
+ prev_err0_scalar[i] = data[-1+i*(data_len_int/2)];
+ prev_err1_scalar[i] = (FLAC__int64)(data[-1+i*(data_len_int/2)]) - data[-2+i*(data_len_int/2)];
+ prev_err2_scalar[i] = prev_err1_scalar[i] - ((FLAC__int64)(data[-2+i*(data_len_int/2)]) - data[-3+i*(data_len_int/2)]);
+ prev_err3_scalar[i] = prev_err2_scalar[i] - ((FLAC__int64)(data[-2+i*(data_len_int/2)]) - 2*(FLAC__int64)(data[-3+i*(data_len_int/2)]) + data[-4+i*(data_len_int/2)]);
+ }
+ prev_err0 = _mm_loadu_si128((const __m128i*)prev_err0_scalar);
+ prev_err1 = _mm_loadu_si128((const __m128i*)prev_err1_scalar);
+ prev_err2 = _mm_loadu_si128((const __m128i*)prev_err2_scalar);
+ prev_err3 = _mm_loadu_si128((const __m128i*)prev_err3_scalar);
+ for(i = 0; i < data_len_int / 2; i++){
+ data_scalar[0] = data[i];
+ data_scalar[1] = data[i+data_len/2];
+ tempA = _mm_loadu_si128((const __m128i*)data_scalar);
+ /* Next three intrinsics calculate tempB as abs of tempA */
+ bitmask = _mm_cmpgt_epi64(_mm_set1_epi64x(0), tempA);
+ tempB = _mm_xor_si128(tempA, bitmask);
+ tempB = _mm_sub_epi64(tempB, bitmask);
+ total_err0 = _mm_add_epi64(total_err0,tempB);
+ shadow_err0 = _mm_xor_si128(shadow_err0,tempB);
+ tempB = _mm_sub_epi64(tempA,prev_err0);
+ prev_err0 = tempA;
+ /* Next three intrinsics calculate tempA as abs of tempB */
+ bitmask = _mm_cmpgt_epi64(_mm_set1_epi64x(0), tempB);
+ tempA = _mm_xor_si128(tempB, bitmask);
+ tempA = _mm_sub_epi64(tempA, bitmask);
+ total_err1 = _mm_add_epi64(total_err1,tempA);
+ shadow_err1 = _mm_xor_si128(shadow_err1,tempA);
+ tempA = _mm_sub_epi64(tempB,prev_err1);
+ prev_err1 = tempB;
+ /* Next three intrinsics calculate tempB as abs of tempA */
+ bitmask = _mm_cmpgt_epi64(_mm_set1_epi64x(0), tempA);
+ tempB = _mm_xor_si128(tempA, bitmask);
+ tempB = _mm_sub_epi64(tempB, bitmask);
+ total_err2 = _mm_add_epi64(total_err2,tempB);
+ shadow_err2 = _mm_xor_si128(shadow_err2,tempB);
+ tempB = _mm_sub_epi64(tempA,prev_err2);
+ prev_err2 = tempA;
+ /* Next three intrinsics calculate tempA as abs of tempB */
+ bitmask = _mm_cmpgt_epi64(_mm_set1_epi64x(0), tempB);
+ tempA = _mm_xor_si128(tempB, bitmask);
+ tempA = _mm_sub_epi64(tempA, bitmask);
+ total_err3 = _mm_add_epi64(total_err3,tempA);
+ shadow_err3 = _mm_xor_si128(shadow_err3,tempA);
+ tempA = _mm_sub_epi64(tempB,prev_err3);
+ prev_err3 = tempB;
+ /* Next three intrinsics calculate tempB as abs of tempA */
+ bitmask = _mm_cmpgt_epi64(_mm_set1_epi64x(0), tempA);
+ tempB = _mm_xor_si128(tempA, bitmask);
+ tempB = _mm_sub_epi64(tempB, bitmask);
+ total_err4 = _mm_add_epi64(total_err4,tempB);
+ shadow_err4 = _mm_xor_si128(shadow_err4,tempB);
+ }
+ _mm_storeu_si128((__m128i*)data_scalar,total_err0);
+ total_error_0 += data_scalar[0] + data_scalar[1];
+ _mm_storeu_si128((__m128i*)data_scalar,total_err1);
+ total_error_1 += data_scalar[0] + data_scalar[1];
+ _mm_storeu_si128((__m128i*)data_scalar,total_err2);
+ total_error_2 += data_scalar[0] + data_scalar[1];
+ _mm_storeu_si128((__m128i*)data_scalar,total_err3);
+ total_error_3 += data_scalar[0] + data_scalar[1];
+ _mm_storeu_si128((__m128i*)data_scalar,total_err4);
+ total_error_4 += data_scalar[0] + data_scalar[1];
+ _mm_storeu_si128((__m128i*)data_scalar,shadow_err0);
+ shadow_error_0 += data_scalar[0] | data_scalar[1];
+ _mm_storeu_si128((__m128i*)data_scalar,shadow_err1);
+ shadow_error_1 += data_scalar[0] | data_scalar[1];
+ _mm_storeu_si128((__m128i*)data_scalar,shadow_err2);
+ shadow_error_2 += data_scalar[0] | data_scalar[1];
+ _mm_storeu_si128((__m128i*)data_scalar,shadow_err3);
+ shadow_error_3 += data_scalar[0] | data_scalar[1];
+ _mm_storeu_si128((__m128i*)data_scalar,shadow_err4);
+ shadow_error_4 += data_scalar[0] | data_scalar[1];
+
+ /* Take care of remaining sample */
+ if(data_len_int % 2 > 0) {
+ i += data_len/2;
+ error_0 = local_abs64((FLAC__int64)data[i]);
+ error_1 = local_abs64((FLAC__int64)data[i] - data[i-1]);
+ error_2 = local_abs64((FLAC__int64)data[i] - 2 * (FLAC__int64)data[i-1] + data[i-2]);
+ error_3 = local_abs64((FLAC__int64)data[i] - 3 * (FLAC__int64)data[i-1] + 3 * (FLAC__int64)data[i-2] - data[i-3]);
+ error_4 = local_abs64((FLAC__int64)data[i] - 4 * (FLAC__int64)data[i-1] + 6 * (FLAC__int64)data[i-2] - 4 * (FLAC__int64)data[i-3] + data[i-4]);
+
+ total_error_0 += error_0;
+ total_error_1 += error_1;
+ total_error_2 += error_2;
+ total_error_3 += error_3;
+ total_error_4 += error_4;
+
+ shadow_error_0 |= error_0;
+ shadow_error_1 |= error_1;
+ shadow_error_2 |= error_2;
+ shadow_error_3 |= error_3;
+ shadow_error_4 |= error_4;
+ }
+
+
+ CHECK_ORDER_IS_VALID(0);
+ CHECK_ORDER_IS_VALID(1);
+ CHECK_ORDER_IS_VALID(2);
+ CHECK_ORDER_IS_VALID(3);
+ CHECK_ORDER_IS_VALID(4);
+
+ return order;
+}
+
+#endif /* FLAC__SSE4_2_SUPPORTED */
+#endif /* (FLAC__CPU_IA32 || FLAC__CPU_X86_64) && FLAC__HAS_X86INTRIN */
+#endif /* FLAC__NO_ASM */
+#endif /* FLAC__INTEGER_ONLY_LIBRARY */
diff --git a/src/libFLAC/include/private/cpu.h b/src/libFLAC/include/private/cpu.h
index 5a76a75..1e444c0 100644
--- a/src/libFLAC/include/private/cpu.h
+++ b/src/libFLAC/include/private/cpu.h
@@ -68,6 +68,7 @@
#if (__INTEL_COMPILER >= 1000) /* Intel C++ Compiler 10.0 */
#define FLAC__SSSE3_SUPPORTED 1
#define FLAC__SSE4_1_SUPPORTED 1
+ #define FLAC__SSE4_2_SUPPORTED 1
#endif
#ifdef FLAC__USE_AVX
#if (__INTEL_COMPILER >= 1110) /* Intel C++ Compiler 11.1 */
@@ -84,6 +85,7 @@
#define FLAC__SSE2_SUPPORTED 1
#define FLAC__SSSE3_SUPPORTED 1
#define FLAC__SSE4_1_SUPPORTED 1
+ #define FLAC__SSE4_2_SUPPORTED 1
#ifdef FLAC__USE_AVX
#define FLAC__AVX_SUPPORTED 1
#define FLAC__AVX2_SUPPORTED 1
@@ -95,6 +97,7 @@
#define FLAC__SSE2_SUPPORTED 1
#define FLAC__SSSE3_SUPPORTED 1
#define FLAC__SSE4_1_SUPPORTED 1
+ #define FLAC__SSE4_2_SUPPORTED 1
#ifdef FLAC__USE_AVX
#define FLAC__AVX_SUPPORTED 1
#define FLAC__AVX2_SUPPORTED 1
@@ -107,6 +110,7 @@
#if (_MSC_VER >= 1500) /* MS Visual Studio 2008 */
#define FLAC__SSSE3_SUPPORTED 1
#define FLAC__SSE4_1_SUPPORTED 1
+ #define FLAC__SSE4_2_SUPPORTED 1
#endif
#ifdef FLAC__USE_AVX
#if (_MSC_FULL_VER >= 160040219) /* MS Visual Studio 2010 SP1 */
@@ -131,6 +135,9 @@
#ifdef __SSE4_1__
#define FLAC__SSE4_1_SUPPORTED 1
#endif
+ #ifdef __SSE4_2__
+ #define FLAC__SSE4_2_SUPPORTED 1
+ #endif
#ifdef FLAC__USE_AVX
#ifdef __AVX__
#define FLAC__AVX_SUPPORTED 1
diff --git a/src/libFLAC/include/private/fixed.h b/src/libFLAC/include/private/fixed.h
index 366dc75..c83ad56 100644
--- a/src/libFLAC/include/private/fixed.h
+++ b/src/libFLAC/include/private/fixed.h
@@ -66,6 +66,9 @@
# ifdef FLAC__SSSE3_SUPPORTED
uint32_t FLAC__fixed_compute_best_predictor_intrin_ssse3(const FLAC__int32 data[], uint32_t data_len, float residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1]);
# endif
+# ifdef FLAC__SSE4_2_SUPPORTED
+uint32_t FLAC__fixed_compute_best_predictor_limit_residual_intrin_sse42(const FLAC__int32 data[], uint32_t data_len, float residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1]);
+# endif
# ifdef FLAC__AVX2_SUPPORTED
uint32_t FLAC__fixed_compute_best_predictor_wide_intrin_avx2(const FLAC__int32 data[], uint32_t data_len, float residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1]);
# endif
diff --git a/src/libFLAC/stream_encoder.c b/src/libFLAC/stream_encoder.c
index 8abfcdd..934efe6 100644
--- a/src/libFLAC/stream_encoder.c
+++ b/src/libFLAC/stream_encoder.c
@@ -375,9 +375,10 @@
#ifndef FLAC__INTEGER_ONLY_LIBRARY
uint32_t (*local_fixed_compute_best_predictor)(const FLAC__int32 data[], uint32_t data_len, float residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1]);
uint32_t (*local_fixed_compute_best_predictor_wide)(const FLAC__int32 data[], uint32_t data_len, float residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1]);
+ uint32_t (*local_fixed_compute_best_predictor_limit_residual)(const FLAC__int32 data[], uint32_t data_len, float residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1]);
#else
uint32_t (*local_fixed_compute_best_predictor)(const FLAC__int32 data[], uint32_t data_len, FLAC__fixedpoint residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1]);
- uint32_t (*local_fixed_compute_best_predictor_wide)(const FLAC__int32 data[], uint32_t data_len, FLAC__fixedpoint residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1]);
+ uint32_t (*local_fixed_compute_best_predictor_limit_residual)(const FLAC__int32 data[], uint32_t data_len, FLAC__fixedpoint residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1]);
#endif
#ifndef FLAC__INTEGER_ONLY_LIBRARY
void (*local_lpc_compute_autocorrelation)(const FLAC__real data[], uint32_t data_len, uint32_t lag, double autoc[]);
@@ -389,6 +390,7 @@
FLAC__bool disable_sse2;
FLAC__bool disable_ssse3;
FLAC__bool disable_sse41;
+ FLAC__bool disable_sse42;
FLAC__bool disable_avx2;
FLAC__bool disable_fma;
FLAC__bool disable_constant_subframes;
@@ -918,6 +920,8 @@
encoder->private_->cpuinfo.x86.ssse3 = false;
if(encoder->private_->disable_sse41)
encoder->private_->cpuinfo.x86.sse41 = false;
+ if(encoder->private_->disable_sse42)
+ encoder->private_->cpuinfo.x86.sse42 = false;
if(encoder->private_->disable_avx2)
encoder->private_->cpuinfo.x86.avx2 = false;
if(encoder->private_->disable_fma)
@@ -929,6 +933,7 @@
encoder->private_->local_precompute_partition_info_sums = precompute_partition_info_sums_;
encoder->private_->local_fixed_compute_best_predictor = FLAC__fixed_compute_best_predictor;
encoder->private_->local_fixed_compute_best_predictor_wide = FLAC__fixed_compute_best_predictor_wide;
+ encoder->private_->local_fixed_compute_best_predictor_limit_residual = FLAC__fixed_compute_best_predictor_limit_residual;
#ifndef FLAC__INTEGER_ONLY_LIBRARY
encoder->private_->local_lpc_compute_residual_from_qlp_coefficients = FLAC__lpc_compute_residual_from_qlp_coefficients;
encoder->private_->local_lpc_compute_residual_from_qlp_coefficients_64bit = FLAC__lpc_compute_residual_from_qlp_coefficients_wide;
@@ -994,6 +999,11 @@
encoder->private_->local_fixed_compute_best_predictor = FLAC__fixed_compute_best_predictor_intrin_ssse3;
}
# endif
+# ifdef FLAC__SSE4_2_SUPPORTED
+ if (encoder->private_->cpuinfo.x86.sse42) {
+ encoder->private_->local_fixed_compute_best_predictor_limit_residual = FLAC__fixed_compute_best_predictor_limit_residual_intrin_sse42;
+ }
+# endif
# ifdef FLAC__AVX2_SUPPORTED
if (encoder->private_->cpuinfo.x86.avx2) {
encoder->private_->local_fixed_compute_best_predictor_wide = FLAC__fixed_compute_best_predictor_wide_intrin_avx2;
@@ -1049,6 +1059,12 @@
encoder->private_->local_fixed_compute_best_predictor = FLAC__fixed_compute_best_predictor_intrin_ssse3;
}
# endif
+# ifdef FLAC__SSE4_2_SUPPORTED
+ if (encoder->private_->cpuinfo.x86.sse42) {
+ encoder->private_->local_fixed_compute_best_predictor_limit_residual = FLAC__fixed_compute_best_predictor_limit_residual_intrin_sse42;
+
+ }
+# endif
# ifdef FLAC__AVX2_SUPPORTED
if (encoder->private_->cpuinfo.x86.avx2) {
encoder->private_->local_fixed_compute_best_predictor_wide = FLAC__fixed_compute_best_predictor_wide_intrin_avx2;
@@ -1989,6 +2005,7 @@
encoder->private_->disable_sse41 = value & 8;
encoder->private_->disable_avx2 = value & 16;
encoder->private_->disable_fma = value & 32;
+ encoder->private_->disable_sse42 = value & 64;
return true;
}
@@ -2447,6 +2464,7 @@
encoder->private_->disable_sse2 = false;
encoder->private_->disable_ssse3 = false;
encoder->private_->disable_sse41 = false;
+ encoder->private_->disable_sse42 = false;
encoder->private_->disable_avx2 = false;
encoder->private_->disable_constant_subframes = false;
encoder->private_->disable_fixed_subframes = false;
@@ -3537,9 +3555,9 @@
}
else
if(subframe_bps <= 32)
- guess_fixed_order = FLAC__fixed_compute_best_predictor_limit_residual(((FLAC__int32 *)integer_signal),frame_header->blocksize, fixed_residual_bits_per_sample);
+ guess_fixed_order = encoder->private_->local_fixed_compute_best_predictor_limit_residual(((FLAC__int32 *)integer_signal+FLAC__MAX_FIXED_ORDER),frame_header->blocksize-FLAC__MAX_FIXED_ORDER, fixed_residual_bits_per_sample);
else
- guess_fixed_order = FLAC__fixed_compute_best_predictor_limit_residual_33bit(((FLAC__int64 *)integer_signal),frame_header->blocksize, fixed_residual_bits_per_sample);
+ guess_fixed_order = FLAC__fixed_compute_best_predictor_limit_residual_33bit(((FLAC__int64 *)integer_signal+FLAC__MAX_FIXED_ORDER),frame_header->blocksize-FLAC__MAX_FIXED_ORDER, fixed_residual_bits_per_sample);
/* check for constant subframe */
if(
