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 +#if !HAVE_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 --- sharedbook.c        30 Dec 2004 12:09:20 -0000      1.1
  26 +++ sharedbook.c        18 Aug 2005 16:13:54 -0000
  27 @@ -208,7 +211,7 @@
  28           int indexdiv=1;
  29           for(k=0;k<b->dim;k++){
  30             int index= (j/indexdiv)%quantvals;
  31 -           int point;
  32 +           ogg_int32_t point;
  33             int val=VFLOAT_MULTI(delta,delpoint,
  34                                  abs(b->quantlist[index]),&point);
  35
  36 @@ -242,7 +245,7 @@
  37           int         lastpoint=0;
  38
  39           for(k=0;k<b->dim;k++){
  40 -           int point;
  41 +           ogg_int32_t point;
  42             int val=VFLOAT_MULTI(delta,delpoint,
  43                                  abs(b->quantlist[j*b->dim+k]),&point);
  44
  45 --- block.h     (revision 0)
  46 +++ block.h     (revision 0)
  47 @@ -0,0 +1,24 @@
  48 +/********************************************************************
  49 + *                                                                  *
  50 + * THIS FILE IS PART OF THE OggVorbis 'TREMOR' CODEC SOURCE CODE.   *
  51 + *                                                                  *
  52 + * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
  53 + * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
  54 + * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  55 + *                                                                  *
  56 + * THE OggVorbis 'TREMOR' SOURCE CODE IS (C) COPYRIGHT 1994-2002    *
  57 + * BY THE Xiph.Org FOUNDATION http://www.xiph.org/                  *
  58 + *                                                                  *
  59 + ********************************************************************
  60 +
  61 + function: basic shared block operations
  62 +
  63 + ********************************************************************/
  64 +
  65 +#ifndef _V_BLOCK_H_
  66 +#define _V_BLOCK_H_
  67 +
  68 +void *_vorbis_block_alloc(vorbis_block *vb,long bytes);
  69 +void _vorbis_block_ripcord(vorbis_block *vb);
  70 +
  71 +#endif
  72 --- floor0.c    (revision 24821)
  73 +++ floor0.c    (working copy)
  74 @@ -25,6 +25,7 @@
  75  #include "codebook.h"
  76  #include "misc.h"
  77  #include "os.h"
  78 +#include "block.h"
  79
  80  #define LSP_FRACBITS 14
  81
  82 --- floor1.c    (revision 24821)
  83 +++ floor1.c    (working copy)
  84 @@ -24,6 +24,7 @@
  85  #include "registry.h"
  86  #include "codebook.h"
  87  #include "misc.h"
  88 +#include "block.h"
  89
  90  #define floor1_rangedB 140 /* floor 1 fixed at -140dB to 0dB range */
  91
  92 --- synthesis.c (revision 24821)
  93 +++ synthesis.c (working copy)
  94 @@ -23,6 +23,7 @@
  95  #include "registry.h"
  96  #include "misc.h"
  97  #include "os.h"
  98 +#include "block.h"
  99
 100  int vorbis_synthesis(vorbis_block *vb,ogg_packet *op){
 101    vorbis_dsp_state     *vd=vb->vd;
 102 --- res012.c    (revision 24821)
 103 +++ res012.c    (working copy)
 104 @@ -25,6 +25,7 @@
 105  #include "codebook.h"
 106  #include "misc.h"
 107  #include "os.h"
 108 +#include "block.h"
 109
 110  typedef struct {
 111    vorbis_info_residue0 *info;
 112 --- block.c     (revision 24821)
 113 +++ block.c     (working copy)
 114 @@ -25,6 +25,7 @@
 115  #include "window.h"
 116  #include "registry.h"
 117  #include "misc.h"
 118 +#include "block.h"
 119
 120  static int ilog(unsigned int v){
 121    int ret=0;
 122 --- os.h        (revision 25873)
 123 +++ os.h        (working copy)
 124 @@ -20,18 +20,8 @@
 125  #include <math.h>
 126  #include "os_types.h"
 127
 128 -#ifndef _V_IFDEFJAIL_H_
 129 -#  define _V_IFDEFJAIL_H_
 130 +#define STIN static inline
 131
 132 -#  ifdef __GNUC__
 133 -#    define STIN static __inline__
 134 -#  elif _WIN32
 135 -#    define STIN static __inline
 136 -#  endif
 137 -#else
 138 -#  define STIN static
 139 -#endif
 140 -
 141  #ifndef M_PI
 142  #  define M_PI (3.1415926536f)
 143  #endif
 144 --- os_types.h  2008-05-27 14:59:21.000000000 +0200
 145 +++ os_types.h  2008-05-27 15:00:50.000000000 +0200
 146 @@ -32,6 +32,15 @@
 147  #define _ogg_realloc realloc
 148  #define _ogg_free    free
 149
 150 +#include <inttypes.h>
 151 +typedef int64_t  ogg_int64_t;
 152 +typedef int32_t  ogg_int32_t;
 153 +typedef int16_t  ogg_int16_t;
 154 +typedef uint32_t ogg_uint32_t;
 155 +typedef uint16_t ogg_uint16_t;
 156 +
 157 +#if 0
 158 +
 159  #ifdef _WIN32
 160
 161  #  ifndef __GNUC__
 162 @@ -85,4 +94,6 @@
 163
 164  #endif
 165
 166 +#endif /* 0 */
 167 +
 168  #endif  /* _OS_TYPES_H */
 169 --- mapping0.c  (revision 28274)
 170 +++ mapping0.c  (revision 28275)
 171 @@ -19,6 +20,7 @@
 172  #include <string.h>
 173  #include <math.h>
 174  #include "ogg.h"
 175 +#include "os.h"
 176  #include "ivorbiscodec.h"
 177  #include "mdct.h"
 178  #include "codec_internal.h"