4218fdd77f
Currently the internal float range of the mixing engine is [-.5f, .5f]. PulseAudio, SDL2 and libasound use a [-1.f, 1.f] range. This means with float samples the audio playback volume is 6dB too low and audio recording signals will be clipped in most cases. To avoid another scaling factor in the conv_natural_float_* and clip_natural_float_* functions with FLOAT_MIXENG defined this patch changes the mixing engine float range to [-1.f, 1.f]. Signed-off-by: Volker Rümelin <vr_qemu@t-online.de> Message-id: 20200308193321.20668-4-vr_qemu@t-online.de Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
154 lines
3.9 KiB
C
154 lines
3.9 KiB
C
/*
|
|
* QEMU Mixing engine
|
|
*
|
|
* Copyright (c) 2004-2005 Vassili Karpov (malc)
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
/*
|
|
* Tusen tack till Mike Nordell
|
|
* dec++'ified by Dscho
|
|
*/
|
|
|
|
#ifndef SIGNED
|
|
#define HALF (IN_MAX >> 1)
|
|
#endif
|
|
|
|
#define ET glue (ENDIAN_CONVERSION, glue (glue (glue (_, ITYPE), BSIZE), _t))
|
|
#define IN_T glue (glue (ITYPE, BSIZE), _t)
|
|
|
|
#ifdef FLOAT_MIXENG
|
|
static inline mixeng_real glue (conv_, ET) (IN_T v)
|
|
{
|
|
IN_T nv = ENDIAN_CONVERT (v);
|
|
|
|
#ifdef RECIPROCAL
|
|
#ifdef SIGNED
|
|
return nv * (2.f / ((mixeng_real)IN_MAX - IN_MIN));
|
|
#else
|
|
return (nv - HALF) * (2.f / (mixeng_real)IN_MAX);
|
|
#endif
|
|
#else /* !RECIPROCAL */
|
|
#ifdef SIGNED
|
|
return nv / (((mixeng_real)IN_MAX - IN_MIN) / 2.f);
|
|
#else
|
|
return (nv - HALF) / ((mixeng_real)IN_MAX / 2.f);
|
|
#endif
|
|
#endif
|
|
}
|
|
|
|
static inline IN_T glue (clip_, ET) (mixeng_real v)
|
|
{
|
|
if (v >= 1.f) {
|
|
return IN_MAX;
|
|
} else if (v < -1.f) {
|
|
return IN_MIN;
|
|
}
|
|
|
|
#ifdef SIGNED
|
|
return ENDIAN_CONVERT((IN_T)(v * (((mixeng_real)IN_MAX - IN_MIN) / 2.f)));
|
|
#else
|
|
return ENDIAN_CONVERT((IN_T)((v * ((mixeng_real)IN_MAX / 2.f)) + HALF));
|
|
#endif
|
|
}
|
|
|
|
#else /* !FLOAT_MIXENG */
|
|
|
|
static inline int64_t glue (conv_, ET) (IN_T v)
|
|
{
|
|
IN_T nv = ENDIAN_CONVERT (v);
|
|
#ifdef SIGNED
|
|
return ((int64_t) nv) << (32 - SHIFT);
|
|
#else
|
|
return ((int64_t) nv - HALF) << (32 - SHIFT);
|
|
#endif
|
|
}
|
|
|
|
static inline IN_T glue (clip_, ET) (int64_t v)
|
|
{
|
|
if (v >= 0x7f000000) {
|
|
return IN_MAX;
|
|
}
|
|
else if (v < -2147483648LL) {
|
|
return IN_MIN;
|
|
}
|
|
|
|
#ifdef SIGNED
|
|
return ENDIAN_CONVERT ((IN_T) (v >> (32 - SHIFT)));
|
|
#else
|
|
return ENDIAN_CONVERT ((IN_T) ((v >> (32 - SHIFT)) + HALF));
|
|
#endif
|
|
}
|
|
#endif
|
|
|
|
static void glue (glue (conv_, ET), _to_stereo)
|
|
(struct st_sample *dst, const void *src, int samples)
|
|
{
|
|
struct st_sample *out = dst;
|
|
IN_T *in = (IN_T *) src;
|
|
|
|
while (samples--) {
|
|
out->l = glue (conv_, ET) (*in++);
|
|
out->r = glue (conv_, ET) (*in++);
|
|
out += 1;
|
|
}
|
|
}
|
|
|
|
static void glue (glue (conv_, ET), _to_mono)
|
|
(struct st_sample *dst, const void *src, int samples)
|
|
{
|
|
struct st_sample *out = dst;
|
|
IN_T *in = (IN_T *) src;
|
|
|
|
while (samples--) {
|
|
out->l = glue (conv_, ET) (in[0]);
|
|
out->r = out->l;
|
|
out += 1;
|
|
in += 1;
|
|
}
|
|
}
|
|
|
|
static void glue (glue (clip_, ET), _from_stereo)
|
|
(void *dst, const struct st_sample *src, int samples)
|
|
{
|
|
const struct st_sample *in = src;
|
|
IN_T *out = (IN_T *) dst;
|
|
while (samples--) {
|
|
*out++ = glue (clip_, ET) (in->l);
|
|
*out++ = glue (clip_, ET) (in->r);
|
|
in += 1;
|
|
}
|
|
}
|
|
|
|
static void glue (glue (clip_, ET), _from_mono)
|
|
(void *dst, const struct st_sample *src, int samples)
|
|
{
|
|
const struct st_sample *in = src;
|
|
IN_T *out = (IN_T *) dst;
|
|
while (samples--) {
|
|
*out++ = glue (clip_, ET) (in->l + in->r);
|
|
in += 1;
|
|
}
|
|
}
|
|
|
|
#undef ET
|
|
#undef HALF
|
|
#undef IN_T
|