mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix an audio_stream issue

Browse Source 
occurs when pcmwaveformat's cksize is larger than sizeof pcmwaveformat
This commit is contained in:
Jinhao
2015-07-30 23:26:56 +08:00
parent 8490e05497
commit 8bf35968ef
2 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
include/nana/audio/detail/audio_stream.hpp
View File

@@ -12,19 +12,19 @@ namespace nana{ namespace audio{
#pragma pack(1)
struct master_riff_chunk
{
unsigned long ckID; //"RIFF"
unsigned long cksize;
unsigned long waveID; //"WAVE"
unsigned ckID; //"RIFF"
unsigned cksize;
unsigned waveID; //"WAVE"
};
struct format_chunck
{
unsigned long ckID; //"fmt "
unsigned long cksize;
unsigned ckID; //"fmt "
unsigned cksize;
unsigned short wFormatTag;
unsigned short nChannels;
unsigned long nSamplePerSec;
unsigned long nAvgBytesPerSec;
unsigned nSamplePerSec;
unsigned nAvgBytesPerSec;
unsigned short nBlockAlign;
unsigned short wBitsPerSample;
};
@@ -32,19 +32,19 @@ namespace nana{ namespace audio{
#elif defined(NANA_LINUX)
struct master_riff_chunk
{
unsigned long ckID; //"RIFF"
unsigned long cksize;
unsigned long waveID; //"WAVE"
unsigned ckID; //"RIFF"
unsigned cksize;
unsigned waveID; //"WAVE"
}__attribute__((packed));
struct format_chunck
{
unsigned long ckID; //"fmt "
unsigned long cksize;
unsigned ckID; //"fmt "
unsigned cksize;
unsigned short wFormatTag;
unsigned short nChannels;
unsigned long nSamplePerSec;
unsigned long nAvgBytesPerSec;
unsigned nSamplePerSec;
unsigned nAvgBytesPerSec;
unsigned short nBlockAlign;
unsigned short wBitsPerSample;
}__attribute__((packed));
@@ -55,8 +55,8 @@ namespace nana{ namespace audio{
{
struct chunck
{
unsigned long ckID;
unsigned long cksize;
unsigned ckID;
unsigned cksize;
};
public:
bool open(const nana::string& file);