projects / platform / upstream / libvorbis.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b816bfb)
continue elimination of gcc-isms from selftests
authorMonty <xiphmont@xiph.org>
Fri, 7 Jul 2000 01:35:31 +0000 (01:35 +0000)
committerMonty <xiphmont@xiph.org>
Fri, 7 Jul 2000 01:35:31 +0000 (01:35 +0000)
svn path=/trunk/vorbis/; revision=515

lib/framing.c patch | blob | history

diff --git a/lib/framing.c b/lib/framing.c
index 3524496..1ec7de7 100644 (file)
--- a/lib/framing.c
+++ b/lib/framing.c
@@ -13,7 +13,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.19 2000/07/07 01:20:46 xiphmont Exp $
+ last mod: $Id: framing.c,v 1.20 2000/07/07 01:35:31 xiphmont Exp $
 
  note: The CRC code is directly derived from public domain code by
  Ross Williams (ross@guest.adelaide.edu.au).  See docs/framing.html
@@ -870,6 +870,192 @@ void error(void){
   exit(1);
 }
 
+/* 17 only */
+const int head1_0[] = {0x4f,0x67,0x67,0x53,0,0x06,
+                      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+                      0x01,0x02,0x03,0x04,0,0,0,0,
+                      0x15,0xed,0xec,0x91,
+                      1,
+                      17};
+
+/* 17, 254, 255, 256, 500, 510, 600 byte, pad */
+const int head1_1[] = {0x4f,0x67,0x67,0x53,0,0x02,
+                      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+                      0x01,0x02,0x03,0x04,0,0,0,0,
+                      0x59,0x10,0x6c,0x2c,
+                      1,
+                      17};
+const int head2_1[] = {0x4f,0x67,0x67,0x53,0,0x04,
+                      0x07,0x18,0x00,0x00,0x00,0x00,0x00,0x00,
+                      0x01,0x02,0x03,0x04,1,0,0,0,
+                      0x89,0x33,0x85,0xce,
+                      13,
+                      254,255,0,255,1,255,245,255,255,0,
+                      255,255,90};
+
+/* nil packets; beginning,middle,end */
+const int head1_2[] = {0x4f,0x67,0x67,0x53,0,0x02,
+                      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+                      0x01,0x02,0x03,0x04,0,0,0,0,
+                      0xff,0x7b,0x23,0x17,
+                      1,
+                      0};
+const int head2_2[] = {0x4f,0x67,0x67,0x53,0,0x04,
+                      0x07,0x28,0x00,0x00,0x00,0x00,0x00,0x00,
+                      0x01,0x02,0x03,0x04,1,0,0,0,
+                      0x5c,0x3f,0x66,0xcb,
+                      17,
+                      17,254,255,0,0,255,1,0,255,245,255,255,0,
+                      255,255,90,0};
+
+/* large initial packet */
+const int head1_3[] = {0x4f,0x67,0x67,0x53,0,0x02,
+                      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+                      0x01,0x02,0x03,0x04,0,0,0,0,
+                      0x01,0x27,0x31,0xaa,
+                      18,
+                      255,255,255,255,255,255,255,255,
+                      255,255,255,255,255,255,255,255,255,10};
+
+const int head2_3[] = {0x4f,0x67,0x67,0x53,0,0x04,
+                      0x07,0x08,0x00,0x00,0x00,0x00,0x00,0x00,
+                      0x01,0x02,0x03,0x04,1,0,0,0,
+                      0x7f,0x4e,0x8a,0xd2,
+                      4,
+                      255,4,255,0};
+
+
+/* continuing packet test */
+const int head1_4[] = {0x4f,0x67,0x67,0x53,0,0x02,
+                      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+                      0x01,0x02,0x03,0x04,0,0,0,0,
+                      0xff,0x7b,0x23,0x17,
+                      1,
+                      0};
+
+const int head2_4[] = {0x4f,0x67,0x67,0x53,0,0x00,
+                      0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+                      0x01,0x02,0x03,0x04,1,0,0,0,
+                      0x34,0x24,0xd5,0x29,
+                      17,
+                      255,255,255,255,255,255,255,255,
+                      255,255,255,255,255,255,255,255,255};
+
+const int head3_4[] = {0x4f,0x67,0x67,0x53,0,0x05,
+                      0x07,0x0c,0x00,0x00,0x00,0x00,0x00,0x00,
+                      0x01,0x02,0x03,0x04,2,0,0,0,
+                      0xc8,0xc3,0xcb,0xed,
+                      5,
+                      10,255,4,255,0};
+
+
+/* page with the 255 segment limit */
+const int head1_5[] = {0x4f,0x67,0x67,0x53,0,0x02,
+                      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+                      0x01,0x02,0x03,0x04,0,0,0,0,
+                      0xff,0x7b,0x23,0x17,
+                      1,
+                      0};
+
+const int head2_5[] = {0x4f,0x67,0x67,0x53,0,0x00,
+                      0x07,0xfc,0x03,0x00,0x00,0x00,0x00,0x00,
+                      0x01,0x02,0x03,0x04,1,0,0,0,
+                      0xed,0x2a,0x2e,0xa7,
+                      255,
+                      10,10,10,10,10,10,10,10,
+                      10,10,10,10,10,10,10,10,
+                      10,10,10,10,10,10,10,10,
+                      10,10,10,10,10,10,10,10,
+                      10,10,10,10,10,10,10,10,
+                      10,10,10,10,10,10,10,10,
+                      10,10,10,10,10,10,10,10,
+                      10,10,10,10,10,10,10,10,
+                      10,10,10,10,10,10,10,10,
+                      10,10,10,10,10,10,10,10,
+                      10,10,10,10,10,10,10,10,
+                      10,10,10,10,10,10,10,10,
+                      10,10,10,10,10,10,10,10,
+                      10,10,10,10,10,10,10,10,
+                      10,10,10,10,10,10,10,10,
+                      10,10,10,10,10,10,10,10,
+                      10,10,10,10,10,10,10,10,
+                      10,10,10,10,10,10,10,10,
+                      10,10,10,10,10,10,10,10,
+                      10,10,10,10,10,10,10,10,
+                      10,10,10,10,10,10,10,10,
+                      10,10,10,10,10,10,10,10,
+                      10,10,10,10,10,10,10,10,
+                      10,10,10,10,10,10,10,10,
+                      10,10,10,10,10,10,10,10,
+                      10,10,10,10,10,10,10,10,
+                      10,10,10,10,10,10,10,10,
+                      10,10,10,10,10,10,10,10,
+                      10,10,10,10,10,10,10,10,
+                      10,10,10,10,10,10,10,10,
+                      10,10,10,10,10,10,10,10,
+                      10,10,10,10,10,10,10};
+
+const int head3_5[] = {0x4f,0x67,0x67,0x53,0,0x04,
+                      0x07,0x00,0x04,0x00,0x00,0x00,0x00,0x00,
+                      0x01,0x02,0x03,0x04,2,0,0,0,
+                      0x6c,0x3b,0x82,0x3d,
+                      1,
+                      50};
+
+
+/* packet that overspans over an entire page */
+const int head1_6[] = {0x4f,0x67,0x67,0x53,0,0x02,
+                      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+                      0x01,0x02,0x03,0x04,0,0,0,0,
+                      0xff,0x7b,0x23,0x17,
+                      1,
+                      0};
+
+const int head2_6[] = {0x4f,0x67,0x67,0x53,0,0x00,
+                      0x07,0x04,0x00,0x00,0x00,0x00,0x00,0x00,
+                      0x01,0x02,0x03,0x04,1,0,0,0,
+                      0x3c,0xd9,0x4d,0x3f,
+                      17,
+                      100,255,255,255,255,255,255,255,255,
+                      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,
+                      0x01,0x02,0x03,0x04,2,0,0,0,
+                      0xbd,0xd5,0xb5,0x8b,
+                      17,
+                      255,255,255,255,255,255,255,255,
+                      255,255,255,255,255,255,255,255,255};
+
+const int head4_6[] = {0x4f,0x67,0x67,0x53,0,0x05,
+                      0x07,0x10,0x00,0x00,0x00,0x00,0x00,0x00,
+                      0x01,0x02,0x03,0x04,3,0,0,0,
+                      0xef,0xdd,0x88,0xde,
+                      7,
+                      255,255,75,255,4,255,0};
+
+/* packet that overspans over an entire page */
+const int head1_7[] = {0x4f,0x67,0x67,0x53,0,0x02,
+                      0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+                      0x01,0x02,0x03,0x04,0,0,0,0,
+                      0xff,0x7b,0x23,0x17,
+                      1,
+                      0};
+
+const int head2_7[] = {0x4f,0x67,0x67,0x53,0,0x00,
+                      0x07,0x04,0x00,0x00,0x00,0x00,0x00,0x00,
+                      0x01,0x02,0x03,0x04,1,0,0,0,
+                      0x3c,0xd9,0x4d,0x3f,
+                      17,
+                      100,255,255,255,255,255,255,255,255,
+                      255,255,255,255,255,255,255,255};
+
+const int head3_7[] = {0x4f,0x67,0x67,0x53,0,0x05,
+                      0x07,0x08,0x00,0x00,0x00,0x00,0x00,0x00,
+                      0x01,0x02,0x03,0x04,2,0,0,0,
+                      0xd4,0xe0,0x60,0xe5,
+                      1,0};
+
 void test_pack(const int *pl, const int **headers){
   unsigned char *data=malloc(1024*1024); /* for scripted test cases only */
   long inptr=0;
@@ -1023,13 +1209,7 @@ int main(void){
   {
     /* 17 only */
     const int packets[]={17, -1};
-    const int head1[] = {0x4f,0x67,0x67,0x53,0,0x06,
-                  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                  0x01,0x02,0x03,0x04,0,0,0,0,
-                  0x15,0xed,0xec,0x91,
-                  1,
-                  17};
-    const int *headret[]={head1,NULL};
+    const int *headret[]={head1_0,NULL};
     
     fprintf(stderr,"testing single page encoding... ");
     test_pack(packets,headret);
@@ -1038,20 +1218,7 @@ int main(void){
   {
     /* 17, 254, 255, 256, 500, 510, 600 byte, pad */
     const int packets[]={17, 254, 255, 256, 500, 510, 600, -1};
-    const int head1[] = {0x4f,0x67,0x67,0x53,0,0x02,
-                  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                  0x01,0x02,0x03,0x04,0,0,0,0,
-                  0x59,0x10,0x6c,0x2c,
-                  1,
-                   17};
-    const int head2[] = {0x4f,0x67,0x67,0x53,0,0x04,
-                  0x07,0x18,0x00,0x00,0x00,0x00,0x00,0x00,
-                  0x01,0x02,0x03,0x04,1,0,0,0,
-                  0x89,0x33,0x85,0xce,
-                  13,
-                  254,255,0,255,1,255,245,255,255,0,
-                  255,255,90};
-    const int *headret[]={head1,head2,NULL};
+    const int *headret[]={head1_1,head2_1,NULL};
     
     fprintf(stderr,"testing basic page encoding... ");
     test_pack(packets,headret);
@@ -1060,21 +1227,7 @@ int main(void){
   {
     /* nil packets; beginning,middle,end */
     const int packets[]={0,17, 254, 255, 0, 256, 0, 500, 510, 600, 0, -1};
-
-    const int head1[] = {0x4f,0x67,0x67,0x53,0,0x02,
-                  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                  0x01,0x02,0x03,0x04,0,0,0,0,
-                  0xff,0x7b,0x23,0x17,
-                  1,
-                  0};
-    const int head2[] = {0x4f,0x67,0x67,0x53,0,0x04,
-                  0x07,0x28,0x00,0x00,0x00,0x00,0x00,0x00,
-                  0x01,0x02,0x03,0x04,1,0,0,0,
-                  0x5c,0x3f,0x66,0xcb,
-                  17,
-                  17,254,255,0,0,255,1,0,255,245,255,255,0,
-                  255,255,90,0};
-    const int *headret[]={head1,head2,NULL};
+    const int *headret[]={head1_2,head2_2,NULL};
     
     fprintf(stderr,"testing basic nil packets... ");
     test_pack(packets,headret);
@@ -1083,22 +1236,7 @@ int main(void){
   {
     /* large initial packet */
     const int packets[]={4345,259,255,-1};
-
-    const int head1[] = {0x4f,0x67,0x67,0x53,0,0x02,
-                  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                  0x01,0x02,0x03,0x04,0,0,0,0,
-                  0x01,0x27,0x31,0xaa,
-                  18,
-                  255,255,255,255,255,255,255,255,
-                  255,255,255,255,255,255,255,255,255,10};
-
-    const int head2[] = {0x4f,0x67,0x67,0x53,0,0x04,
-                  0x07,0x08,0x00,0x00,0x00,0x00,0x00,0x00,
-                  0x01,0x02,0x03,0x04,1,0,0,0,
-                  0x7f,0x4e,0x8a,0xd2,
-                  4,
-                  255,4,255,0};
-    const int *headret[]={head1,head2,NULL};
+    const int *headret[]={head1_3,head2_3,NULL};
     
     fprintf(stderr,"testing initial-packet lacing > 4k... ");
     test_pack(packets,headret);
@@ -1107,29 +1245,7 @@ int main(void){
   {
     /* continuing packet test */
     const int packets[]={0,4345,259,255,-1};
-
-    const int head1[] = {0x4f,0x67,0x67,0x53,0,0x02,
-                  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                  0x01,0x02,0x03,0x04,0,0,0,0,
-                  0xff,0x7b,0x23,0x17,
-                  1,
-                  0};
-
-    const int head2[] = {0x4f,0x67,0x67,0x53,0,0x00,
-                  0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                  0x01,0x02,0x03,0x04,1,0,0,0,
-                  0x34,0x24,0xd5,0x29,
-                  17,
-                  255,255,255,255,255,255,255,255,
-                  255,255,255,255,255,255,255,255,255};
-
-    const int head3[] = {0x4f,0x67,0x67,0x53,0,0x05,
-                  0x07,0x0c,0x00,0x00,0x00,0x00,0x00,0x00,
-                  0x01,0x02,0x03,0x04,2,0,0,0,
-                  0xc8,0xc3,0xcb,0xed,
-                  5,
-                  10,255,4,255,0};
-    const int *headret[]={head1,head2,head3,NULL};
+    const int *headret[]={head1_4,head2_4,head3_4,NULL};
     
     fprintf(stderr,"testing single packet page span... ");
     test_pack(packets,headret);
@@ -1170,59 +1286,7 @@ int main(void){
                   10,10,10,10,10,10,10,10,
                   10,10,10,10,10,10,10,10,
                   10,10,10,10,10,10,10,50,-1};
-
-    const int head1[] = {0x4f,0x67,0x67,0x53,0,0x02,
-                  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                  0x01,0x02,0x03,0x04,0,0,0,0,
-                  0xff,0x7b,0x23,0x17,
-                  1,
-                  0};
-
-    const int head2[] = {0x4f,0x67,0x67,0x53,0,0x00,
-                  0x07,0xfc,0x03,0x00,0x00,0x00,0x00,0x00,
-                  0x01,0x02,0x03,0x04,1,0,0,0,
-                  0xed,0x2a,0x2e,0xa7,
-                  255,
-                  10,10,10,10,10,10,10,10,
-                  10,10,10,10,10,10,10,10,
-                  10,10,10,10,10,10,10,10,
-                  10,10,10,10,10,10,10,10,
-                  10,10,10,10,10,10,10,10,
-                  10,10,10,10,10,10,10,10,
-                  10,10,10,10,10,10,10,10,
-                  10,10,10,10,10,10,10,10,
-                  10,10,10,10,10,10,10,10,
-                  10,10,10,10,10,10,10,10,
-                  10,10,10,10,10,10,10,10,
-                  10,10,10,10,10,10,10,10,
-                  10,10,10,10,10,10,10,10,
-                  10,10,10,10,10,10,10,10,
-                  10,10,10,10,10,10,10,10,
-                  10,10,10,10,10,10,10,10,
-                  10,10,10,10,10,10,10,10,
-                  10,10,10,10,10,10,10,10,
-                  10,10,10,10,10,10,10,10,
-                  10,10,10,10,10,10,10,10,
-                  10,10,10,10,10,10,10,10,
-                  10,10,10,10,10,10,10,10,
-                  10,10,10,10,10,10,10,10,
-                  10,10,10,10,10,10,10,10,
-                  10,10,10,10,10,10,10,10,
-                  10,10,10,10,10,10,10,10,
-                  10,10,10,10,10,10,10,10,
-                  10,10,10,10,10,10,10,10,
-                  10,10,10,10,10,10,10,10,
-                  10,10,10,10,10,10,10,10,
-                  10,10,10,10,10,10,10,10,
-                  10,10,10,10,10,10,10};
-
-    const int head3[] = {0x4f,0x67,0x67,0x53,0,0x04,
-                  0x07,0x00,0x04,0x00,0x00,0x00,0x00,0x00,
-                  0x01,0x02,0x03,0x04,2,0,0,0,
-                  0x6c,0x3b,0x82,0x3d,
-                  1,
-                  50};
-    const int *headret[]={head1,head2,head3,NULL};
+    const int *headret[]={head1_5,head2_5,head3_5,NULL};
     
     fprintf(stderr,"testing max packet segments... ");
     test_pack(packets,headret);
@@ -1230,39 +1294,8 @@ int main(void){
 
   {
     /* packet that overspans over an entire page */
-
     const int packets[]={0,100,9000,259,255,-1};
-
-    const int head1[] = {0x4f,0x67,0x67,0x53,0,0x02,
-                  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                  0x01,0x02,0x03,0x04,0,0,0,0,
-                  0xff,0x7b,0x23,0x17,
-                  1,
-                  0};
-
-    const int head2[] = {0x4f,0x67,0x67,0x53,0,0x00,
-                  0x07,0x04,0x00,0x00,0x00,0x00,0x00,0x00,
-                  0x01,0x02,0x03,0x04,1,0,0,0,
-                  0x3c,0xd9,0x4d,0x3f,
-                  17,
-                  100,255,255,255,255,255,255,255,255,
-                  255,255,255,255,255,255,255,255};
-
-    const int head3[] = {0x4f,0x67,0x67,0x53,0,0x01,
-                  0x07,0x04,0x00,0x00,0x00,0x00,0x00,0x00,
-                  0x01,0x02,0x03,0x04,2,0,0,0,
-                  0xbd,0xd5,0xb5,0x8b,
-                  17,
-                  255,255,255,255,255,255,255,255,
-                  255,255,255,255,255,255,255,255,255};
-
-    const int head4[] = {0x4f,0x67,0x67,0x53,0,0x05,
-                  0x07,0x10,0x00,0x00,0x00,0x00,0x00,0x00,
-                  0x01,0x02,0x03,0x04,3,0,0,0,
-                  0xef,0xdd,0x88,0xde,
-                  7,
-                  255,255,75,255,4,255,0};
-    const int *headret[]={head1,head2,head3,head4,NULL};
+    const int *headret[]={head1_6,head2_6,head3_6,head4_6,NULL};
     
     fprintf(stderr,"testing very large packets... ");
     test_pack(packets,headret);
@@ -1270,31 +1303,8 @@ int main(void){
 
   {
     /* term only page.  why not? */
-
     const int packets[]={0,100,4080,-1};
-
-    const int head1[] = {0x4f,0x67,0x67,0x53,0,0x02,
-                  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                  0x01,0x02,0x03,0x04,0,0,0,0,
-                  0xff,0x7b,0x23,0x17,
-                  1,
-                  0};
-
-    const int head2[] = {0x4f,0x67,0x67,0x53,0,0x00,
-                  0x07,0x04,0x00,0x00,0x00,0x00,0x00,0x00,
-                  0x01,0x02,0x03,0x04,1,0,0,0,
-                  0x3c,0xd9,0x4d,0x3f,
-                  17,
-                  100,255,255,255,255,255,255,255,255,
-                  255,255,255,255,255,255,255,255};
-
-    const int head3[] = {0x4f,0x67,0x67,0x53,0,0x05,
-                  0x07,0x08,0x00,0x00,0x00,0x00,0x00,0x00,
-                  0x01,0x02,0x03,0x04,2,0,0,0,
-                  0xd4,0xe0,0x60,0xe5,
-                  1,0};
-
-    const int *headret[]={head1,head2,head3,NULL};
+    const int *headret[]={head1_7,head2_7,head3_7,NULL};
     
     fprintf(stderr,"testing zero data page (1 nil packet)... ");
     test_pack(packets,headret);
Domain: Multimedia / Media Playback;