[xiph-cvs] cvs commit: Tremor floor1.c misc.h

Monty xiphmont at xiph.org
Wed Oct 16 02:12:08 PDT 2002



xiphmont    02/10/16 05:12:08

  Modified:    .        floor1.c misc.h
  Log:
  fix a build straggler in the low accuracy patch

Revision  Changes    Path
1.5       +66 -66    Tremor/floor1.c

Index: floor1.c
===================================================================
RCS file: /usr/local/cvsroot/Tremor/floor1.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- floor1.c	16 Oct 2002 09:07:00 -0000	1.4
+++ floor1.c	16 Oct 2002 09:12:08 -0000	1.5
@@ -215,76 +215,76 @@
 }
 
 #ifdef _LOW_ACCURACY_
-#  define X(n) ((((n)>>8)+1)>>1)
+#  define XdB(n) ((((n)>>8)+1)>>1)
 #else
-#  define X(n) (n)
+#  define XdB(n) (n)
 #endif
 
 static const ogg_int32_t FLOOR_fromdB_LOOKUP[256]={
-  X(0x000000e5), X(0x000000f4), X(0x00000103), X(0x00000114),
-  X(0x00000126), X(0x00000139), X(0x0000014e), X(0x00000163),
-  X(0x0000017a), X(0x00000193), X(0x000001ad), X(0x000001c9),
-  X(0x000001e7), X(0x00000206), X(0x00000228), X(0x0000024c),
-  X(0x00000272), X(0x0000029b), X(0x000002c6), X(0x000002f4),
-  X(0x00000326), X(0x0000035a), X(0x00000392), X(0x000003cd),
-  X(0x0000040c), X(0x00000450), X(0x00000497), X(0x000004e4),
-  X(0x00000535), X(0x0000058c), X(0x000005e8), X(0x0000064a),
-  X(0x000006b3), X(0x00000722), X(0x00000799), X(0x00000818),
-  X(0x0000089e), X(0x0000092e), X(0x000009c6), X(0x00000a69),
-  X(0x00000b16), X(0x00000bcf), X(0x00000c93), X(0x00000d64),
-  X(0x00000e43), X(0x00000f30), X(0x0000102d), X(0x0000113a),
-  X(0x00001258), X(0x0000138a), X(0x000014cf), X(0x00001629),
-  X(0x0000179a), X(0x00001922), X(0x00001ac4), X(0x00001c82),
-  X(0x00001e5c), X(0x00002055), X(0x0000226f), X(0x000024ac),
-  X(0x0000270e), X(0x00002997), X(0x00002c4b), X(0x00002f2c),
-  X(0x0000323d), X(0x00003581), X(0x000038fb), X(0x00003caf),
-  X(0x000040a0), X(0x000044d3), X(0x0000494c), X(0x00004e10),
-  X(0x00005323), X(0x0000588a), X(0x00005e4b), X(0x0000646b),
-  X(0x00006af2), X(0x000071e5), X(0x0000794c), X(0x0000812e),
-  X(0x00008993), X(0x00009283), X(0x00009c09), X(0x0000a62d),
-  X(0x0000b0f9), X(0x0000bc79), X(0x0000c8b9), X(0x0000d5c4),
-  X(0x0000e3a9), X(0x0000f274), X(0x00010235), X(0x000112fd),
-  X(0x000124dc), X(0x000137e4), X(0x00014c29), X(0x000161bf),
-  X(0x000178bc), X(0x00019137), X(0x0001ab4a), X(0x0001c70e),
-  X(0x0001e4a1), X(0x0002041f), X(0x000225aa), X(0x00024962),
-  X(0x00026f6d), X(0x000297f0), X(0x0002c316), X(0x0002f109),
-  X(0x000321f9), X(0x00035616), X(0x00038d97), X(0x0003c8b4),
-  X(0x000407a7), X(0x00044ab2), X(0x00049218), X(0x0004de23),
-  X(0x00052f1e), X(0x0005855c), X(0x0005e135), X(0x00064306),
-  X(0x0006ab33), X(0x00071a24), X(0x0007904b), X(0x00080e20),
-  X(0x00089422), X(0x000922da), X(0x0009bad8), X(0x000a5cb6),
-  X(0x000b091a), X(0x000bc0b1), X(0x000c8436), X(0x000d5471),
-  X(0x000e3233), X(0x000f1e5f), X(0x001019e4), X(0x001125c1),
-  X(0x00124306), X(0x001372d5), X(0x0014b663), X(0x00160ef7),
-  X(0x00177df0), X(0x001904c1), X(0x001aa4f9), X(0x001c603d),
-  X(0x001e384f), X(0x00202f0f), X(0x0022467a), X(0x002480b1),
-  X(0x0026dff7), X(0x002966b3), X(0x002c1776), X(0x002ef4fc),
-  X(0x0032022d), X(0x00354222), X(0x0038b828), X(0x003c67c2),
-  X(0x004054ae), X(0x004482e8), X(0x0048f6af), X(0x004db488),
-  X(0x0052c142), X(0x005821ff), X(0x005ddc33), X(0x0063f5b0),
-  X(0x006a74a7), X(0x00715faf), X(0x0078bdce), X(0x0080967f),
-  X(0x0088f1ba), X(0x0091d7f9), X(0x009b5247), X(0x00a56a41),
-  X(0x00b02a27), X(0x00bb9ce2), X(0x00c7ce12), X(0x00d4ca17),
-  X(0x00e29e20), X(0x00f15835), X(0x0101074b), X(0x0111bb4e),
-  X(0x01238531), X(0x01367704), X(0x014aa402), X(0x016020a7),
-  X(0x017702c3), X(0x018f6190), X(0x01a955cb), X(0x01c4f9cf),
-  X(0x01e269a8), X(0x0201c33b), X(0x0223265a), X(0x0246b4ea),
-  X(0x026c9302), X(0x0294e716), X(0x02bfda13), X(0x02ed9793),
-  X(0x031e4e09), X(0x03522ee4), X(0x03896ed0), X(0x03c445e2),
-  X(0x0402efd6), X(0x0445ac4b), X(0x048cbefc), X(0x04d87013),
-  X(0x05290c67), X(0x057ee5ca), X(0x05da5364), X(0x063bb204),
-  X(0x06a36485), X(0x0711d42b), X(0x0787710e), X(0x0804b299),
-  X(0x088a17ef), X(0x0918287e), X(0x09af747c), X(0x0a50957e),
-  X(0x0afc2f19), X(0x0bb2ef7f), X(0x0c759034), X(0x0d44d6ca),
-  X(0x0e2195bc), X(0x0f0cad0d), X(0x10070b62), X(0x1111aeea),
-  X(0x122da66c), X(0x135c120f), X(0x149e24d9), X(0x15f525b1),
-  X(0x176270e3), X(0x18e7794b), X(0x1a85c9ae), X(0x1c3f06d1),
-  X(0x1e14f07d), X(0x200963d7), X(0x221e5ccd), X(0x2455f870),
-  X(0x26b2770b), X(0x29363e2b), X(0x2be3db5c), X(0x2ebe06b6),
-  X(0x31c7a55b), X(0x3503ccd4), X(0x3875c5aa), X(0x3c210f44),
-  X(0x4009632b), X(0x4432b8cf), X(0x48a149bc), X(0x4d59959e),
-  X(0x52606733), X(0x57bad899), X(0x5d6e593a), X(0x6380b298),
-  X(0x69f80e9a), X(0x70dafda8), X(0x78307d76), X(0x7fffffff),
+  XdB(0x000000e5), XdB(0x000000f4), XdB(0x00000103), XdB(0x00000114),
+  XdB(0x00000126), XdB(0x00000139), XdB(0x0000014e), XdB(0x00000163),
+  XdB(0x0000017a), XdB(0x00000193), XdB(0x000001ad), XdB(0x000001c9),
+  XdB(0x000001e7), XdB(0x00000206), XdB(0x00000228), XdB(0x0000024c),
+  XdB(0x00000272), XdB(0x0000029b), XdB(0x000002c6), XdB(0x000002f4),
+  XdB(0x00000326), XdB(0x0000035a), XdB(0x00000392), XdB(0x000003cd),
+  XdB(0x0000040c), XdB(0x00000450), XdB(0x00000497), XdB(0x000004e4),
+  XdB(0x00000535), XdB(0x0000058c), XdB(0x000005e8), XdB(0x0000064a),
+  XdB(0x000006b3), XdB(0x00000722), XdB(0x00000799), XdB(0x00000818),
+  XdB(0x0000089e), XdB(0x0000092e), XdB(0x000009c6), XdB(0x00000a69),
+  XdB(0x00000b16), XdB(0x00000bcf), XdB(0x00000c93), XdB(0x00000d64),
+  XdB(0x00000e43), XdB(0x00000f30), XdB(0x0000102d), XdB(0x0000113a),
+  XdB(0x00001258), XdB(0x0000138a), XdB(0x000014cf), XdB(0x00001629),
+  XdB(0x0000179a), XdB(0x00001922), XdB(0x00001ac4), XdB(0x00001c82),
+  XdB(0x00001e5c), XdB(0x00002055), XdB(0x0000226f), XdB(0x000024ac),
+  XdB(0x0000270e), XdB(0x00002997), XdB(0x00002c4b), XdB(0x00002f2c),
+  XdB(0x0000323d), XdB(0x00003581), XdB(0x000038fb), XdB(0x00003caf),
+  XdB(0x000040a0), XdB(0x000044d3), XdB(0x0000494c), XdB(0x00004e10),
+  XdB(0x00005323), XdB(0x0000588a), XdB(0x00005e4b), XdB(0x0000646b),
+  XdB(0x00006af2), XdB(0x000071e5), XdB(0x0000794c), XdB(0x0000812e),
+  XdB(0x00008993), XdB(0x00009283), XdB(0x00009c09), XdB(0x0000a62d),
+  XdB(0x0000b0f9), XdB(0x0000bc79), XdB(0x0000c8b9), XdB(0x0000d5c4),
+  XdB(0x0000e3a9), XdB(0x0000f274), XdB(0x00010235), XdB(0x000112fd),
+  XdB(0x000124dc), XdB(0x000137e4), XdB(0x00014c29), XdB(0x000161bf),
+  XdB(0x000178bc), XdB(0x00019137), XdB(0x0001ab4a), XdB(0x0001c70e),
+  XdB(0x0001e4a1), XdB(0x0002041f), XdB(0x000225aa), XdB(0x00024962),
+  XdB(0x00026f6d), XdB(0x000297f0), XdB(0x0002c316), XdB(0x0002f109),
+  XdB(0x000321f9), XdB(0x00035616), XdB(0x00038d97), XdB(0x0003c8b4),
+  XdB(0x000407a7), XdB(0x00044ab2), XdB(0x00049218), XdB(0x0004de23),
+  XdB(0x00052f1e), XdB(0x0005855c), XdB(0x0005e135), XdB(0x00064306),
+  XdB(0x0006ab33), XdB(0x00071a24), XdB(0x0007904b), XdB(0x00080e20),
+  XdB(0x00089422), XdB(0x000922da), XdB(0x0009bad8), XdB(0x000a5cb6),
+  XdB(0x000b091a), XdB(0x000bc0b1), XdB(0x000c8436), XdB(0x000d5471),
+  XdB(0x000e3233), XdB(0x000f1e5f), XdB(0x001019e4), XdB(0x001125c1),
+  XdB(0x00124306), XdB(0x001372d5), XdB(0x0014b663), XdB(0x00160ef7),
+  XdB(0x00177df0), XdB(0x001904c1), XdB(0x001aa4f9), XdB(0x001c603d),
+  XdB(0x001e384f), XdB(0x00202f0f), XdB(0x0022467a), XdB(0x002480b1),
+  XdB(0x0026dff7), XdB(0x002966b3), XdB(0x002c1776), XdB(0x002ef4fc),
+  XdB(0x0032022d), XdB(0x00354222), XdB(0x0038b828), XdB(0x003c67c2),
+  XdB(0x004054ae), XdB(0x004482e8), XdB(0x0048f6af), XdB(0x004db488),
+  XdB(0x0052c142), XdB(0x005821ff), XdB(0x005ddc33), XdB(0x0063f5b0),
+  XdB(0x006a74a7), XdB(0x00715faf), XdB(0x0078bdce), XdB(0x0080967f),
+  XdB(0x0088f1ba), XdB(0x0091d7f9), XdB(0x009b5247), XdB(0x00a56a41),
+  XdB(0x00b02a27), XdB(0x00bb9ce2), XdB(0x00c7ce12), XdB(0x00d4ca17),
+  XdB(0x00e29e20), XdB(0x00f15835), XdB(0x0101074b), XdB(0x0111bb4e),
+  XdB(0x01238531), XdB(0x01367704), XdB(0x014aa402), XdB(0x016020a7),
+  XdB(0x017702c3), XdB(0x018f6190), XdB(0x01a955cb), XdB(0x01c4f9cf),
+  XdB(0x01e269a8), XdB(0x0201c33b), XdB(0x0223265a), XdB(0x0246b4ea),
+  XdB(0x026c9302), XdB(0x0294e716), XdB(0x02bfda13), XdB(0x02ed9793),
+  XdB(0x031e4e09), XdB(0x03522ee4), XdB(0x03896ed0), XdB(0x03c445e2),
+  XdB(0x0402efd6), XdB(0x0445ac4b), XdB(0x048cbefc), XdB(0x04d87013),
+  XdB(0x05290c67), XdB(0x057ee5ca), XdB(0x05da5364), XdB(0x063bb204),
+  XdB(0x06a36485), XdB(0x0711d42b), XdB(0x0787710e), XdB(0x0804b299),
+  XdB(0x088a17ef), XdB(0x0918287e), XdB(0x09af747c), XdB(0x0a50957e),
+  XdB(0x0afc2f19), XdB(0x0bb2ef7f), XdB(0x0c759034), XdB(0x0d44d6ca),
+  XdB(0x0e2195bc), XdB(0x0f0cad0d), XdB(0x10070b62), XdB(0x1111aeea),
+  XdB(0x122da66c), XdB(0x135c120f), XdB(0x149e24d9), XdB(0x15f525b1),
+  XdB(0x176270e3), XdB(0x18e7794b), XdB(0x1a85c9ae), XdB(0x1c3f06d1),
+  XdB(0x1e14f07d), XdB(0x200963d7), XdB(0x221e5ccd), XdB(0x2455f870),
+  XdB(0x26b2770b), XdB(0x29363e2b), XdB(0x2be3db5c), XdB(0x2ebe06b6),
+  XdB(0x31c7a55b), XdB(0x3503ccd4), XdB(0x3875c5aa), XdB(0x3c210f44),
+  XdB(0x4009632b), XdB(0x4432b8cf), XdB(0x48a149bc), XdB(0x4d59959e),
+  XdB(0x52606733), XdB(0x57bad899), XdB(0x5d6e593a), XdB(0x6380b298),
+  XdB(0x69f80e9a), XdB(0x70dafda8), XdB(0x78307d76), XdB(0x7fffffff),
 };
   
 static void render_line(int x0,int x1,int y0,int y1,ogg_int32_t *d){

<p><p>1.6       +1 -3      Tremor/misc.h

Index: misc.h
===================================================================
RCS file: /usr/local/cvsroot/Tremor/misc.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- misc.h	16 Oct 2002 09:07:00 -0000	1.5
+++ misc.h	16 Oct 2002 09:12:08 -0000	1.6
@@ -25,9 +25,7 @@
 extern void _analysis_output(char *base,int i,ogg_int32_t *v,int point,
                              int n,int bark,int dB);
 
-#ifdef _ARM_ASSEM_
-  #include "asm_arm.h"
-#endif
+#include "asm_arm.h"
   
 #ifndef _V_WIDE_MATH
 #define _V_WIDE_MATH

<p><p>--- >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