asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2024-11-10 00:25:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

aplay: Fix conversion of unsigned samples in peak calculation

Browse source 
The XOR with the mask has to be applied before calculating abs value.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2021-08-24 09:00:40 +02:00
parent ce05208085
commit 0ea7bfea83
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
aplay/aplay.c
View file

@ -1828,7 +1828,8 @@ static void compute_max_peak(u_char *data, size_t samples)
sval = le16toh(*valp); sval = le16toh(*valp);
else else
sval = be16toh(*valp); sval = be16toh(*valp);
sval = abs(sval) ^ mask; sval ^= mask;
sval = abs(sval);
if (max_peak[c] < sval) if (max_peak[c] < sval)
max_peak[c] = sval; max_peak[c] = sval;
valp++; valp++;
@ -1848,11 +1849,12 @@ static void compute_max_peak(u_char *data, size_t samples)
} else { } else {
val = (valp[0]<<16) | (valp[1]<<8) | valp[2]; val = (valp[0]<<16) | (valp[1]<<8) | valp[2];
} }
val ^= mask;
/* Correct signed bit in 32-bit value */ /* Correct signed bit in 32-bit value */
if (val & (1<<(bits_per_sample-1))) { if (val & (1<<(bits_per_sample-1))) {
val |= 0xff<<24; /* Negate upper bits too */ val |= 0xff<<24; /* Negate upper bits too */
} }
val = abs(val) ^ mask; val = abs(val);
if (max_peak[c] < val) if (max_peak[c] < val)
max_peak[c] = val; max_peak[c] = val;
valp += 3; valp += 3;
@ -1871,7 +1873,8 @@ static void compute_max_peak(u_char *data, size_t samples)
val = le32toh(*valp); val = le32toh(*valp);
else else
val = be32toh(*valp); val = be32toh(*valp);
val = abs(val) ^ mask; val ^= mask;
val = abs(val);
if (max_peak[c] < val) if (max_peak[c] < val)
max_peak[c] = val; max_peak[c] = val;
valp++; valp++;