Fixed normalization of int64 and float values

diff --git a/src/pcm/pcm_route.c b/src/pcm/pcm_route.c
index eed050b7cba097ca662c60bd79ead3da7c96cbf1..b6c44a89f9e52cdfe94991b53d8171b80fbbf0de 100644 (file)
--- a/src/pcm/pcm_route.c
+++ b/src/pcm/pcm_route.c
@@ -408,8 +408,10 @@ static void snd_pcm_route_convert1_many(const snd_pcm_channel_area_t *dst_area,
 
        norm_int64_0_noatt:
        norm_int:
-               if (sum.as_sint64 > (u_int32_t)0xffffffff)
-                       sample = (u_int32_t)0xffffffff;
+               if (sum.as_sint64 > (int64_t)0x7fffffff)
+                       sample = 0x7fffffff;    /* maximum positive value */
+               else if (sum.as_sint64 < (int64_t)-0x80000000)
+                       sample = 0x80000000;    /* maximum negative value */
                else
                        sample = sum.as_sint64;
                goto after_norm;
@@ -427,8 +429,10 @@ static void snd_pcm_route_convert1_many(const snd_pcm_channel_area_t *dst_area,
        norm_float_0:
        norm_float:
                sum.as_float = floor(sum.as_float + 0.5);
-               if (sum.as_float > (u_int32_t)0xffffffff)
-                       sample = (u_int32_t)0xffffffff;
+               if (sum.as_float > (int64_t)0x7fffffff)
+                       sample = 0x7fffffff;    /* maximum positive value */
+               else if (sum.as_float < (int64_t)-0x80000000)
+                       sample = 0x80000000;    /* maximum negative value */
                else
                        sample = sum.as_float;
                goto after_norm;