Mirror/aicodix___dsp
1
0
Fork 0
mirror of https://github.com/aicodix/dsp.git synced 2026-04-27 14:30:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

added info methods to PCM interface and WAV reader

Browse source
This commit is contained in:
Ahmet Inan 2018-08-08 14:55:11 +02:00
commit acdb28bdd7
2 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
pcm.hh
View file

@ -21,6 +21,9 @@ struct ReadPCM
{
virtual void read(TYPE *, int, int) = 0;
virtual void skip(int) = 0;
virtual int rate() = 0;
virtual int channels() = 0;
virtual int frames() { return -1; }
};
}

27
wav.hh
View file

@ -16,7 +16,7 @@ template <typename TYPE>
class ReadWAV : public ReadPCM<TYPE>
{
std::ifstream is;
int bits, bytes, rate, channels;
int bits, bytes, rate_, channels_, frames_;
int offset, factor;
int readLE(int b)
{
@ -58,17 +58,17 @@ public:
int AudioFormat = readLE(2);
if (AudioFormat != 1)
return;
channels = readLE(2);
rate = readLE(4);
channels_ = readLE(2);
rate_ = readLE(4);
int ByteRate = readLE(4);
int BlockAlign = readLE(2);
bits = readLE(2);
if (bits != 8 && bits != 16 && bits != 24 && bits != 32)
return;
bytes = bits / 8;
if (bytes * channels != BlockAlign)
if (bytes * channels_ != BlockAlign)
return;
if (rate * bytes * channels != ByteRate)
if (rate_ * bytes * channels_ != ByteRate)
return;
char Subchunk2ID[4];
is.read(Subchunk2ID, 4);
@ -77,6 +77,7 @@ public:
int Subchunk2Size = readLE(4);
if (36 + Subchunk2Size != ChunkSize)
return;
frames_ = Subchunk2Size / (bytes * channels_);
switch (bits) {
case 8:
@ -102,14 +103,26 @@ public:
void read(TYPE *buf, int num, int stride = 1)
{
for (int n = 0; n < num; ++n) {
for (int c = 0; c < channels; ++c) {
for (int c = 0; c < channels_; ++c) {
buf[stride * n + c] = TYPE(readLE(bytes) - offset) / TYPE(factor);
}
}
}
void skip(int num)
{
is.seekg(num * channels * bytes, std::ios_base::cur);
is.seekg(num * channels_ * bytes, std::ios_base::cur);
}
int frames()
{
return frames_;
}
int channels()
{
return channels_;
}
int rate()
{
return rate_;
}
};