Carltonus/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Faster Ogg reading (~2.5x in extremely unoptimised builds)

Browse Source 
This was SVN commit r1408.
This commit is contained in:
Ykkrosh 2004-11-27 04:14:34 +00:00
parent fe54b3deeb
commit d9f30a5d42
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
source/lib/res/snd.cpp
View File

@ -968,23 +968,22 @@ std::vector<u8> data;
data.reserve(500000); data.reserve(500000);
if(file_type == FT_OGG) if(file_type == FT_OGG)
{ {
sd->o = ogg_create(); sd->o = ogg_create();
ogg_give_raw(sd->o, file, file_size); ogg_give_raw(sd->o, file, file_size);
ogg_open(sd->o, sd->al_fmt, sd->al_freq); ogg_open(sd->o, sd->al_fmt, sd->al_freq);
size_t datasize=0; size_t datasize=0;
size_t bytes_read; size_t bytes_read;
do do
{ {
const size_t bufsize = 32*KB; const size_t bufsize = 32*KB;
char buf[bufsize]; char buf[bufsize];
bytes_read = ogg_read(sd->o, buf, bufsize); bytes_read = ogg_read(sd->o, buf, bufsize);
data.resize(data.size() + bytes_read); data.insert(data.end(), &buf[0], &buf[bytes_read]);
for(size_t i = 0; i < bytes_read; i++) data[datasize+i] = buf[i]; datasize += bytes_read;
datasize += bytes_read; }
} while(bytes_read > 0);
while(bytes_read > 0); al_data = &data[0];
al_data = &data[0]; al_size = (ALsizei)datasize;
al_size = (ALsizei)datasize;
} }
#endif #endif