ogg: Always search for the last page finishing a packet to get the la…

…st abolsute granule position. Fixes quodlibet#308 This fixes cases where the length of the ogg stream was reported as some small negative value.
lazka · Jun 1, 2017 · b09768e · b09768e
1 parent da39c1e
commit b09768e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/mutagen/oggflac.py b/mutagen/oggflac.py
@@ -79,7 +79,9 @@ def __init__(self, fileobj):
     def _post_tags(self, fileobj):
         if self.length:
             return
-        page = OggPage.find_last(fileobj, self.serial)
+        page = OggPage.find_last(fileobj, self.serial, finishing=True)
+        if page is None:
+            raise OggFLACHeaderError
         self.length = page.position / float(self.sample_rate)
 
     def pprint(self):

diff --git a/mutagen/oggopus.py b/mutagen/oggopus.py
@@ -69,7 +69,7 @@ def __init__(self, fileobj):
             raise OggOpusHeaderError("version %r unsupported" % major)
 
     def _post_tags(self, fileobj):
-        page = OggPage.find_last(fileobj, self.serial)
+        page = OggPage.find_last(fileobj, self.serial, finishing=True)
         if page is None:
             raise OggOpusHeaderError
         self.length = (page.position - self.__pre_skip) / float(48000)

diff --git a/mutagen/oggspeex.py b/mutagen/oggspeex.py
@@ -64,7 +64,7 @@ def __init__(self, fileobj):
         self.serial = page.serial
 
     def _post_tags(self, fileobj):
-        page = OggPage.find_last(fileobj, self.serial)
+        page = OggPage.find_last(fileobj, self.serial, finishing=True)
         if page is None:
             raise OggSpeexHeaderError
         self.length = page.position / float(self.sample_rate)

diff --git a/mutagen/oggtheora.py b/mutagen/oggtheora.py
@@ -67,7 +67,7 @@ def __init__(self, fileobj):
         self.serial = page.serial
 
     def _post_tags(self, fileobj):
-        page = OggPage.find_last(fileobj, self.serial)
+        page = OggPage.find_last(fileobj, self.serial, finishing=True)
         if page is None:
             raise OggTheoraHeaderError
         position = page.position

diff --git a/mutagen/oggvorbis.py b/mutagen/oggvorbis.py
@@ -83,7 +83,7 @@ def __init__(self, fileobj):
     def _post_tags(self, fileobj):
         """Raises ogg.error"""
 
-        page = OggPage.find_last(fileobj, self.serial)
+        page = OggPage.find_last(fileobj, self.serial, finishing=True)
         if page is None:
             raise OggVorbisHeaderError
         self.length = page.position / float(self.sample_rate)