wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-21 06:37:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #1944 - Fix volume handling in sndio backend.

Browse source 
Backported from Mozilla bug 1467882.
This commit is contained in:
Job Bautista 2022-06-26 19:20:24 +08:00 • committed by roytam1
commit ef4db6f2aa
1 changed files with 28 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

32
media/libcubeb/src/cubeb_sndio.c
View file

@ -42,18 +42,35 @@ struct cubeb_stream {
uint64_t wrpos; /* number of written frames */ uint64_t wrpos; /* number of written frames */
cubeb_data_callback data_cb; /* cb to preapare data */ cubeb_data_callback data_cb; /* cb to preapare data */
cubeb_state_callback state_cb; /* cb to notify about state changes */ cubeb_state_callback state_cb; /* cb to notify about state changes */
float volume; /* current volume */
void *arg; /* user arg to {data,state}_cb */ void *arg; /* user arg to {data,state}_cb */
}; };
static void static void
float_to_s16(void *ptr, long nsamp) s16_setvol(void *ptr, long nsamp, float volume)
{
int16_t *dst = ptr;
int32_t mult = volume * 32768;
int32_t s;
while (nsamp-- > 0) {
s = *dst;
s = (s * mult) >> 15;
*(dst++) = s;
}
}
static void
float_to_s16(void *ptr, long nsamp, float volume)
{ {
int16_t *dst = ptr; int16_t *dst = ptr;
float *src = ptr; float *src = ptr;
float mult = volume * 32768;
int s; int s;
while (nsamp-- > 0) { while (nsamp-- > 0) {
s = lrintf(*(src++) * 32768); s = lrintf(*(src++) * mult);
if (s < -32768) if (s < -32768)
s = -32768; s = -32768;
else if (s > 32767) else if (s > 32767)
@ -111,7 +128,9 @@ sndio_mainloop(void *arg)
break; break;
} }
if (s->conv) if (s->conv)
float_to_s16(s->buf, nfr * s->pchan); float_to_s16(s->buf, nfr * s->pchan, s->volume);
else
s16_setvol(s->buf, nfr * s->pchan, s->volume);
start = 0; start = 0;
end = nfr * s->bpf; end = nfr * s->bpf;
} }
@ -260,6 +279,7 @@ sndio_stream_init(cubeb * context,
free(s); free(s);
return CUBEB_ERROR; return CUBEB_ERROR;
} }
s->volume = 1.;
*stream = s; *stream = s;
DPR("sndio_stream_init() end, ok\n"); DPR("sndio_stream_init() end, ok\n");
(void)context; (void)context;
@ -346,7 +366,11 @@ sndio_stream_set_volume(cubeb_stream *s, float volume)
{ {
DPR("sndio_stream_set_volume(%f)\n", volume); DPR("sndio_stream_set_volume(%f)\n", volume);
pthread_mutex_lock(&s->mtx); pthread_mutex_lock(&s->mtx);
sio_setvol(s->hdl, SIO_MAXVOL * volume); if (volume < 0.)
volume = 0.;
else if (volume > 1.0)
volume = 1.;
s->volume = volume;
pthread_mutex_unlock(&s->mtx); pthread_mutex_unlock(&s->mtx);
return CUBEB_OK; return CUBEB_OK;
} }