[xine-cvs] CVS: xine-lib/src/demuxers demux_real.c,1.87,1.88

[James S. <jst...@us...>]

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

Modified Files:
	demux_real.c 
Log Message:
Support for data packet header with version 1


Index: demux_real.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_real.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- demux_real.c	26 Jan 2004 19:40:12 -0000	1.87
+++ demux_real.c	29 Jan 2004 22:33:00 -0000	1.88
@@ -618,24 +618,19 @@
          (id == INDX_TAG))
         break;
       
-      /* Check that this is a "keyframe" data chunk - in some files
-       * there are multiple streams but only one set of keyframe data - 
-       * trying to play one without makes horrible noises */
-      if(search_buffer[offset + 11] & PN_KEYFRAME_FLAG) {
-        stream = BE_16(&search_buffer[offset + 4]);
-
-        for(i = 0; !this->video_stream && (i < this->num_video_streams); i++) {
-          if(stream == this->video_streams[i].mdpr->stream_number) {
-            this->video_stream = &this->video_streams[i];
-            lprintf("selecting video stream: %d\n", stream);
-          }
+      stream = BE_16(&search_buffer[offset + 4]);
+
+      for(i = 0; !this->video_stream && (i < this->num_video_streams); i++) {
+        if(stream == this->video_streams[i].mdpr->stream_number) {
+          this->video_stream = &this->video_streams[i];
+          lprintf("selecting video stream: %d\n", stream);
         }
+      }
       
-        for(i = 0; !this->audio_stream && (i < this->num_audio_streams); i++) {
-          if(stream == this->audio_streams[i].mdpr->stream_number) {
-            this->audio_stream = &this->audio_streams[i];
-            lprintf("selecting audio stream: %d\n", stream);
-          }
+      for(i = 0; !this->audio_stream && (i < this->num_audio_streams); i++) {
+        if(stream == this->audio_streams[i].mdpr->stream_number) {
+          this->audio_stream = &this->audio_streams[i];
+          lprintf("selecting audio stream: %d\n", stream);
         }
       }
 
@@ -935,7 +930,7 @@
 
   /* check version */
   version = BE_16(&header[0]);
-  if(version != 0) {
+  if(version > 1) {
     xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
             "unknown object version in data packet: 0x%04x\n", version);
     this->status = DEMUX_FINISHED;
@@ -948,7 +943,14 @@
   size     = BE_16(&header[2]) - DATA_PACKET_HEADER_SIZE;
   timestamp= BE_32(&header[6]);
   pts      = (int64_t) timestamp * 90;
-  keyframe = header[11] & PN_KEYFRAME_FLAG;
+  
+  /* Data packet header with version 1 contains 1 extra byte */
+  if(version == 0)
+    keyframe = header[11] & PN_KEYFRAME_FLAG;
+  else {
+    keyframe = stream_read_char(this) & PN_KEYFRAME_FLAG;
+    size--;
+  }
 
   lprintf ("packet of stream %d, 0x%X bytes @ %llX, pts = %lld%s\n",
            stream, size, offset, pts, keyframe ? ", keyframe" : "");