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

moved code to function tailChunk()

Browse Source 
This patch removes some clutter from decodeParent() by moving some
code out.

git-svn-id: https://svn.musicpd.org/mpd/trunk@7247 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Max Kellermann
2008-04-12 04:11:23 +00:00
committed by Eric Wong
parent 63b55b9a48
commit 1ecebd4686
1 changed files with 58 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/outputBuffer.c
+58 -33
View File
@@ -57,6 +57,54 @@ void flushOutputBuffer(OutputBuffer * cb)
} }
} }
/**
* Return the tail chunk has room for additional data. If there is no
* room in the queue, this function blocks until the player thread has
* finished playing its current chunk.
*
* @return the positive index of the new chunk; OUTPUT_BUFFER_DC_SEEK
* if another thread requested seeking; OUTPUT_BUFFER_DC_STOP if
* another thread requested stopping the decoder.
*/
static int tailChunk(OutputBuffer * cb, InputStream * inStream,
DecoderControl * dc, int seekable,
float data_time, mpd_uint16 bitRate)
{
unsigned int next;
if (currentChunk == cb->end)
return currentChunk;
next = cb->end + 1;
if (next >= buffered_chunks) {
next = 0;
}
while (cb->begin == next && !dc->stop) {
if (dc->seek) {
if (seekable) {
return OUTPUT_BUFFER_DC_SEEK;
} else {
dc->seekError = 1;
dc->seek = 0;
decoder_wakeup_player();
}
}
if (!inStream ||
bufferInputStream(inStream) <= 0) {
decoder_sleep();
}
}
if (dc->stop)
return OUTPUT_BUFFER_DC_STOP;
currentChunk = cb->end;
cb->chunkSize[currentChunk] = 0;
cb->bitRate[currentChunk] = bitRate;
cb->times[currentChunk] = data_time;
return currentChunk;
}
int sendDataToOutputBuffer(OutputBuffer * cb, InputStream * inStream, int sendDataToOutputBuffer(OutputBuffer * cb, InputStream * inStream,
DecoderControl * dc, int seekable, void *dataIn, DecoderControl * dc, int seekable, void *dataIn,
size_t dataInLen, float data_time, mpd_uint16 bitRate, size_t dataInLen, float data_time, mpd_uint16 bitRate,
@@ -93,45 +141,22 @@ int sendDataToOutputBuffer(OutputBuffer * cb, InputStream * inStream,
normalizeData(data, datalen, &cb->audioFormat); normalizeData(data, datalen, &cb->audioFormat);
while (datalen) { while (datalen) {
if (currentChunk != cb->end) { int chunk_index = tailChunk(cb, inStream,
unsigned int next = cb->end + 1; dc, seekable,
if (next >= buffered_chunks) { data_time, bitRate);
next = 0; if (chunk_index < 0)
} return chunk_index;
while (cb->begin == next && !dc->stop) {
if (dc->seek) {
if (seekable) {
return OUTPUT_BUFFER_DC_SEEK;
} else {
dc->seekError = 1;
dc->seek = 0;
decoder_wakeup_player();
}
}
if (!inStream ||
bufferInputStream(inStream) <= 0) {
decoder_sleep();
}
}
if (dc->stop)
return OUTPUT_BUFFER_DC_STOP;
currentChunk = cb->end; chunkLeft = CHUNK_SIZE - cb->chunkSize[chunk_index];
cb->chunkSize[currentChunk] = 0;
cb->bitRate[currentChunk] = bitRate;
cb->times[currentChunk] = data_time;
}
chunkLeft = CHUNK_SIZE - cb->chunkSize[currentChunk];
dataToSend = datalen > chunkLeft ? chunkLeft : datalen; dataToSend = datalen > chunkLeft ? chunkLeft : datalen;
memcpy(cb->chunks + currentChunk * CHUNK_SIZE + memcpy(cb->chunks + chunk_index * CHUNK_SIZE +
cb->chunkSize[currentChunk], data, dataToSend); cb->chunkSize[chunk_index], data, dataToSend);
cb->chunkSize[currentChunk] += dataToSend; cb->chunkSize[chunk_index] += dataToSend;
datalen -= dataToSend; datalen -= dataToSend;
data += dataToSend; data += dataToSend;
if (cb->chunkSize[currentChunk] == CHUNK_SIZE) { if (cb->chunkSize[chunk_index] == CHUNK_SIZE) {
flushOutputBuffer(cb); flushOutputBuffer(cb);
} }
} }