mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 05:06:43 +00:00
xbmc: add PR2748
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue
parent
804e2f52c4
commit
8caa619554
295
packages/mediacenter/xbmc/patches/12.2.0/xbmc-990.15-PR2748.patch
vendored
Normal file
295
packages/mediacenter/xbmc/patches/12.2.0/xbmc-990.15-PR2748.patch
vendored
Normal file
@ -0,0 +1,295 @@
|
|||||||
|
From 4a61baea4a936089b589f0b7a834aa180a1017ea Mon Sep 17 00:00:00 2001
|
||||||
|
From: Bob van Loosen <bob.loosen@gmail.com>
|
||||||
|
Date: Tue, 14 May 2013 12:28:45 +0200
|
||||||
|
Subject: [PATCH 1/2] fixed: when doing a format conversion from float to 32
|
||||||
|
bit int, multiply with INT32_MAX - 127, since this is the maximum value that
|
||||||
|
can be stored in 32 bit float and int, if INT32_MAX gets converted to float,
|
||||||
|
it gets rounded to INT32_MAX + 1 which can cause wrap around distortion
|
||||||
|
|
||||||
|
---
|
||||||
|
xbmc/cores/AudioEngine/Utils/AEConvert.cpp | 32 +++++++++++++++++-------------
|
||||||
|
1 file changed, 18 insertions(+), 14 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/xbmc/cores/AudioEngine/Utils/AEConvert.cpp b/xbmc/cores/AudioEngine/Utils/AEConvert.cpp
|
||||||
|
index 97ec87b..5f0af63 100644
|
||||||
|
--- a/xbmc/cores/AudioEngine/Utils/AEConvert.cpp
|
||||||
|
+++ b/xbmc/cores/AudioEngine/Utils/AEConvert.cpp
|
||||||
|
@@ -922,17 +922,21 @@ unsigned int CAEConvert::Float_S24NE3(float *data, const unsigned int samples, u
|
||||||
|
return samples * 3;
|
||||||
|
}
|
||||||
|
|
||||||
|
+//float can't store INT32_MAX, it gets rounded up to INT32_MAX + 1
|
||||||
|
+//INT32_MAX - 127 is the maximum value that can exactly be stored in both 32 bit float and int
|
||||||
|
+#define MUL32 ((float)(INT32_MAX - 127))
|
||||||
|
+
|
||||||
|
unsigned int CAEConvert::Float_S32LE(float *data, const unsigned int samples, uint8_t *dest)
|
||||||
|
{
|
||||||
|
int32_t *dst = (int32_t*)dest;
|
||||||
|
#ifdef __SSE__
|
||||||
|
- const __m128 mul = _mm_set_ps1((float)INT32_MAX);
|
||||||
|
+ const __m128 mul = _mm_set_ps1(MUL32);
|
||||||
|
unsigned int count = samples;
|
||||||
|
|
||||||
|
/* work around invalid alignment */
|
||||||
|
while ((((uintptr_t)data & 0xF) || ((uintptr_t)dest & 0xF)) && count > 0)
|
||||||
|
{
|
||||||
|
- dst[0] = safeRound(data[0] * (float)INT32_MAX);
|
||||||
|
+ dst[0] = safeRound(data[0] * MUL32);
|
||||||
|
++data;
|
||||||
|
++dst;
|
||||||
|
--count;
|
||||||
|
@@ -955,7 +959,7 @@ unsigned int CAEConvert::Float_S32LE(float *data, const unsigned int samples, ui
|
||||||
|
const uint32_t odd = samples - even;
|
||||||
|
if (odd == 1)
|
||||||
|
{
|
||||||
|
- dst[0] = safeRound(data[0] * (float)INT32_MAX);
|
||||||
|
+ dst[0] = safeRound(data[0] * MUL32);
|
||||||
|
dst[0] = Endian_SwapLE32(dst[0]);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
@@ -988,7 +992,7 @@ unsigned int CAEConvert::Float_S32LE(float *data, const unsigned int samples, ui
|
||||||
|
/* no SIMD */
|
||||||
|
for (uint32_t i = 0; i < samples; ++i, ++data, ++dst)
|
||||||
|
{
|
||||||
|
- dst[0] = safeRound(data[0] * (float)INT32_MAX);
|
||||||
|
+ dst[0] = safeRound(data[0] * MUL32);
|
||||||
|
dst[0] = Endian_SwapLE32(dst[0]);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
@@ -1002,7 +1006,7 @@ unsigned int CAEConvert::Float_S32LE_Neon(float *data, const unsigned int sample
|
||||||
|
int32_t *dst = (int32_t*)dest;
|
||||||
|
for (float *end = data + (samples & ~0x3); data < end; data += 4, dst += 4)
|
||||||
|
{
|
||||||
|
- float32x4_t val = vmulq_n_f32(vld1q_f32((const float32_t *)data), INT32_MAX);
|
||||||
|
+ float32x4_t val = vmulq_n_f32(vld1q_f32((const float32_t *)data), MUL32);
|
||||||
|
int32x4_t ret = vcvtq_s32_f32(val);
|
||||||
|
#ifdef __BIG_ENDIAN__
|
||||||
|
ret = vrev64q_s32(ret);
|
||||||
|
@@ -1012,7 +1016,7 @@ unsigned int CAEConvert::Float_S32LE_Neon(float *data, const unsigned int sample
|
||||||
|
|
||||||
|
if (samples & 0x2)
|
||||||
|
{
|
||||||
|
- float32x2_t val = vmul_n_f32(vld1_f32((const float32_t *)data), INT32_MAX);
|
||||||
|
+ float32x2_t val = vmul_n_f32(vld1_f32((const float32_t *)data), MUL32);
|
||||||
|
int32x2_t ret = vcvt_s32_f32(val);
|
||||||
|
#ifdef __BIG_ENDIAN__
|
||||||
|
ret = vrev64_s32(ret);
|
||||||
|
@@ -1024,7 +1028,7 @@ unsigned int CAEConvert::Float_S32LE_Neon(float *data, const unsigned int sample
|
||||||
|
|
||||||
|
if (samples & 0x1)
|
||||||
|
{
|
||||||
|
- dst[0] = safeRound(data[0] * (float)INT32_MAX);
|
||||||
|
+ dst[0] = safeRound(data[0] * MUL32);
|
||||||
|
dst[0] = Endian_SwapLE32(dst[0]);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
@@ -1035,13 +1039,13 @@ unsigned int CAEConvert::Float_S32BE(float *data, const unsigned int samples, ui
|
||||||
|
{
|
||||||
|
int32_t *dst = (int32_t*)dest;
|
||||||
|
#ifdef __SSE__
|
||||||
|
- const __m128 mul = _mm_set_ps1((float)INT32_MAX);
|
||||||
|
+ const __m128 mul = _mm_set_ps1(MUL32);
|
||||||
|
unsigned int count = samples;
|
||||||
|
|
||||||
|
/* work around invalid alignment */
|
||||||
|
while ((((uintptr_t)data & 0xF) || ((uintptr_t)dest & 0xF)) && count > 0)
|
||||||
|
{
|
||||||
|
- dst[0] = safeRound(data[0] * (float)INT32_MAX);
|
||||||
|
+ dst[0] = safeRound(data[0] * MUL32);
|
||||||
|
++data;
|
||||||
|
++dst;
|
||||||
|
--count;
|
||||||
|
@@ -1064,7 +1068,7 @@ unsigned int CAEConvert::Float_S32BE(float *data, const unsigned int samples, ui
|
||||||
|
const uint32_t odd = samples - even;
|
||||||
|
if (odd == 1)
|
||||||
|
{
|
||||||
|
- dst[0] = safeRound(data[0] * (float)INT32_MAX);
|
||||||
|
+ dst[0] = safeRound(data[0] * MUL32);
|
||||||
|
dst[0] = Endian_SwapBE32(dst[0]);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
@@ -1096,7 +1100,7 @@ unsigned int CAEConvert::Float_S32BE(float *data, const unsigned int samples, ui
|
||||||
|
/* no SIMD */
|
||||||
|
for (uint32_t i = 0; i < samples; ++i, ++data, ++dst)
|
||||||
|
{
|
||||||
|
- dst[0] = safeRound(data[0] * (float)INT32_MAX);
|
||||||
|
+ dst[0] = safeRound(data[0] * MUL32);
|
||||||
|
dst[0] = Endian_SwapBE32(dst[0]);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
@@ -1110,7 +1114,7 @@ unsigned int CAEConvert::Float_S32BE_Neon(float *data, const unsigned int sample
|
||||||
|
int32_t *dst = (int32_t*)dest;
|
||||||
|
for (float *end = data + (samples & ~0x3); data < end; data += 4, dst += 4)
|
||||||
|
{
|
||||||
|
- float32x4_t val = vmulq_n_f32(vld1q_f32((const float32_t *)data), INT32_MAX);
|
||||||
|
+ float32x4_t val = vmulq_n_f32(vld1q_f32((const float32_t *)data), MUL32);
|
||||||
|
int32x4_t ret = vcvtq_s32_f32(val);
|
||||||
|
#ifndef __BIG_ENDIAN__
|
||||||
|
ret = vrev64q_s32(ret);
|
||||||
|
@@ -1120,7 +1124,7 @@ unsigned int CAEConvert::Float_S32BE_Neon(float *data, const unsigned int sample
|
||||||
|
|
||||||
|
if (samples & 0x2)
|
||||||
|
{
|
||||||
|
- float32x2_t val = vmul_n_f32(vld1_f32((const float32_t *)data), INT32_MAX);
|
||||||
|
+ float32x2_t val = vmul_n_f32(vld1_f32((const float32_t *)data), MUL32);
|
||||||
|
int32x2_t ret = vcvt_s32_f32(val);
|
||||||
|
#ifndef __BIG_ENDIAN__
|
||||||
|
ret = vrev64_s32(ret);
|
||||||
|
@@ -1132,7 +1136,7 @@ unsigned int CAEConvert::Float_S32BE_Neon(float *data, const unsigned int sample
|
||||||
|
|
||||||
|
if (samples & 0x1)
|
||||||
|
{
|
||||||
|
- dst[0] = safeRound(data[0] * (float)INT32_MAX);
|
||||||
|
+ dst[0] = safeRound(data[0] * MUL32);
|
||||||
|
dst[0] = Endian_SwapBE32(dst[0]);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
--
|
||||||
|
1.8.1.6
|
||||||
|
|
||||||
|
|
||||||
|
From edf2e3d3c9b124446961a9b66aaf401cf1770500 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Bob van Loosen <bob.loosen@gmail.com>
|
||||||
|
Date: Tue, 14 May 2013 18:43:01 +0200
|
||||||
|
Subject: [PATCH 2/2] rename: MUL32 -> AE_MUL32
|
||||||
|
|
||||||
|
---
|
||||||
|
xbmc/cores/AudioEngine/Utils/AEConvert.cpp | 30 +++++++++++++++---------------
|
||||||
|
1 file changed, 15 insertions(+), 15 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/xbmc/cores/AudioEngine/Utils/AEConvert.cpp b/xbmc/cores/AudioEngine/Utils/AEConvert.cpp
|
||||||
|
index 5f0af63..0b0b646 100644
|
||||||
|
--- a/xbmc/cores/AudioEngine/Utils/AEConvert.cpp
|
||||||
|
+++ b/xbmc/cores/AudioEngine/Utils/AEConvert.cpp
|
||||||
|
@@ -924,19 +924,19 @@ unsigned int CAEConvert::Float_S24NE3(float *data, const unsigned int samples, u
|
||||||
|
|
||||||
|
//float can't store INT32_MAX, it gets rounded up to INT32_MAX + 1
|
||||||
|
//INT32_MAX - 127 is the maximum value that can exactly be stored in both 32 bit float and int
|
||||||
|
-#define MUL32 ((float)(INT32_MAX - 127))
|
||||||
|
+#define AE_MUL32 ((float)(INT32_MAX - 127))
|
||||||
|
|
||||||
|
unsigned int CAEConvert::Float_S32LE(float *data, const unsigned int samples, uint8_t *dest)
|
||||||
|
{
|
||||||
|
int32_t *dst = (int32_t*)dest;
|
||||||
|
#ifdef __SSE__
|
||||||
|
- const __m128 mul = _mm_set_ps1(MUL32);
|
||||||
|
+ const __m128 mul = _mm_set_ps1(AE_MUL32);
|
||||||
|
unsigned int count = samples;
|
||||||
|
|
||||||
|
/* work around invalid alignment */
|
||||||
|
while ((((uintptr_t)data & 0xF) || ((uintptr_t)dest & 0xF)) && count > 0)
|
||||||
|
{
|
||||||
|
- dst[0] = safeRound(data[0] * MUL32);
|
||||||
|
+ dst[0] = safeRound(data[0] * AE_MUL32);
|
||||||
|
++data;
|
||||||
|
++dst;
|
||||||
|
--count;
|
||||||
|
@@ -959,7 +959,7 @@ unsigned int CAEConvert::Float_S32LE(float *data, const unsigned int samples, ui
|
||||||
|
const uint32_t odd = samples - even;
|
||||||
|
if (odd == 1)
|
||||||
|
{
|
||||||
|
- dst[0] = safeRound(data[0] * MUL32);
|
||||||
|
+ dst[0] = safeRound(data[0] * AE_MUL32);
|
||||||
|
dst[0] = Endian_SwapLE32(dst[0]);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
@@ -992,7 +992,7 @@ unsigned int CAEConvert::Float_S32LE(float *data, const unsigned int samples, ui
|
||||||
|
/* no SIMD */
|
||||||
|
for (uint32_t i = 0; i < samples; ++i, ++data, ++dst)
|
||||||
|
{
|
||||||
|
- dst[0] = safeRound(data[0] * MUL32);
|
||||||
|
+ dst[0] = safeRound(data[0] * AE_MUL32);
|
||||||
|
dst[0] = Endian_SwapLE32(dst[0]);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
@@ -1006,7 +1006,7 @@ unsigned int CAEConvert::Float_S32LE_Neon(float *data, const unsigned int sample
|
||||||
|
int32_t *dst = (int32_t*)dest;
|
||||||
|
for (float *end = data + (samples & ~0x3); data < end; data += 4, dst += 4)
|
||||||
|
{
|
||||||
|
- float32x4_t val = vmulq_n_f32(vld1q_f32((const float32_t *)data), MUL32);
|
||||||
|
+ float32x4_t val = vmulq_n_f32(vld1q_f32((const float32_t *)data), AE_MUL32);
|
||||||
|
int32x4_t ret = vcvtq_s32_f32(val);
|
||||||
|
#ifdef __BIG_ENDIAN__
|
||||||
|
ret = vrev64q_s32(ret);
|
||||||
|
@@ -1016,7 +1016,7 @@ unsigned int CAEConvert::Float_S32LE_Neon(float *data, const unsigned int sample
|
||||||
|
|
||||||
|
if (samples & 0x2)
|
||||||
|
{
|
||||||
|
- float32x2_t val = vmul_n_f32(vld1_f32((const float32_t *)data), MUL32);
|
||||||
|
+ float32x2_t val = vmul_n_f32(vld1_f32((const float32_t *)data), AE_MUL32);
|
||||||
|
int32x2_t ret = vcvt_s32_f32(val);
|
||||||
|
#ifdef __BIG_ENDIAN__
|
||||||
|
ret = vrev64_s32(ret);
|
||||||
|
@@ -1028,7 +1028,7 @@ unsigned int CAEConvert::Float_S32LE_Neon(float *data, const unsigned int sample
|
||||||
|
|
||||||
|
if (samples & 0x1)
|
||||||
|
{
|
||||||
|
- dst[0] = safeRound(data[0] * MUL32);
|
||||||
|
+ dst[0] = safeRound(data[0] * AE_MUL32);
|
||||||
|
dst[0] = Endian_SwapLE32(dst[0]);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
@@ -1039,13 +1039,13 @@ unsigned int CAEConvert::Float_S32BE(float *data, const unsigned int samples, ui
|
||||||
|
{
|
||||||
|
int32_t *dst = (int32_t*)dest;
|
||||||
|
#ifdef __SSE__
|
||||||
|
- const __m128 mul = _mm_set_ps1(MUL32);
|
||||||
|
+ const __m128 mul = _mm_set_ps1(AE_MUL32);
|
||||||
|
unsigned int count = samples;
|
||||||
|
|
||||||
|
/* work around invalid alignment */
|
||||||
|
while ((((uintptr_t)data & 0xF) || ((uintptr_t)dest & 0xF)) && count > 0)
|
||||||
|
{
|
||||||
|
- dst[0] = safeRound(data[0] * MUL32);
|
||||||
|
+ dst[0] = safeRound(data[0] * AE_MUL32);
|
||||||
|
++data;
|
||||||
|
++dst;
|
||||||
|
--count;
|
||||||
|
@@ -1068,7 +1068,7 @@ unsigned int CAEConvert::Float_S32BE(float *data, const unsigned int samples, ui
|
||||||
|
const uint32_t odd = samples - even;
|
||||||
|
if (odd == 1)
|
||||||
|
{
|
||||||
|
- dst[0] = safeRound(data[0] * MUL32);
|
||||||
|
+ dst[0] = safeRound(data[0] * AE_MUL32);
|
||||||
|
dst[0] = Endian_SwapBE32(dst[0]);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
@@ -1100,7 +1100,7 @@ unsigned int CAEConvert::Float_S32BE(float *data, const unsigned int samples, ui
|
||||||
|
/* no SIMD */
|
||||||
|
for (uint32_t i = 0; i < samples; ++i, ++data, ++dst)
|
||||||
|
{
|
||||||
|
- dst[0] = safeRound(data[0] * MUL32);
|
||||||
|
+ dst[0] = safeRound(data[0] * AE_MUL32);
|
||||||
|
dst[0] = Endian_SwapBE32(dst[0]);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
@@ -1114,7 +1114,7 @@ unsigned int CAEConvert::Float_S32BE_Neon(float *data, const unsigned int sample
|
||||||
|
int32_t *dst = (int32_t*)dest;
|
||||||
|
for (float *end = data + (samples & ~0x3); data < end; data += 4, dst += 4)
|
||||||
|
{
|
||||||
|
- float32x4_t val = vmulq_n_f32(vld1q_f32((const float32_t *)data), MUL32);
|
||||||
|
+ float32x4_t val = vmulq_n_f32(vld1q_f32((const float32_t *)data), AE_MUL32);
|
||||||
|
int32x4_t ret = vcvtq_s32_f32(val);
|
||||||
|
#ifndef __BIG_ENDIAN__
|
||||||
|
ret = vrev64q_s32(ret);
|
||||||
|
@@ -1124,7 +1124,7 @@ unsigned int CAEConvert::Float_S32BE_Neon(float *data, const unsigned int sample
|
||||||
|
|
||||||
|
if (samples & 0x2)
|
||||||
|
{
|
||||||
|
- float32x2_t val = vmul_n_f32(vld1_f32((const float32_t *)data), MUL32);
|
||||||
|
+ float32x2_t val = vmul_n_f32(vld1_f32((const float32_t *)data), AE_MUL32);
|
||||||
|
int32x2_t ret = vcvt_s32_f32(val);
|
||||||
|
#ifndef __BIG_ENDIAN__
|
||||||
|
ret = vrev64_s32(ret);
|
||||||
|
@@ -1136,7 +1136,7 @@ unsigned int CAEConvert::Float_S32BE_Neon(float *data, const unsigned int sample
|
||||||
|
|
||||||
|
if (samples & 0x1)
|
||||||
|
{
|
||||||
|
- dst[0] = safeRound(data[0] * MUL32);
|
||||||
|
+ dst[0] = safeRound(data[0] * AE_MUL32);
|
||||||
|
dst[0] = Endian_SwapBE32(dst[0]);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
--
|
||||||
|
1.8.1.6
|
||||||
|
|
||||||
Loading…
x
Reference in New Issue
Block a user