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

buffer input while waiting for outputBuffer space in mp4 and (ogg)flac

Browse Source 
Both mp4 and (ogg)flac inputPlugins got HTTP inputStream support
later in the game, so their calls to sendDataToOutputBuffer()
didn't get updated to support buffering while the outputBuffer
was full.  This fixes it.

git-svn-id: https://svn.musicpd.org/mpd/trunk@6873 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Eric Wong 2007-09-10 07:12:42 +00:00
parent 54339dfbc2
commit 8b141ae54e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/inputPlugins/_flac_common.h
View File

@ -172,7 +172,8 @@ MpdTag *copyVorbisCommentBlockToMpdTag(const FLAC__StreamMetadata * block,
/* keep this inlined, this is just macro but prettier :) */
static inline int flacSendChunk(FlacData * data)
{
if (sendDataToOutputBuffer(data->cb, NULL, data->dc, 1, data->chunk,
if (sendDataToOutputBuffer(data->cb, data->inStream,
data->dc, 1, data->chunk,
data->chunk_length, data->time,
data->bitRate,
data->replayGainInfo) ==

2
src/inputPlugins/mp4_plugin.c
View File

@ -285,7 +285,7 @@ static int mp4_decode(OutputBuffer * cb, DecoderControl * dc,
sampleBuffer += offset * channels * 2;
sendDataToOutputBuffer(cb, NULL, dc, 1, sampleBuffer,
sendDataToOutputBuffer(cb, inStream, dc, 1, sampleBuffer,
sampleBufferLen, time, bitRate, NULL);
if (dc->stop) {
eof = 1;