oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

calculate bytes_per_channel, check for buffer flush once

Browse Source 
Check for flushing the chunk buffer only once per sample, before
iterating over channels and bytes.  This saves another 5% CPU cycles.

git-svn-id: https://svn.musicpd.org/mpd/trunk@7326 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Max Kellermann 2008-04-12 04:20:06 +00:00 committed by Eric Wong
parent 51e9044098
commit 0673c9a84d
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/inputPlugins/flac_plugin.c
View File

@ -217,6 +217,8 @@ static FLAC__StreamDecoderWriteStatus flacWrite(const flac_decoder *dec,
unsigned char *uc; unsigned char *uc;
unsigned int c_samp, c_chan; unsigned int c_samp, c_chan;
const unsigned int bytes_per_sample = (data->dc->audioFormat.bits / 8); const unsigned int bytes_per_sample = (data->dc->audioFormat.bits / 8);
const unsigned int bytes_per_channel =
bytes_per_sample * frame->header.channels;
unsigned int i; unsigned int i;
float timeChange; float timeChange;
FLAC__uint64 newPosition = 0; FLAC__uint64 newPosition = 0;
@ -238,22 +240,23 @@ static FLAC__StreamDecoderWriteStatus flacWrite(const flac_decoder *dec,
data->position = newPosition; data->position = newPosition;
for (c_samp = 0; c_samp < frame->header.blocksize; c_samp++) { for (c_samp = 0; c_samp < frame->header.blocksize; c_samp++) {
if (data->chunk_length + bytes_per_channel >= FLAC_CHUNK_SIZE) {
if (flacSendChunk(data) < 0) {
return
FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
}
data->chunk_length = 0;
if (data->dc->seek) {
return
FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
}
}
for (c_chan = 0; c_chan < frame->header.channels; for (c_chan = 0; c_chan < frame->header.channels;
c_chan++) { c_chan++) {
u16 = buf[c_chan][c_samp]; u16 = buf[c_chan][c_samp];
uc = (unsigned char *)&u16; uc = (unsigned char *)&u16;
for (i = 0; i < bytes_per_sample; i++) { for (i = 0; i < bytes_per_sample; i++) {
if (data->chunk_length >= FLAC_CHUNK_SIZE) {
if (flacSendChunk(data) < 0) {
return
FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
}
data->chunk_length = 0;
if (data->dc->seek) {
return
FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
}
}
data->chunk[data->chunk_length++] = *(uc++); data->chunk[data->chunk_length++] = *(uc++);
} }
} }