[xine-cvs] CVS: xine-lib/src/demuxers demux_asf.c,1.83,1.84

[Thibaut M. <tma...@us...>]

Update of /cvsroot/xine/xine-lib/src/demuxers
In directory sc8-pr-cvs1:/tmp/cvs-serv10626

Modified Files:
	demux_asf.c 
Log Message:
Big update :
  - more complete guid list from avifile
  - use the property that asf packets have a constant size to detect the first byte of a packet
  - some other ideas from MPlayer

It should demux more streams now.

For example, xine can play these streams now :
  http://xine.sourceforge.net/thibaut/problems/jutecity.asf
  mms://vip7.yacast.fr/encoderouifm (small french rock radio at 16kBit/s)
    (ffmpeg fails to decode it, you need to use win32 dll to hear something)

Tell me if you can break it.
Comments ?




Index: demux_asf.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_asf.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- demux_asf.c	28 Nov 2002 10:21:05 -0000	1.83
+++ demux_asf.c	1 Dec 2002 17:07:17 -0000	1.84
@@ -24,6 +24,9 @@
  * based on ffmpeg's
  * ASF compatible encoder and decoder.
  * Copyright (c) 2000, 2001 Gerard Lantau.
+ *
+ * GUID list from avifile
+ * some other ideas from MPlayer
  */
 
 #ifdef HAVE_CONFIG_H
@@ -43,17 +46,71 @@
 /*
[...1376 lines suppressed...]
   }
 
   /*
@@ -1306,6 +1551,7 @@
     this->buf_flag_seek = 1;
   }
 
+  printf("demux_asf: demux_asf_seek end\n");
   return this->status;
 }
 
@@ -1355,7 +1601,7 @@
       } else
 	return NULL;
     }      
-    if (memcmp(buf, &asf_header, sizeof(GUID)))
+    if (memcmp(buf, &guids[GUID_ASF_HEADER].guid, sizeof(GUID)))
       return NULL;
       
 #ifdef LOG