fenix
/
exhale
mirror of https://gitlab.com/ecodis/exhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

allow side-chan 5.1

This commit is contained in:
Christian R. Helmrich 2024-05-28 10:00:00 +02:00
parent 14cdd94f9e
commit a6193fab2d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/app/basicWavReader.cpp
View File

@ -41,7 +41,7 @@ static inline unsigned getFrames (const int fileHandle, void* dataBuf, const uns
return bytesRead / bytesPerFrame; // num of frames read return bytesRead / bytesPerFrame; // num of frames read
} }
static const uint8_t allowedChMask[7] = {0x00, 0x04, 0xC0, 0x00, 0x00, 0x37, 0xCF}; static const uint8_t allowedChMask[8] = {0x00, 0x04, 0xC0, 0x00, 0x00, 0x37, 0xCF, 0xFF};
// private reader functions // private reader functions
bool BasicWavReader::readRiffHeader () bool BasicWavReader::readRiffHeader ()
@ -76,8 +76,9 @@ bool BasicWavReader::readFormatChunk ()
(b[17] == 0) && (b[18] <= b[14]) && ((b[19] | b[25] | b[26] | b[27] | b[28] | b[29] | b[31] | b[33] | b[34] | b[36]) == 0)) (b[17] == 0) && (b[18] <= b[14]) && ((b[19] | b[25] | b[26] | b[27] | b[28] | b[29] | b[31] | b[33] | b[34] | b[36]) == 0))
{ {
m_waveDataType = WAV_TYPE (b[24]-1); // extensible WAV m_waveDataType = WAV_TYPE (b[24]-1); // extensible WAV
if ((b[18] + 8u <= b[14]) || (b[20] != 0 && b[20] != (m_waveChannels < 7 ? allowedChMask[m_waveChannels] : 0) && if (b[21] == 6) b[20] |= 3 << (m_waveChannels - 2);
b[20] != (1u << __min (8u, m_waveChannels)) - 1u)) return false; // no unusual or nonstandard channel configs if ((b[18] + 8u <= b[14]) || (b[20] != 0 && b[20] != allowedChMask[__min (7, m_waveChannels)] &&
b[20] != (1u << __min (8, m_waveChannels)) - 1u)) return false;
b[14] = b[18]; b[14] = b[18];
b[ 1] = 0; b[ 1] = 0;
} }