OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- there's no need to let the XM Vorbis decoder run through the client - all related functionality is part of ZMusic itself.

Browse source
This commit is contained in:
Christoph Oelckers 2020-01-01 20:58:15 +01:00
commit 527fb40a5f
8 changed files with 42 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

36
libraries/zmusic/decoder/sounddecoder.cpp
View file

@ -79,3 +79,39 @@ std::vector<uint8_t> SoundDecoder::readAll()
output.resize(total);
return output;
}
//==========================================================================
//
// other callbacks
//
//==========================================================================
extern "C"
short* dumb_decode_vorbis(int outlen, const void* oggstream, int sizebytes)
{
short* samples = (short*)calloc(1, outlen);
ChannelConfig chans;
SampleType type;
int srate;
// The decoder will take ownership of the reader if it succeeds so this may not be a local variable.
MusicIO::MemoryReader* reader = new MusicIO::MemoryReader((const uint8_t*)oggstream, sizebytes);
SoundDecoder* decoder = SoundDecoder::CreateDecoder(reader);
if (!decoder)
{
reader->close();
return samples;
}
decoder->getInfo(&srate, &chans, &type);
if (chans != ChannelConfig_Mono || type != SampleType_Int16)
{
delete decoder;
return samples;
}
decoder->read((char*)samples, outlen);
delete decoder;
return samples;
}