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

rewrite outputBuffer'ing abstraction a bit to be more effecient and easier

Browse Source 
to interface.  Also, use outputBuffer abstraction for ogg

git-svn-id: https://svn.musicpd.org/mpd/trunk@941 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes
2004-05-07 19:11:43 +00:00
parent 3794126e56
commit c9f0d22f0a
4 changed files with 64 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/outputBuffer.c
+43 -25
View File
@@ -24,39 +24,57 @@
#include <string.h>
long sendDataToOutputBuffer(OutputBuffer * cb, DecoderControl * dc,
int flushAllData, char * data, long datalen, float time,
mpd_uint16 bitRate)
{
long dataSent = 0;
long dataToSend;
while(datalen >= CHUNK_SIZE || (flushAllData && datalen)) {
dataToSend = datalen > CHUNK_SIZE ? CHUNK_SIZE : datalen;
while(cb->begin==cb->end && cb->wrap && !dc->stop && !dc->seek)
my_usleep(10000);
if(dc->stop) return OUTPUT_BUFFER_DC_STOP;
/* just for now, so it doesn't hang */
if(dc->seek) return OUTPUT_BUFFER_DC_SEEK;
/* be sure to remove this! */
memcpy(cb->chunks+cb->end*CHUNK_SIZE,data,dataToSend);
cb->chunkSize[cb->end] = dataToSend;
cb->bitRate[cb->end] = bitRate;
cb->times[cb->end] = time;
static mpd_sint16 currentChunk = -1;
void flushOutputBuffer(OutputBuffer * cb) {
if(currentChunk == cb->end) {
cb->end++;
if(cb->end>=buffered_chunks) {
cb->end = 0;
cb->wrap = 1;
cb->end = 0;
cb->wrap = 1;
}
currentChunk = -1;
}
}
int sendDataToOutputBuffer(OutputBuffer * cb, DecoderControl * dc,
char * data, long datalen, float time, mpd_uint16 bitRate)
{
mpd_uint16 dataToSend;
mpd_uint16 chunkLeft;
while(datalen) {
if(currentChunk != cb->end) {
while(cb->begin==cb->end && cb->wrap && !dc->stop &&
!dc->seek)
{
my_usleep(10000);
}
if(dc->stop) return OUTPUT_BUFFER_DC_STOP;
if(dc->seek) return OUTPUT_BUFFER_DC_SEEK;
currentChunk = cb->end;
cb->chunkSize[currentChunk] = 0;
}
chunkLeft = CHUNK_SIZE-cb->chunkSize[currentChunk];
dataToSend = datalen > chunkLeft ? chunkLeft : datalen;
memcpy(cb->chunks+currentChunk*CHUNK_SIZE+
cb->chunkSize[currentChunk],
data, dataToSend);
cb->chunkSize[currentChunk]+= dataToSend;
cb->bitRate[currentChunk] = bitRate;
cb->times[currentChunk] = time;
datalen-= dataToSend;
dataSent+= dataToSend;
data+= dataToSend;
if(cb->chunkSize[currentChunk] == CHUNK_SIZE) {
flushOutputBuffer(cb);
}
}
return dataSent;
return 0;
}
/* vim:set shiftwidth=4 tabstop=8 expandtab: */