[xiph-commits] r9601 - in trunk/ogg: . src

[giles at svn.xiph.org]

Author: giles
Date: 2005-07-22 17:19:14 -0700 (Fri, 22 Jul 2005)
New Revision: 9601

Modified:
   trunk/ogg/CHANGES
   trunk/ogg/src/framing.c
Log:
Correct the test case data to expect a granulepos of -1 on pages where
no packet ends. The spec is clear about this but the unit tests assumed
the old behaviour (carry over the previous granulepos) was correct.

I did not verify the new CRC values by hand however, they are just copied
from the library output.

Also update changelog for the bug fix.


Modified: trunk/ogg/CHANGES
===================================================================
--- trunk/ogg/CHANGES	2005-07-22 17:17:13 UTC (rev 9600)
+++ trunk/ogg/CHANGES	2005-07-23 00:19:14 UTC (rev 9601)
@@ -1,3 +1,7 @@
+Version 1.1.3 (unreleased)
+
+ * Correct a bug in the granulepos field of pages where no packet ends
+
 Version 1.1.2 (2004 September 23)
 
  * fix a bug with multipage packet assembly after seek

Modified: trunk/ogg/src/framing.c
===================================================================
--- trunk/ogg/src/framing.c	2005-07-22 17:17:13 UTC (rev 9600)
+++ trunk/ogg/src/framing.c	2005-07-23 00:19:14 UTC (rev 9601)
@@ -1079,9 +1079,9 @@
 		       0};
 
 const int head2_4[] = {0x4f,0x67,0x67,0x53,0,0x00,
-		       0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		       0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
 		       0x01,0x02,0x03,0x04,1,0,0,0,
-		       0x34,0x24,0xd5,0x29,
+		       0x54,0x05,0x51,0xc8,
 		       17,
 		       255,255,255,255,255,255,255,255,
 		       255,255,255,255,255,255,255,255,255};
@@ -1165,9 +1165,9 @@
 		       255,255,255,255,255,255,255,255};
 
 const int head3_6[] = {0x4f,0x67,0x67,0x53,0,0x01,
-		       0x07,0x04,0x00,0x00,0x00,0x00,0x00,0x00,
+		       0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
 		       0x01,0x02,0x03,0x04,2,0,0,0,
-		       0xbd,0xd5,0xb5,0x8b,
+		       0x01,0xd2,0xe5,0xe5,
 		       17,
 		       255,255,255,255,255,255,255,255,
 		       255,255,255,255,255,255,255,255,255};