added remaining *_to_float()

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@3419 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
beveloper 2003-06-04 00:27:48 +00:00
parent 7ca83dacf0
commit 88e430cbeb

View File

@ -91,7 +91,7 @@ Resampler::float_to_float(const void *_src, int32 src_sample_offset, int32 src_s
return; return;
} }
register double delta = double(src_sample_count) / double(dst_sample_offset); register float delta = float(src_sample_count) / float(dst_sample_offset);
register float current = 0.0f; register float current = 0.0f;
if (delta < 1.0) { if (delta < 1.0) {
@ -127,24 +127,204 @@ void
Resampler::int32_to_float(const void *_src, int32 src_sample_offset, int32 src_sample_count, Resampler::int32_to_float(const void *_src, int32 src_sample_offset, int32 src_sample_count,
void *_dst, int32 dst_sample_offset, int32 dst_sample_count, float _gain) void *_dst, int32 dst_sample_offset, int32 dst_sample_count, float _gain)
{ {
register const char * src = (const char *) _src;
register char * dst = (char *) _dst;
register int32 count = dst_sample_count;
register float gain = _gain / 2147483647.0;
if (src_sample_count == dst_sample_count) {
// optimized case for no resampling
while (count--) {
*(float *)dst = *(const int32 *)src * gain;
src += src_sample_offset;
dst += dst_sample_offset;
}
return;
}
register float delta = float(src_sample_count) / float(dst_sample_offset);
register float current = 0.0f;
if (delta < 1.0) {
// upsample
while (count--) {
*(float *)dst = *(const int32 *)src * gain;
dst += dst_sample_offset;
current += delta;
if (current > 1.0f) {
current -= 1.0f;
src += src_sample_offset;
}
}
} else {
// downsample
while (count--) {
*(float *)dst = *(const int32 *)src * gain;
src += src_sample_offset;
current += delta; // delta is always > 1.0
if (current < 2.0f) {
current -= 1.0f;
dst += dst_sample_offset;
} else {
int32 inc_count = (int32) current;
current -= (float) inc_count;
dst += inc_count * dst_sample_offset;
}
}
}
} }
void void
Resampler::int16_to_float(const void *_src, int32 src_sample_offset, int32 src_sample_count, Resampler::int16_to_float(const void *_src, int32 src_sample_offset, int32 src_sample_count,
void *_dst, int32 dst_sample_offset, int32 dst_sample_count, float _gain) void *_dst, int32 dst_sample_offset, int32 dst_sample_count, float _gain)
{ {
register const char * src = (const char *) _src;
register char * dst = (char *) _dst;
register int32 count = dst_sample_count;
register float gain = _gain / 32767.0;
if (src_sample_count == dst_sample_count) {
// optimized case for no resampling
while (count--) {
*(float *)dst = *(const int16 *)src * gain;
src += src_sample_offset;
dst += dst_sample_offset;
}
return;
}
register float delta = float(src_sample_count) / float(dst_sample_offset);
register float current = 0.0f;
if (delta < 1.0) {
// upsample
while (count--) {
*(float *)dst = *(const int16 *)src * gain;
dst += dst_sample_offset;
current += delta;
if (current > 1.0f) {
current -= 1.0f;
src += src_sample_offset;
}
}
} else {
// downsample
while (count--) {
*(float *)dst = *(const int16 *)src * gain;
src += src_sample_offset;
current += delta; // delta is always > 1.0
if (current < 2.0f) {
current -= 1.0f;
dst += dst_sample_offset;
} else {
int32 inc_count = (int32) current;
current -= (float) inc_count;
dst += inc_count * dst_sample_offset;
}
}
}
} }
void void
Resampler::int8_to_float(const void *_src, int32 src_sample_offset, int32 src_sample_count, Resampler::int8_to_float(const void *_src, int32 src_sample_offset, int32 src_sample_count,
void *_dst, int32 dst_sample_offset, int32 dst_sample_count, float _gain) void *_dst, int32 dst_sample_offset, int32 dst_sample_count, float _gain)
{ {
register const char * src = (const char *) _src;
register char * dst = (char *) _dst;
register int32 count = dst_sample_count;
register float gain = _gain / 127.0;
if (src_sample_count == dst_sample_count) {
// optimized case for no resampling
while (count--) {
*(float *)dst = *(const int8 *)src * gain;
src += src_sample_offset;
dst += dst_sample_offset;
}
return;
}
register float delta = float(src_sample_count) / float(dst_sample_offset);
register float current = 0.0f;
if (delta < 1.0) {
// upsample
while (count--) {
*(float *)dst = *(const int8 *)src * gain;
dst += dst_sample_offset;
current += delta;
if (current > 1.0f) {
current -= 1.0f;
src += src_sample_offset;
}
}
} else {
// downsample
while (count--) {
*(float *)dst = *(const int8 *)src * gain;
src += src_sample_offset;
current += delta; // delta is always > 1.0
if (current < 2.0f) {
current -= 1.0f;
dst += dst_sample_offset;
} else {
int32 inc_count = (int32) current;
current -= (float) inc_count;
dst += inc_count * dst_sample_offset;
}
}
}
} }
void void
Resampler::uint8_to_float(const void *_src, int32 src_sample_offset, int32 src_sample_count, Resampler::uint8_to_float(const void *_src, int32 src_sample_offset, int32 src_sample_count,
void *_dst, int32 dst_sample_offset, int32 dst_sample_count, float _gain) void *_dst, int32 dst_sample_offset, int32 dst_sample_count, float _gain)
{ {
register const char * src = (const char *) _src;
register char * dst = (char *) _dst;
register int32 count = dst_sample_count;
register float gain = _gain / 127.0;
if (src_sample_count == dst_sample_count) {
// optimized case for no resampling
while (count--) {
*(float *)dst = (((int32) *(const uint8 *)src) - 128) * gain;
src += src_sample_offset;
dst += dst_sample_offset;
}
return;
}
register float delta = float(src_sample_count) / float(dst_sample_offset);
register float current = 0.0f;
if (delta < 1.0) {
// upsample
while (count--) {
*(float *)dst = (((int32) *(const uint8 *)src) - 128) * gain;
dst += dst_sample_offset;
current += delta;
if (current > 1.0f) {
current -= 1.0f;
src += src_sample_offset;
}
}
} else {
// downsample
while (count--) {
*(float *)dst = (((int32) *(const uint8 *)src) - 128) * gain;
src += src_sample_offset;
current += delta; // delta is always > 1.0
if (current < 2.0f) {
current -= 1.0f;
dst += dst_sample_offset;
} else {
int32 inc_count = (int32) current;
current -= (float) inc_count;
dst += inc_count * dst_sample_offset;
}
}
}
} }
void void