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

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().

oggvorbis: don't detect OGG header if stream is not seekable
a1b430cb · Max Kellermann · 7bbca084 · a1b430cb · a1b430cb
Commit a1b430cb authored Aug 26, 2008 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 0 deletions

oggflac_plugin.c src/inputPlugins/oggflac_plugin.c +5 -0

oggvorbis_plugin.c src/inputPlugins/oggvorbis_plugin.c +5 -0

No files found.
--- a/src/inputPlugins/oggflac_plugin.c
+++ b/src/inputPlugins/oggflac_plugin.c
@@ -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;
 }


--- a/src/inputPlugins/oggvorbis_plugin.c
+++ b/src/inputPlugins/oggvorbis_plugin.c
@@ -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;
 }