audioconvert: tweak more conversion constants

Tweak some more constants to make lossless conversions work.
Add some tests for lossless conversion.
Add some more tests.
This commit is contained in:
Wim Taymans 2022-07-05 15:50:05 +02:00
parent 22317da685
commit f62244d7a9
2 changed files with 145 additions and 8 deletions

View file

@ -39,22 +39,22 @@
#define U8_MIN 0u
#define U8_MAX 255u
#define U8_SCALE 127.5f
#define U8_SCALE 128.f
#define U8_OFFS 128.f
#define U8_TO_F32(v) ((((uint8_t)(v)) * (1.0f / U8_OFFS)) - 1.0f)
#define F32_TO_U8(v) (uint8_t)SPA_CLAMP((v) * U8_SCALE + U8_OFFS, U8_MIN, U8_MAX)
#define F32_TO_U8_D(v,d) (uint8_t)SPA_CLAMP((v) * U8_SCALE + U8_OFFS + (d), U8_MIN, U8_MAX)
#define S8_MIN -127
#define S8_MIN -128
#define S8_MAX 127
#define S8_SCALE 127.0f
#define S8_SCALE 128.0f
#define S8_TO_F32(v) (((int8_t)(v)) * (1.0f / S8_SCALE))
#define F32_TO_S8(v) (int8_t)SPA_CLAMP((v) * S8_SCALE, S8_MIN, S8_MAX)
#define F32_TO_S8_D(v,d) (int8_t)SPA_CLAMP((v) * S8_SCALE + (d), S8_MIN, S8_MAX)
#define U16_MIN 0u
#define U16_MAX 65535u
#define U16_SCALE 32767.5f
#define U16_SCALE 32768.f
#define U16_OFFS 32768.f
#define U16_TO_F32(v) ((((uint16_t)(v)) * (1.0f / U16_OFFS)) - 1.0f)
#define U16S_TO_F32(v) (((uint16_t)bswap_16((uint16_t)(v)) * (1.0f / U16_OFFS)) - 1.0f)
@ -75,7 +75,7 @@
#define U24_MIN 0u
#define U24_MAX 16777215u
#define U24_SCALE 8388607.5f
#define U24_SCALE 8388608.f
#define U24_OFFS 8388608.f
#define U24_TO_F32(v) ((u24_to_u32(v) * (1.0f / U24_OFFS)) - 1.0f)
#define F32_TO_U24(v) u32_to_u24(SPA_CLAMP((v) * U24_SCALE + U24_OFFS, U24_MIN, U24_MAX))
@ -92,7 +92,7 @@
#define U32_MIN 0u
#define U32_MAX 4294967295
#define U32_SCALE 2147483647.5f
#define U32_SCALE 2147483648.f
#define U32_OFFS 2147483648.f
#define U32_TO_F32(v) ((((uint32_t)(v)) * (1.0f / U32_OFFS)) - 1.0f)
#define F32_TO_U32(v) (uint32_t)SPA_CLAMP((v) * U32_SCALE + U32_OFFS, U32_MIN, U32_MAX)

View file

@ -125,10 +125,40 @@ static void run_test(const char *name,
}
}
static void test_f32_s8(void)
{
static const float in[] = { 0.0f, 1.0f, -1.0f, 0.5f, -0.5f, 1.1f, -1.1f };
static const int8_t out[] = { 0, 127, -128, 64, 192, 127, -128 };
run_test("test_f32_s8", in, sizeof(in[0]), out, sizeof(out[0]), SPA_N_ELEMENTS(out),
true, true, conv_f32_to_s8_c);
run_test("test_f32d_s8", in, sizeof(in[0]), out, sizeof(out[0]), SPA_N_ELEMENTS(out),
false, true, conv_f32d_to_s8_c);
run_test("test_f32_s8d", in, sizeof(in[0]), out, sizeof(out[0]), SPA_N_ELEMENTS(out),
true, false, conv_f32_to_s8d_c);
run_test("test_f32d_s8d", in, sizeof(in[0]), out, sizeof(out[0]), SPA_N_ELEMENTS(out),
false, false, conv_f32d_to_s8d_c);
}
static void test_s8_f32(void)
{
static const int8_t in[] = { 0, 127, -128, 64, 192, };
static const float out[] = { 0.0f, 0.9921875f, -1.0f, 0.5f, -0.5f, };
run_test("test_s8_f32", in, sizeof(in[0]), out, sizeof(out[0]), SPA_N_ELEMENTS(out),
true, true, conv_s8_to_f32_c);
run_test("test_s8d_f32", in, sizeof(in[0]), out, sizeof(out[0]), SPA_N_ELEMENTS(out),
false, true, conv_s8d_to_f32_c);
run_test("test_s8_f32d", in, sizeof(in[0]), out, sizeof(out[0]), SPA_N_ELEMENTS(out),
true, false, conv_s8_to_f32d_c);
run_test("test_s8d_f32d", in, sizeof(in[0]), out, sizeof(out[0]), SPA_N_ELEMENTS(out),
false, false, conv_s8d_to_f32d_c);
}
static void test_f32_u8(void)
{
static const float in[] = { 0.0f, 1.0f, -1.0f, 0.5f, -0.5f, 1.1f, -1.1f };
static const uint8_t out[] = { 128, 255, 0, 191, 64, 255, 0, };
static const uint8_t out[] = { 128, 255, 0, 192, 64, 255, 0, };
run_test("test_f32_u8", in, sizeof(in[0]), out, sizeof(out[0]), SPA_N_ELEMENTS(out),
true, true, conv_f32_to_u8_c);
@ -158,7 +188,7 @@ static void test_u8_f32(void)
static void test_f32_u16(void)
{
static const float in[] = { 0.0f, 1.0f, -1.0f, 0.5f, -0.5f, 1.1f, -1.1f };
static const uint16_t out[] = { 32768, 65535, 0, 49151, 16384, 65535, 0 };
static const uint16_t out[] = { 32768, 65535, 0, 49152, 16384, 65535, 0 };
run_test("test_f32_u16", in, sizeof(in[0]), out, sizeof(out[0]), SPA_N_ELEMENTS(out),
true, true, conv_f32_to_u16_c);
@ -478,11 +508,109 @@ static void test_f32_f64(void)
run_test("test_f32d_f64d", in, sizeof(in[0]), out, sizeof(out[0]), SPA_N_ELEMENTS(out),
false, false, conv_f32d_to_f64d_c);
}
static void test_lossless_s8(void)
{
int8_t i;
fprintf(stderr, "test %s:\n", __func__);
for (i = S8_MIN; i < S8_MAX; i+=1) {
float v = S8_TO_F32(i);
int8_t t = F32_TO_S8(v);
spa_assert_se(i == t);
}
}
static void test_lossless_u8(void)
{
uint8_t i;
fprintf(stderr, "test %s:\n", __func__);
for (i = U8_MIN; i < U8_MAX; i+=1) {
float v = U8_TO_F32(i);
uint8_t t = F32_TO_U8(v);
spa_assert_se(i == t);
}
}
static void test_lossless_s16(void)
{
int16_t i;
fprintf(stderr, "test %s:\n", __func__);
for (i = S16_MIN; i < S16_MAX; i+=3) {
float v = S16_TO_F32(i);
int16_t t = F32_TO_S16(v);
spa_assert_se(i == t);
}
}
static void test_lossless_u16(void)
{
uint32_t i;
fprintf(stderr, "test %s:\n", __func__);
for (i = U16_MIN; i < U16_MAX; i+=3) {
float v = U16_TO_F32(i);
uint16_t t = F32_TO_U16(v);
spa_assert_se(i == t);
}
}
static void test_lossless_s24(void)
{
int32_t i;
fprintf(stderr, "test %s:\n", __func__);
for (i = S24_MIN; i < S24_MAX; i+=13) {
float v = S24_TO_F32(s32_to_s24(i));
int32_t t = s24_to_s32(F32_TO_S24(v));
spa_assert_se(i == t);
}
}
static void test_lossless_u24(void)
{
uint32_t i;
fprintf(stderr, "test %s:\n", __func__);
for (i = U24_MIN; i < U24_MAX; i+=11) {
float v = U24_TO_F32(u32_to_u24(i));
uint32_t t = u24_to_u32(F32_TO_U24(v));
spa_assert_se(i == t);
}
}
static void test_lossless_s32(void)
{
int32_t i;
fprintf(stderr, "test %s:\n", __func__);
for (i = S32_MIN; i < S32_MAX; i+=255) {
float v = S32_TO_F32(i);
int32_t t = F32_TO_S32(v);
spa_assert_se(SPA_ABS(i - t) <= 128);
}
}
static void test_lossless_u32(void)
{
uint32_t i;
fprintf(stderr, "test %s:\n", __func__);
for (i = U32_MIN; i < U32_MAX; i+=255) {
float v = U32_TO_F32(i);
uint32_t t = F32_TO_U32(v);
spa_assert_se(i > t ? (i - t) <= 128 : (t - i) <= 128);
}
}
int main(int argc, char *argv[])
{
cpu_flags = get_cpu_flags();
printf("got get CPU flags %d\n", cpu_flags);
test_f32_s8();
test_s8_f32();
test_f32_u8();
test_u8_f32();
test_f32_u16();
@ -503,5 +631,14 @@ int main(int argc, char *argv[])
test_s24_32_f32();
test_f32_f64();
test_f64_f32();
test_lossless_s8();
test_lossless_u8();
test_lossless_s16();
test_lossless_u16();
test_lossless_s24();
test_lossless_u24();
test_lossless_s32();
test_lossless_u32();
return 0;
}