tremor/tremor.diff

   1 --- misc.h      2005-01-04 16:29:01.000000000 +0100
   2 +++ misc.h      2004-12-30 13:09:20.000000000 +0100
   3 @@ -29,8 +29,9 @@
   4  /* 64 bit multiply */
   5
   6  #include <sys/types.h>
   7 +#include "config.h"
   8
   9 -#if BYTE_ORDER==LITTLE_ENDIAN
  10 +#ifndef WORDS_BIGENDIAN
  11  union magic {
  12    struct {
  13      ogg_int32_t lo;
  14 @@ -38,9 +39,7 @@
  15    } halves;
  16    ogg_int64_t whole;
  17  };
  18 -#endif
  19 -
  20 -#if BYTE_ORDER==BIG_ENDIAN
  21 +#else
  22  union magic {
  23    struct {
  24      ogg_int32_t hi;
  25 --- os_types.h  2005-01-04 16:29:02.000000000 +0100
  26 +++ os_types.h  2005-01-05 10:39:07.000000000 +0100
  27 @@ -32,57 +32,11 @@
  28  #define _ogg_realloc realloc
  29  #define _ogg_free    free
  30
  31 -#ifdef _WIN32
  32 -
  33 -#  ifndef __GNUC__
  34 -   /* MSVC/Borland */
  35 -   typedef __int64 ogg_int64_t;
  36 -   typedef __int32 ogg_int32_t;
  37 -   typedef unsigned __int32 ogg_uint32_t;
  38 -   typedef __int16 ogg_int16_t;
  39 -#  else
  40 -   /* Cygwin */
  41 -   #include <_G_config.h>
  42 -   typedef _G_int64_t ogg_int64_t;
  43 -   typedef _G_int32_t ogg_int32_t;
  44 -   typedef _G_uint32_t ogg_uint32_t;
  45 -   typedef _G_int16_t ogg_int16_t;
  46 -#  endif
  47 -
  48 -#elif defined(__MACOS__)
  49 -
  50 -#  include <sys/types.h>
  51 -   typedef SInt16 ogg_int16_t;
  52 -   typedef SInt32 ogg_int32_t;
  53 -   typedef UInt32 ogg_uint32_t;
  54 -   typedef SInt64 ogg_int64_t;
  55 -
  56 -#elif defined(__MACOSX__) /* MacOS X Framework build */
  57 -
  58 -#  include <sys/types.h>
  59 -   typedef int16_t ogg_int16_t;
  60 -   typedef int32_t ogg_int32_t;
  61 -   typedef u_int32_t ogg_uint32_t;
  62 +   #include <inttypes.h>
  63     typedef int64_t ogg_int64_t;
  64 -
  65 -#elif defined(__BEOS__)
  66 -
  67 -   /* Be */
  68 -#  include <inttypes.h>
  69 -
  70 -#elif defined (__EMX__)
  71 -
  72 -   /* OS/2 GCC */
  73 -   typedef short ogg_int16_t;
  74 -   typedef int ogg_int32_t;
  75 -   typedef unsigned int ogg_uint32_t;
  76 -   typedef long long ogg_int64_t;
  77 -
  78 -#else
  79 -
  80 -#  include <sys/types.h>
  81 -#  include "config_types.h"
  82 -
  83 -#endif
  84 +   typedef int32_t ogg_int32_t;
  85 +   typedef uint32_t ogg_uint32_t;
  86 +   typedef uint16_t ogg_uint16_t;
  87 +   typedef int16_t ogg_int16_t;
  88
  89  #endif  /* _OS_TYPES_H */
  90 --- sharedbook.c        30 Dec 2004 12:09:20 -0000      1.1
  91 +++ sharedbook.c        18 Aug 2005 16:13:54 -0000
  92 @@ -208,7 +211,7 @@
  93           int indexdiv=1;
  94           for(k=0;k<b->dim;k++){
  95             int index= (j/indexdiv)%quantvals;
  96 -           int point;
  97 +           ogg_int32_t point;
  98             int val=VFLOAT_MULTI(delta,delpoint,
  99                                  abs(b->quantlist[index]),&point);
 100
 101 @@ -242,7 +245,7 @@
 102           int         lastpoint=0;
 103
 104           for(k=0;k<b->dim;k++){
 105 -           int point;
 106 +           ogg_int32_t point;
 107             int val=VFLOAT_MULTI(delta,delpoint,
 108                                  abs(b->quantlist[j*b->dim+k]),&point);
 109
 110 --- block.h     (revision 0)
 111 +++ block.h     (revision 0)
 112 @@ -0,0 +1,24 @@
 113 +/********************************************************************
 114 + *                                                                  *
 115 + * THIS FILE IS PART OF THE OggVorbis 'TREMOR' CODEC SOURCE CODE.   *
 116 + *                                                                  *
 117 + * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
 118 + * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
 119 + * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
 120 + *                                                                  *
 121 + * THE OggVorbis 'TREMOR' SOURCE CODE IS (C) COPYRIGHT 1994-2002    *
 122 + * BY THE Xiph.Org FOUNDATION http://www.xiph.org/                  *
 123 + *                                                                  *
 124 + ********************************************************************
 125 +
 126 + function: basic shared block operations
 127 +
 128 + ********************************************************************/
 129 +
 130 +#ifndef _V_BLOCK_H_
 131 +#define _V_BLOCK_H_
 132 +
 133 +void *_vorbis_block_alloc(vorbis_block *vb,long bytes);
 134 +void _vorbis_block_ripcord(vorbis_block *vb);
 135 +
 136 +#endif
 137 --- floor0.c    (revision 24821)
 138 +++ floor0.c    (working copy)
 139 @@ -25,6 +25,7 @@
 140  #include "codebook.h"
 141  #include "misc.h"
 142  #include "os.h"
 143 +#include "block.h"
 144
 145  #define LSP_FRACBITS 14
 146
 147 --- floor1.c    (revision 24821)
 148 +++ floor1.c    (working copy)
 149 @@ -24,6 +24,7 @@
 150  #include "registry.h"
 151  #include "codebook.h"
 152  #include "misc.h"
 153 +#include "block.h"
 154
 155  #define floor1_rangedB 140 /* floor 1 fixed at -140dB to 0dB range */
 156
 157 --- synthesis.c (revision 24821)
 158 +++ synthesis.c (working copy)
 159 @@ -23,6 +23,7 @@
 160  #include "registry.h"
 161  #include "misc.h"
 162  #include "os.h"
 163 +#include "block.h"
 164
 165  int vorbis_synthesis(vorbis_block *vb,ogg_packet *op){
 166    vorbis_dsp_state     *vd=vb->vd;
 167 --- res012.c    (revision 24821)
 168 +++ res012.c    (working copy)
 169 @@ -25,6 +25,7 @@
 170  #include "codebook.h"
 171  #include "misc.h"
 172  #include "os.h"
 173 +#include "block.h"
 174
 175  typedef struct {
 176    vorbis_info_residue0 *info;
 177 --- block.c     (revision 24821)
 178 +++ block.c     (working copy)
 179 @@ -25,6 +25,7 @@
 180  #include "window.h"
 181  #include "registry.h"
 182  #include "misc.h"
 183 +#include "block.h"
 184
 185  static int ilog(unsigned int v){
 186    int ret=0;