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

decoder: rewind input stream after try_decode()

Browse Source 
The try_decode() method may have read some data from the stream, which
is now lost.  To make this data available to other methods, get it
back by rewinding the input stream after each try_decode() invocation.

The ogg and wavpack plugins did this manually and inconsistently; this
code can now be removed.
This commit is contained in:
Max Kellermann 2008-11-02 17:10:02 +01:00
parent 395aa4e847
commit 2124df1390
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/decoder/_ogg_common.c
View File

@ -30,13 +30,7 @@ ogg_stream_type ogg_stream_type_detect(struct input_stream *inStream)
unsigned char buf[41];
size_t r;
input_stream_seek(inStream, 0, SEEK_SET);
r = decoder_read(NULL, inStream, buf, sizeof(buf));
if (r > 0)
input_stream_seek(inStream, 0, SEEK_SET);
if (r >= 32 && memcmp(buf, "OggS", 4) == 0 && (
(memcmp(buf+29, "FLAC", 4) == 0
&& memcmp(buf+37, "fLaC", 4) == 0)

2
src/decoder/wavpack_plugin.c
View File

@ -424,8 +424,6 @@ static bool wavpack_trydecode(struct input_stream *is)
return false;
WavpackCloseFile(wpc);
/* Seek it back in order to play from the first byte. */
input_stream_seek(is, 0, SEEK_SET);
return true;
}

9
src/decoder_thread.c
View File

@ -32,10 +32,17 @@ static bool
decoder_try_decode(const struct decoder_plugin *plugin,
struct input_stream *input_stream)
{
bool ret;
if (plugin->try_decode == NULL)
return true;
return plugin->try_decode(input_stream);
ret = plugin->try_decode(input_stream);
/* rewind the stream, so the next reader gets a fresh start */
input_stream_seek(input_stream, 0, SEEK_SET);
return ret;
}
static void decodeStart(void)