Changeset 1925 for branches

Timestamp:

24/10/06 18:17:34 (2 years ago)

Author:

duncan

Message:

[ 1568261 ] MP3 header search slow as hell
Patch applied

Location:

branches/mmpython-0-4/mmpython/audio/eyeD3

Files:

• mp3.py (modified) (1 diff)
• tag.py (modified) (1 diff)

branches/mmpython-0-4/mmpython/audio/eyeD3/mp3.py

@@ -123 +123 @@
       return 1;
 
+   def find(self, buffer):
+      idx = buffer.find("\xff")
+      while idx != -1:
+         candidate = buffer[idx:idx+4]
+         if len(candidate) < 4:
+            return None
+
+         header = bin2dec(bytes2bin(candidate))
+         if self.isValid(header):
+            return header
+
+         idx = buffer.find("\xff", idx + 1)
+
    # This may throw an Mp3Exception if the header is malformed.
    def decode(self, header):

branches/mmpython-0-4/mmpython/audio/eyeD3/tag.py

@@ -1321 +1321 @@
          raise InvalidAudioFormatException("Unable to find a valid mp3 "\
                                            "frame");
-      frameHead = bin2dec(bytes2bin(bString));
       header = eyeD3_mp3.Header();
+      frameHead = header.find(bString)
       # Keep reading until we find a valid mp3 frame header.
-      while not header.isValid(frameHead):
-         frameHead <<= 8;
-         bString = f.read(1);
-         if len(bString) != 1:
+      while not frameHead:
+         bString = bString[-3:] + f.read(4096);
+         if len(bString) <= 3:
             raise InvalidAudioFormatException("Unable to find a valid mp3 "\
                                               "frame");
-         frameHead |= ord(bString[0]);
+         frameHead = header.find(bString)
       TRACE_MSG("mp3 header %x found at position: %d (0x%x)" % \
                 (frameHead, f.tell() - 4, f.tell() - 4));