[xiph-cvs] cvs commit: ogg/src framing.c

Monty xiphmont at xiph.org
Wed May 23 22:17:14 PDT 2001



xiphmont    01/05/23 22:17:14

  Modified:    src      framing.c
  Log:
  Decided to alter behavior of packetpeek slightly:
  
  packetpeek can report -1 indicating a hole in the data (not really an
  error).
  
  Previously, packetout would have to be called to clear the hole; now,
  the hole is cleared by packetpeek.  That is, the change is that
  ogg_stream_packetpeek must be followed by a call to
  ogg_stream_packetout(state,NULL) to continue advancing forward only if
  packetpeek returned a packet.

Revision  Changes    Path
1.13      +3 -5      ogg/src/framing.c

Index: framing.c
===================================================================
RCS file: /usr/local/cvsroot/ogg/src/framing.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- framing.c	2001/05/24 01:04:36	1.12
+++ framing.c	2001/05/24 05:17:14	1.13
@@ -12,7 +12,7 @@
 
  function: code raw [Vorbis] packets into framed OggSquish stream and
            decode Ogg streams back into raw packets
- last mod: $Id: framing.c,v 1.12 2001/05/24 01:04:36 xiphmont Exp $
+ last mod: $Id: framing.c,v 1.13 2001/05/24 05:17:14 xiphmont Exp $
 
  note: The CRC code is directly derived from public domain code by
  Ross Williams (ross at guest.adelaide.edu.au).  See docs/framing.html
@@ -779,10 +779,8 @@
   if(os->lacing_vals[ptr]&0x400){
     /* we need to tell the codec there's a gap; it might need to
        handle previous packet dependencies. */
-    if(adv){
-      os->lacing_returned++;
-      os->packetno++;
-    }
+    os->lacing_returned++;
+    os->packetno++;
     return(-1);
   }
 

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.



More information about the commits mailing list