alex
/
libnyquist
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

move some common free functions to cpp

Browse Source
adpcm
Dimitri Diakopoulos 11 years ago
parent 6499bc7455
commit e22b9cb960
2 changed files with 88 additions and 81 deletions
Show Stats Download Patch File Download Diff File

83
include/libnyquist/Common.h
Unescape Escape View File

@ -187,89 +187,10 @@ enum PCMFormat
// Src data is aligned to PCMFormat
// @todo normalize?
inline void ConvertToFloat32(float * dst, const uint8_t * src, const size_t N, PCMFormat f)
{
assert(f != PCM_END);
if (f == PCM_U8)
{
const uint8_t * dataPtr = reinterpret_cast<const uint8_t *>(src);
for (size_t i = 0; i < N; ++i)
dst[i] = uint8_to_float32(dataPtr[i]);
}
else if (f == PCM_S8)
{
const int8_t * dataPtr = reinterpret_cast<const int8_t *>(src);
for (size_t i = 0; i < N; ++i)
dst[i] = int8_to_float32(dataPtr[i]);
}
else if (f == PCM_16)
{
const int16_t * dataPtr = reinterpret_cast<const int16_t *>(src);
for (size_t i = 0; i < N; ++i)
dst[i] = int16_to_float32(Read16(dataPtr[i]));
}
else if (f == PCM_24)
{
const uint8_t * dataPtr = reinterpret_cast<const uint8_t *>(src);
size_t c = 0;
for (size_t i = 0; i < N; ++i)
{
int32_t sample = Pack(dataPtr[c], dataPtr[c+1], dataPtr[c+2]);
dst[i] = int24_to_float32(sample); // Packed types don't need addtional endian helpers
c += 3;
}
}
else if (f == PCM_32)
{
const int32_t * dataPtr = reinterpret_cast<const int32_t *>(src);
for (size_t i = 0; i < N; ++i)
dst[i] = int32_to_float32(Read32(dataPtr[i]));
}
//@todo add int64 format
else if (f == PCM_FLT)
{
const float * dataPtr = reinterpret_cast<const float *>(src);
for (size_t i = 0; i < N; ++i)
dst[i] = (float) Read32(dataPtr[i]);
}
else if (f == PCM_DBL)
{
const double * dataPtr = reinterpret_cast<const double *>(src);
for (size_t i = 0; i < N; ++i)
dst[i] = (float) Read64(dataPtr[i]);
}
}
void ConvertToFloat32(float * dst, const uint8_t * src, const size_t N, PCMFormat f);
// Src data is always aligned to 4 bytes (WavPack, primarily)
inline void ConvertToFloat32(float * dst, const int32_t * src, const size_t N, PCMFormat f)
{
assert(f != PCM_END);
if (f == PCM_16)
{
for (size_t i = 0; i < N; ++i)
dst[i] = int16_to_float32(Read32(src[i]));
}
else if (f == PCM_24)
{
const uint8_t * dataPtr = reinterpret_cast<const uint8_t *>(src);
size_t c = 0;
for (size_t i = 0; i < N; ++i)
{
int32_t sample = Pack(dataPtr[c], dataPtr[c+1], dataPtr[c+2]);
dst[i] = int24_to_float32(sample);
c += 4; // +4 for next 4 byte boundary
}
}
else if (f == PCM_32)
{
for (size_t i = 0; i < N; ++i)
dst[i] = int32_to_float32(Read32(src[i]));
}
}
void ConvertToFloat32(float * dst, const int32_t * src, const size_t N, PCMFormat f);
//////////////////////////
// User Data + File Ops //

86
src/Common.cpp
Unescape Escape View File

@ -34,3 +34,89 @@ NyquistFileBuffer nqr::ReadFile(std::string pathToFile)
// Copy out to user
return data;
}
// Src data is aligned to PCMFormat
// @todo normalize?
void nqr::ConvertToFloat32(float * dst, const uint8_t * src, const size_t N, PCMFormat f)
{
assert(f != PCM_END);
if (f == PCM_U8)
{
const uint8_t * dataPtr = reinterpret_cast<const uint8_t *>(src);
for (size_t i = 0; i < N; ++i)
dst[i] = uint8_to_float32(dataPtr[i]);
}
else if (f == PCM_S8)
{
const int8_t * dataPtr = reinterpret_cast<const int8_t *>(src);
for (size_t i = 0; i < N; ++i)
dst[i] = int8_to_float32(dataPtr[i]);
}
else if (f == PCM_16)
{
const int16_t * dataPtr = reinterpret_cast<const int16_t *>(src);
for (size_t i = 0; i < N; ++i)
dst[i] = int16_to_float32(Read16(dataPtr[i]));
}
else if (f == PCM_24)
{
const uint8_t * dataPtr = reinterpret_cast<const uint8_t *>(src);
size_t c = 0;
for (size_t i = 0; i < N; ++i)
{
int32_t sample = Pack(dataPtr[c], dataPtr[c+1], dataPtr[c+2]);
dst[i] = int24_to_float32(sample); // Packed types don't need addtional endian helpers
c += 3;
}
}
else if (f == PCM_32)
{
const int32_t * dataPtr = reinterpret_cast<const int32_t *>(src);
for (size_t i = 0; i < N; ++i)
dst[i] = int32_to_float32(Read32(dataPtr[i]));
}
//@todo add int64 format
else if (f == PCM_FLT)
{
const float * dataPtr = reinterpret_cast<const float *>(src);
for (size_t i = 0; i < N; ++i)
dst[i] = (float) Read32(dataPtr[i]);
}
else if (f == PCM_DBL)
{
const double * dataPtr = reinterpret_cast<const double *>(src);
for (size_t i = 0; i < N; ++i)
dst[i] = (float) Read64(dataPtr[i]);
}
}
// Src data is always aligned to 4 bytes (WavPack, primarily)
void nqr::ConvertToFloat32(float * dst, const int32_t * src, const size_t N, PCMFormat f)
{
assert(f != PCM_END);
if (f == PCM_16)
{
for (size_t i = 0; i < N; ++i)
dst[i] = int16_to_float32(Read32(src[i]));
}
else if (f == PCM_24)
{
const uint8_t * dataPtr = reinterpret_cast<const uint8_t *>(src);
size_t c = 0;
for (size_t i = 0; i < N; ++i)
{
int32_t sample = Pack(dataPtr[c], dataPtr[c+1], dataPtr[c+2]);
dst[i] = int24_to_float32(sample);
c += 4; // +4 for next 4 byte boundary
}
}
else if (f == PCM_32)
{
for (size_t i = 0; i < N; ++i)
dst[i] = int32_to_float32(Read32(src[i]));
}
}

Write Preview
Loading…
Cancel
Save