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