diff options
| author | Martijn van Beurden <mvanb1@gmail.com> | 2024-05-01 17:03:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-01 17:03:19 +0200 |
| commit | de8034929755c47084aef85577fd92eb5ebb9181 (patch) | |
| tree | 0ec0ecd4c5072f3662a0ae210ea612fd0ca0976d | |
| parent | 653b1187a11c0d8b4a6e8033ce276d94173fa149 (diff) | |
| download | flac-de8034929755c47084aef85577fd92eb5ebb9181.tar.gz | |
Fix bug in CHECK_ORDER_IS_VALID macro in functions with intrinsics (#696)
This fixes a few things I missed with https://github.com/xiph/flac/pull/694
| -rw-r--r-- | src/libFLAC/fixed_intrin_avx2.c | 2 | ||||
| -rw-r--r-- | src/libFLAC/fixed_intrin_sse42.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libFLAC/fixed_intrin_avx2.c b/src/libFLAC/fixed_intrin_avx2.c index 85fc4a6d..8522aef5 100644 --- a/src/libFLAC/fixed_intrin_avx2.c +++ b/src/libFLAC/fixed_intrin_avx2.c @@ -178,7 +178,7 @@ if(shadow_error_##macro_order <= INT32_MAX) { \ 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); \ + residual_bits_per_sample[ macro_order ] = (float)((total_error_##macro_order > 0) ? log(M_LN2 * (double)total_error_##macro_order / (double)data_len) / M_LN2 : 0.0); \ } \ else \ residual_bits_per_sample[ macro_order ] = 34.0f; diff --git a/src/libFLAC/fixed_intrin_sse42.c b/src/libFLAC/fixed_intrin_sse42.c index 0556eaad..4fddf91f 100644 --- a/src/libFLAC/fixed_intrin_sse42.c +++ b/src/libFLAC/fixed_intrin_sse42.c @@ -59,7 +59,7 @@ if(shadow_error_##macro_order <= INT32_MAX) { \ 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); \ + residual_bits_per_sample[ macro_order ] = (float)((total_error_##macro_order > 0) ? log(M_LN2 * (double)total_error_##macro_order / (double)data_len) / M_LN2 : 0.0); \ } \ else \ residual_bits_per_sample[ macro_order ] = 34.0f; |