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

oggvorbis: don't detect OGG header if stream is not seekable

Browse Source 
If the input stream is not seekable, the try_decode() function
consumes valuable data, which is not available to the decode()
function anymore.  This means that the decode() function does not
parse the header correctly.  Better skip the detection if we cannot
seek.  Or implement better buffering, something like unread() or
buffered rewind().
This commit is contained in:
Max Kellermann 2008-08-26 08:27:13 +02:00
parent 7bbca0842d
commit a1b430cb88
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/inputPlugins/oggflac_plugin.c
View File

@ -328,6 +328,11 @@ static MpdTag *oggflac_TagDup(char *file)
static unsigned int oggflac_try_decode(InputStream * inStream)
{
if (!inStream->seekable)
/* we cannot seek after the detection, so don't bother
checking */
return 1;
return (ogg_stream_type_detect(inStream) == FLAC) ? 1 : 0;
}

5
src/inputPlugins/oggvorbis_plugin.c
View File

@ -372,6 +372,11 @@ static MpdTag *oggvorbis_TagDup(char *file)
static unsigned int oggvorbis_try_decode(InputStream * inStream)
{
if (!inStream->seekable)
/* we cannot seek after the detection, so don't bother
checking */
return 1;
return (ogg_stream_type_detect(inStream) == VORBIS) ? 1 : 0;
}