Revert "Perform some checks on the Xing header, and reject it if it looks funny,"

This reverts commit 2c6f649b82e91bda20648083b3b4cef25b7c792c.

diff --git a/fileformats/mp3/parser/src/mp3parser.cpp b/fileformats/mp3/parser/src/mp3parser.cpp
index ba8e59c..6590925 100644 (file)
--- a/fileformats/mp3/parser/src/mp3parser.cpp
+++ b/fileformats/mp3/parser/src/mp3parser.cpp
@@ -47,9 +47,6 @@
 // Initial search range, resetted to the file size once valid mp3
 // frame is found
 #define KMAX_INITIAL_SEARCH_FILE_SIZE_IN_BYTES  500000
-// If the Xing header reports a size that is smaller than the file length
-// by this much, consider the Xing header invalid.
-#define XING_SIZE_FUZZINESS 0.90
 
 /***********************************************************************
  * Global constant definitions
@@ -1077,32 +1074,6 @@ bool  MP3Parser::DecodeXINGHeader(uint8 *XingBuffer,
     {
         mp3XingHD.bytes = SwapFileToHostByteOrderInt32(pBuf);
         pBuf += 4;
-
-        if (head_flags & FRAMES_FLAG)
-        {
-            // check if the number of frames and the number of
-            // bytes roughly match up
-            int bytesperframe = mp3XingHD.bytes / mp3XingHD.frames;
-            // 52 and 1440 are the minimum and maximum number of bytes per frame for
-            // a compliant mp3 stream (8kbps@22050Hz and 320kbps@32000Hz respectively)
-            if (bytesperframe < 52 || bytesperframe > 1440)
-            {
-                head_flags = mp3XingHD.flags = 0;
-            }
-        }
-        if (iLocalFileSize != 0)
-        {
-            // check if the number of bytes and the file size roughly
-            // match up
-            if (mp3XingHD.bytes > iLocalFileSize)
-            {
-                head_flags = mp3XingHD.flags = 0;
-            }
-            if (mp3XingHD.bytes < iLocalFileSize * XING_SIZE_FUZZINESS)
-            {
-                head_flags = mp3XingHD.flags = 0;
-            }
-        }
     }
 
     if (head_flags & TOC_FLAG)
@@ -1120,10 +1091,7 @@ bool  MP3Parser::DecodeXINGHeader(uint8 *XingBuffer,
         mp3XingHD.vbr_scale = SwapFileToHostByteOrderInt32(pBuf);
         pBuf += 4;;
     }
-    if (head_flags & FRAMES_FLAG)
-    {
-        iNumberOfFrames = mp3XingHD.frames;
-    }
+    iNumberOfFrames = mp3XingHD.frames;
     return true;
 }