UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ALSA: line6: Fix volume calculation for big-endian 

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2015-01-28 12:29:05 +01:00
parent 247d95ee6d
commit 0416980d0a
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sound/usb/line6/playback.c
View File

@ -31,14 +31,16 @@ static void change_volume(struct urb *urb_out, int volume[],
return; /* maximum volume - no change */ return; /* maximum volume - no change */
if (bytes_per_frame == 4) { if (bytes_per_frame == 4) {
short *p, *buf_end; __le16 *p, *buf_end;
p = (short *)urb_out->transfer_buffer; p = (__le16 *)urb_out->transfer_buffer;
buf_end = p + urb_out->transfer_buffer_length / sizeof(*p); buf_end = p + urb_out->transfer_buffer_length / sizeof(*p);
for (; p < buf_end; ++p) { for (; p < buf_end; ++p) {
int val = (*p * volume[chn & 1]) >> 8; short pv = le16_to_cpu(*p);
*p = clamp(val, 0x7fff, -0x8000); int val = (pv * volume[chn & 1]) >> 8;
pv = clamp(val, 0x7fff, -0x8000);
*p = cpu_to_le16(pv);
++chn; ++chn;
} }
} else if (bytes_per_frame == 6) { } else if (bytes_per_frame == 6) {
@ -114,15 +116,18 @@ static void add_monitor_signal(struct urb *urb_out, unsigned char *signal,
return; /* zero volume - no change */ return; /* zero volume - no change */
if (bytes_per_frame == 4) { if (bytes_per_frame == 4) {
short *pi, *po, *buf_end; __le16 *pi, *po, *buf_end;
pi = (short *)signal; pi = (__le16 *)signal;
po = (short *)urb_out->transfer_buffer; po = (__le16 *)urb_out->transfer_buffer;
buf_end = po + urb_out->transfer_buffer_length / sizeof(*po); buf_end = po + urb_out->transfer_buffer_length / sizeof(*po);
for (; po < buf_end; ++pi, ++po) { for (; po < buf_end; ++pi, ++po) {
int val = *po + ((*pi * volume) >> 8); short pov = le16_to_cpu(*po);
*po = clamp(val, 0x7fff, -0x8000); short piv = le16_to_cpu(*pi);
int val = pov + ((piv * volume) >> 8);
pov = clamp(val, 0x7fff, -0x8000);
*po = cpu_to_le16(pov);
} }
} }