[xine-cvs] CVS: xine-lib/src/demuxers demux_aac.c,1.11,1.12

[Darren S. <ds...@us...>]

Update of /cvsroot/xine/xine-lib/src/demuxers
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29428/src/demuxers

Modified Files:
	demux_aac.c 
Log Message:
Make the misdetection of audio data as AAC less likely.
(Should fix playback of some MP3 files, at least.)

Index: demux_aac.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_aac.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- demux_aac.c	11 Mar 2006 09:21:25 -0000	1.11
+++ demux_aac.c	14 Nov 2006 21:51:32 -0000	1.12
@@ -108,8 +108,12 @@
 
     if ((frame_size > 0) &&
         (this->data_start+frame_size < MAX_PREVIEW_SIZE-1) &&
-        (peak[this->data_start+frame_size] == 0xff) &&
-        ((peak[this->data_start+frame_size+1] & 0xf6) == 0xf0)) {
+        /* first 28 bits must be identical */
+        (peak[this->data_start  ]   ==peak[this->data_start+frame_size  ]) &&
+        (peak[this->data_start+1]   ==peak[this->data_start+frame_size+1]) &&
+        (peak[this->data_start+2]   ==peak[this->data_start+frame_size+2]) &&
+        (peak[this->data_start+3]>>4==peak[this->data_start+frame_size+3]>>4))
+    {
       lprintf("found second ADTS header\n");
 
       _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 0);