Skip to content

V
vlc
Commit eee1dd00 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

integer: simplify

parent 13c14eea
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 27 deletions
modules/audio_mixer/integer.c
View file @ eee1dd00
...@@ -44,21 +44,19 @@ static void FilterS32N (audio_volume_t *vol, block_t *block, float volume) ...@@ -44,21 +44,19 @@ static void FilterS32N (audio_volume_t *vol, block_t *block, float volume)
{ {
int32_t *p = (int32_t *)block->p_buffer; int32_t *p = (int32_t *)block->p_buffer;
int32_t mult = lroundf (volume * 0x1.p24f); int_fast32_t mult = lroundf (volume * 0x1.p24f);
if (mult == (1 << 24)) if (mult == (1 << 24))
return; return;
for (size_t n = block->i_buffer / sizeof (*p); n > 0; n--) for (size_t n = block->i_buffer / sizeof (*p); n > 0; n--)
{ {
int64_t s = *p * (int64_t)mult; int_fast64_t s = (*p * (int_fast64_t)mult) >> INT64_C(24);
if (s >= ((int64_t)INT32_MAX << INT64_C(24))) if (s > INT32_MAX)
*p = INT32_MAX; s = INT32_MAX;
else else
if (s < ((int64_t)INT32_MIN << INT64_C(24))) if (s < INT32_MIN)
*p = INT32_MIN; s = INT32_MIN;
else *(p++) = s;
*p = s >> INT64_C(24);
p++;
} }
(void) vol; (void) vol;
} }
...@@ -67,21 +65,19 @@ static void FilterS16N (audio_volume_t *vol, block_t *block, float volume) ...@@ -67,21 +65,19 @@ static void FilterS16N (audio_volume_t *vol, block_t *block, float volume)
{ {
int16_t *p = (int16_t *)block->p_buffer; int16_t *p = (int16_t *)block->p_buffer;
int16_t mult = lroundf (volume * 0x1.p8f); int_fast16_t mult = lroundf (volume * 0x1.p8f);
if (mult == (1 << 8)) if (mult == (1 << 8))
return; return;
for (size_t n = block->i_buffer / sizeof (*p); n > 0; n--) for (size_t n = block->i_buffer / sizeof (*p); n > 0; n--)
{ {
int32_t s = *p * (int32_t)mult; int_fast32_t s = (*p * (int_fast32_t)mult) >> 8;
if (s >= (INT16_MAX << 8)) if (s > INT16_MAX)
*p = INT16_MAX; s = INT16_MAX;
else
if (s < (INT16_MIN << 8))
*p = INT16_MIN;
else else
*p = s >> 8; if (s < INT16_MIN)
p++; s = INT16_MIN;
*(p++) = s;
} }
(void) vol; (void) vol;
} }
...@@ -90,21 +86,19 @@ static void FilterU8 (audio_volume_t *vol, block_t *block, float volume) ...@@ -90,21 +86,19 @@ static void FilterU8 (audio_volume_t *vol, block_t *block, float volume)
{ {
uint8_t *p = (uint8_t *)block->p_buffer; uint8_t *p = (uint8_t *)block->p_buffer;
int16_t mult = lroundf (volume * 0x1.p8f); int_fast16_t mult = lroundf (volume * 0x1.p8f);
if (mult == (1 << 8)) if (mult == (1 << 8))
return; return;
for (size_t n = block->i_buffer / sizeof (*p); n > 0; n--) for (size_t n = block->i_buffer / sizeof (*p); n > 0; n--)
{ {
int32_t s = (*p - 128) * mult; int_fast32_t s = (((int_fast8_t)(*p - 128)) * (int_fast32_t)mult) >> 8;
if (s >= (INT8_MAX << 8)) if (s > INT8_MAX)
*p = 255; s = INT8_MAX;
else
if (s < (INT8_MIN << 8))
*p = 0;
else else
*p = (s >> 8) + 128; if (s < INT8_MIN)
p++; s = INT8_MIN;
*(p++) = s + 128;
} }
(void) vol; (void) vol;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment