commit 799afaf11c613ff18e230086a5e07c6f05ae9396
author Ryan C. Gordon <icculus@icculus.org> Tue May 15 01:35:53 2018 -0400
committer Ryan C. Gordon <icculus@icculus.org> Tue May 15 01:35:53 2018 -0400
tree 58f62516e425a4939420011fecf2e41aba58fd66
parent 3ca98abf968e666911d7a3b056a2a8ea83aeb39b

audio: float to int converters should clamp inclusively.

If we have to test if a sample is > 1.0f anyhow, we might as well use this
to avoid the unnecessary multiplication when it's == 1.0f, too. (etc).

--HG--
extra : rebase_source : efee952e0b5cd3f96c68b80158bcee6f9c66b241
extra : histedit_source : d60200ad2713377a0f8a322e5a0ce59a003fe575

src/audio/SDL_audiotypecvt.c

diff --git a/src/audio/SDL_audiotypecvt.c b/src/audio/SDL_audiotypecvt.c
index fe8a89f..264ce98 100644
--- a/src/audio/SDL_audiotypecvt.c
+++ b/src/audio/SDL_audiotypecvt.c
@@ -171,9 +171,9 @@
 
     for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) {
         const float sample = *src;
-        if (sample > 1.0f) {
+        if (sample >= 1.0f) {
             *dst = 127;
-        } else if (sample < -1.0f) {
+        } else if (sample <= -1.0f) {
             *dst = -127;
         } else {
             *dst = (Sint8)(sample * 127.0f);
@@ -197,9 +197,9 @@
 
     for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) {
         const float sample = *src;
-        if (sample > 1.0f) {
+        if (sample >= 1.0f) {
             *dst = 255;
-        } else if (sample < -1.0f) {
+        } else if (sample <= -1.0f) {
             *dst = 0;
         } else {
             *dst = (Uint8)((sample + 1.0f) * 127.0f);
@@ -223,9 +223,9 @@
 
     for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) {
         const float sample = *src;
-        if (sample > 1.0f) {
+        if (sample >= 1.0f) {
             *dst = 32767;
-        } else if (sample < -1.0f) {
+        } else if (sample <= -1.0f) {
             *dst = -32767;
         } else {
             *dst = (Sint16)(sample * 32767.0f);
@@ -249,9 +249,9 @@
 
     for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) {
         const float sample = *src;
-        if (sample > 1.0f) {
+        if (sample >= 1.0f) {
             *dst = 65534;
-        } else if (sample < -1.0f) {
+        } else if (sample <= -1.0f) {
             *dst = 0;
         } else {
             *dst = (Uint16)((sample + 1.0f) * 32767.0f);
@@ -275,9 +275,9 @@
 
     for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) {
         const float sample = *src;
-        if (sample > 1.0f) {
+        if (sample >= 1.0f) {
             *dst = 2147483647;
-        } else if (sample < -1.0f) {
+        } else if (sample <= -1.0f) {
             *dst = -2147483647;
         } else {
             *dst = ((Sint32)(sample * 8388607.0f)) << 8;