* [PATCH 0/1] audio/mixeng: fix clang 10+ warning
@ 2020-05-23 20:16 Volker Rümelin
2020-05-23 20:17 ` [PATCH] " Volker Rümelin
0 siblings, 1 reply; 3+ messages in thread
From: Volker Rümelin @ 2020-05-23 20:16 UTC (permalink / raw)
To: Gerd Hoffmann
Cc: Alexander Bulekov, Richard Henderson, Philippe Mathieu-Daudé, QEMU
This is another attempt to silence the clang 10 warning in
audio/mixeng.c.
The problem was first reported here:
https://lists.nongnu.org/archive/html/qemu-devel/2020-03/msg02270.html
This is Philippe's RFC patch and a discussion:
https://lists.nongnu.org/archive/html/qemu-devel/2020-05/msg00264.html
In that discussion I suggested an explicit type cast, but I changed
my mind.
Volker Rümelin (1):
audio/mixeng: fix clang 10+ warning
audio/mixeng.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--
2.26.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] audio/mixeng: fix clang 10+ warning
2020-05-23 20:16 [PATCH 0/1] audio/mixeng: fix clang 10+ warning Volker Rümelin
@ 2020-05-23 20:17 ` Volker Rümelin
2020-05-26 5:51 ` Gerd Hoffmann
0 siblings, 1 reply; 3+ messages in thread
From: Volker Rümelin @ 2020-05-23 20:17 UTC (permalink / raw)
To: Gerd Hoffmann
Cc: Alexander Bulekov, Richard Henderson, Philippe Mathieu-Daudé, QEMU
The code in CONV_NATURAL_FLOAT() and CLIP_NATURAL_FLOAT()
seems to use the constant 2^31-0.5 to convert float to integer
and back. But the float type lacks the required precision and
the constant used for the conversion is 2^31. This is equiva-
lent to a [-1.f, 1.f] <-> [INT32_MIN, INT32_MAX + 1] mapping.
This patch explicitly writes down the used constant. The
compiler generated code doesn't change.
The constant 2^31 has an exact float representation and the
clang 10 compiler stops complaining about an implicit int to
float conversion with a changed value.
A few notes:
- The conversion of 1.f to INT32_MAX + 1 doesn't overflow. The
type of the destination variable is int64_t.
- At a later stage one of the clip_* functions in
audio/mixeng_template.h limits INT32_MAX + 1 to the integer
range.
- The clip_natural_float_* functions in audio/mixeng.c convert
INT32_MAX and INT32_MAX + 1 to 1.f.
Buglink: https://bugs.launchpad.net/bugs/1878627
Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
---
audio/mixeng.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/audio/mixeng.c b/audio/mixeng.c
index 739a500449..924dcb858a 100644
--- a/audio/mixeng.c
+++ b/audio/mixeng.c
@@ -271,11 +271,12 @@ f_sample *mixeng_clip[2][2][2][3] = {
#define CONV_NATURAL_FLOAT(x) (x)
#define CLIP_NATURAL_FLOAT(x) (x)
#else
-static const float float_scale = UINT_MAX / 2.f;
+/* macros to map [-1.f, 1.f] <-> [INT32_MIN, INT32_MAX + 1] */
+static const float float_scale = (int64_t)INT32_MAX + 1;
#define CONV_NATURAL_FLOAT(x) ((x) * float_scale)
#ifdef RECIPROCAL
-static const float float_scale_reciprocal = 2.f / UINT_MAX;
+static const float float_scale_reciprocal = 1.f / ((int64_t)INT32_MAX + 1);
#define CLIP_NATURAL_FLOAT(x) ((x) * float_scale_reciprocal)
#else
#define CLIP_NATURAL_FLOAT(x) ((x) / float_scale)
--
2.26.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] audio/mixeng: fix clang 10+ warning
2020-05-23 20:17 ` [PATCH] " Volker Rümelin
@ 2020-05-26 5:51 ` Gerd Hoffmann
0 siblings, 0 replies; 3+ messages in thread
From: Gerd Hoffmann @ 2020-05-26 5:51 UTC (permalink / raw)
To: Volker Rümelin
Cc: Alexander Bulekov, Richard Henderson, Philippe Mathieu-Daudé, QEMU
On Sat, May 23, 2020 at 10:17:12PM +0200, Volker Rümelin wrote:
> The code in CONV_NATURAL_FLOAT() and CLIP_NATURAL_FLOAT()
> seems to use the constant 2^31-0.5 to convert float to integer
> and back. But the float type lacks the required precision and
> the constant used for the conversion is 2^31. This is equiva-
> lent to a [-1.f, 1.f] <-> [INT32_MIN, INT32_MAX + 1] mapping.
>
> This patch explicitly writes down the used constant. The
> compiler generated code doesn't change.
>
> The constant 2^31 has an exact float representation and the
> clang 10 compiler stops complaining about an implicit int to
> float conversion with a changed value.
>
> A few notes:
> - The conversion of 1.f to INT32_MAX + 1 doesn't overflow. The
> type of the destination variable is int64_t.
> - At a later stage one of the clip_* functions in
> audio/mixeng_template.h limits INT32_MAX + 1 to the integer
> range.
> - The clip_natural_float_* functions in audio/mixeng.c convert
> INT32_MAX and INT32_MAX + 1 to 1.f.
>
> Buglink: https://bugs.launchpad.net/bugs/1878627
> Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
Added to audio queue.
thanks,
Gerd
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-05-26 5:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-23 20:16 [PATCH 0/1] audio/mixeng: fix clang 10+ warning Volker Rümelin
2020-05-23 20:17 ` [PATCH] " Volker Rümelin
2020-05-26 5:51 ` Gerd Hoffmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).