Skip to content

M
miniaudio
Commit 7a0c89bd authored by David Reid's avatar David Reid
Browse files
Options

Update dr_wav.

parent 88071f0c
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 9 deletions
extras/dr_wav.h
View file @ 7a0c89bd
// WAV audio loader and writer. Public domain. See "unlicense" statement at the end of this file. // WAV audio loader and writer. Public domain. See "unlicense" statement at the end of this file.
// dr_wav - v0.7 - 2017-11-04 // dr_wav - v0.7a - 2017-11-17
// //
// David Reid - mackron@gmail.com // David Reid - mackron@gmail.com
...@@ -2469,11 +2469,10 @@ void drwav_f32_to_s16(drwav_int16* pOut, const float* pIn, size_t sampleCount) ...@@ -2469,11 +2469,10 @@ void drwav_f32_to_s16(drwav_int16* pOut, const float* pIn, size_t sampleCount)
for (size_t i = 0; i < sampleCount; ++i) { for (size_t i = 0; i < sampleCount; ++i) {
float x = pIn[i]; float x = pIn[i];
float c; float c;
int s;
c = ((x < -1) ? -1 : ((x > 1) ? 1 : x)); c = ((x < -1) ? -1 : ((x > 1) ? 1 : x));
s = ((*((int*)&x)) & 0x80000000) >> 31; c = c + 1;
s = s + 32767; r = (int)(c * 32767.5f);
r = (int)(c * s); r = r - 32768;
pOut[i] = (short)r; pOut[i] = (short)r;
} }
} }
...@@ -2484,11 +2483,10 @@ void drwav_f64_to_s16(drwav_int16* pOut, const double* pIn, size_t sampleCount) ...@@ -2484,11 +2483,10 @@ void drwav_f64_to_s16(drwav_int16* pOut, const double* pIn, size_t sampleCount)
for (size_t i = 0; i < sampleCount; ++i) { for (size_t i = 0; i < sampleCount; ++i) {
double x = pIn[i]; double x = pIn[i];
double c; double c;
int s;
c = ((x < -1) ? -1 : ((x > 1) ? 1 : x)); c = ((x < -1) ? -1 : ((x > 1) ? 1 : x));
s = (int)(((*((drwav_uint64*)&x)) & (drwav_uint64)0x8000000000000000) >> 63); c = c + 1;
s = s + 32767; r = (int)(c * 32767.5);
r = (int)(c * s); r = r - 32768;
pOut[i] = (short)r; pOut[i] = (short)r;
} }
} }
...@@ -3356,6 +3354,9 @@ void drwav_free(void* pDataReturnedByOpenAndRead) ...@@ -3356,6 +3354,9 @@ void drwav_free(void* pDataReturnedByOpenAndRead)
// REVISION HISTORY // REVISION HISTORY
// //
// v0.7a - 2017-11-17
// - Fix some GCC warnings.
//
// v0.7 - 2017-11-04 // v0.7 - 2017-11-04
// - Add writing APIs. // - Add writing APIs.
// //
......
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