[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-datatype-cvs
Subject:    [Datatype-cvs] mp3/fileformat mp3ff.cpp,1.58.2.7.4.8,1.58.2.7.4.9
From:       ching_li () helixcommunity ! org
Date:       2010-09-30 2:22:43
Message-ID: 201009300224.o8U2O2o1020488 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/datatype/mp3/fileformat
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv11268

Modified Files:
      Tag: hxclient_3_6_1_atlas
	mp3ff.cpp 
Log Message:
Fix Bug #10679: The bug happens when there are a lot of junk information in file \
header, so that the player can not find the sync word in a block of buffered data, \
then it causes a INVALID_FILE error. I modified the CRnMp3Fmt::InitStream_n function \
to ignore all unknown data until found a valid frame. I think it would not bring \
other problems except to waste a few time on type checking.


Index: mp3ff.cpp
===================================================================
RCS file: /cvsroot/datatype/mp3/fileformat/mp3ff.cpp,v
retrieving revision 1.58.2.7.4.8
retrieving revision 1.58.2.7.4.9
diff -u -d -r1.58.2.7.4.8 -r1.58.2.7.4.9
--- mp3ff.cpp	10 Sep 2010 01:25:28 -0000	1.58.2.7.4.8
+++ mp3ff.cpp	30 Sep 2010 02:22:41 -0000	1.58.2.7.4.9
@@ -2965,8 +2965,10 @@
     }
     else
     {
-        hr = HXR_INVALID_FILE;
-        return (UINT16)-1;
+        // Ignore unknown data
+        m_ulFileOffset += dwSize;
+        m_ulBytesRead = m_ulFileOffset;
+        return 0;
     }
     }
 }


_______________________________________________
Datatype-cvs mailing list
Datatype-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/datatype-cvs


[prev in list] [next in list] [prev in thread] [next in thread]