summaryrefslogtreecommitdiff
path: root/liboil/dct
diff options
context:
space:
mode:
authorDavid Schleef <ds@schleef.org>2004-12-02 09:45:37 +0000
committerDavid Schleef <ds@schleef.org>2004-12-02 09:45:37 +0000
commit95e414b8361d3cf5ae64bb3bb782a5777f53aa39 (patch)
tree7548656436741c9d3a80185e21e89a0b2f32c9fd /liboil/dct
parent6b234e865679b56811037e34f5e0767cb6f76458 (diff)
downloadliboil-95e414b8361d3cf5ae64bb3bb782a5777f53aa39.tar.gz
* liboil/build_prototypes.c: (main): complain if prototype parsing
fails. * liboil/conv_misc.c: (conv_f64_s16_table): fix valgrind problem * liboil/liboilcpu.c: (_oil_cpu_init): parse OIL_CPU_FLAGS environment variable * liboil/liboilfunction.h: move stuff to liboilparameter.h * liboil/liboilparameter.h: new * liboil/liboilprototype.c: (oil_prototype_from_string), (oil_prototype_check_sanity), (oil_arg_type_name), (oil_param_from_string): implement a new style of parameter names * liboil/liboilprototype.h: use liboilparameter.h * liboil/liboiltest.c: (oil_test_new), (oil_test_go), (fill_array), (init_parameter), (oil_test_init_params): implement a new style of parameter names * liboil/liboiltest.h: add m * liboil/liboiltypes.h: move some typedefs here * testsuite/introspect.c: (main): check return values * testsuite/proto1.c: (main): same * testsuite/proto2.c: (main): same * testsuite/test1.c: (main): same Fixes for new style of parameter names: * liboil/colorspace/rgb2bgr.c: * liboil/colorspace/rgb2rgba.c: * liboil/copy/splat_ref.c: * liboil/copy/trans8x8.c: * liboil/dct/dct12_f32.c: * liboil/dct/dct36_f32.c: (dct36_f32_ref): * liboil/dct/fdct8_f64.c: * liboil/dct/fdct8x8_f64.c: (fdct8x8_f64_ref): * liboil/dct/idct8_f64.c: * liboil/dct/idct8x8_c.c: * liboil/dct/imdct32_f32.c: * liboil/jpeg/convert8x8_c.c: * liboil/jpeg/quantize8x8_c.c: * liboil/jpeg/yuv2rgb_c.c: * liboil/jpeg/zigzag8x8_c.c: * liboil/md5/md5.c: * liboil/simdpack/clip_ref.c: * liboil/simdpack/clip_s16.c: (clip_s16_fast2): fix bugs * liboil/simdpack/mult8x8_s16.c: * liboil/simdpack/multsum.c: (multsum_f32_unroll2): * liboil/simdpack/sad8x8.c: * liboil/simdpack/scalaradd.c: * liboil/simdpack/scalarmult.c: * liboil/simdpack/sincos_f64.c: * liboil/simdpack/vectoradd_f64.c:
Diffstat (limited to 'liboil/dct')
-rw-r--r--liboil/dct/dct12_f32.c5
-rw-r--r--liboil/dct/dct36_f32.c6
-rw-r--r--liboil/dct/fdct8_f64.c2
-rw-r--r--liboil/dct/fdct8x8_f64.c2
-rw-r--r--liboil/dct/idct8_f64.c2
-rw-r--r--liboil/dct/idct8x8_c.c9
-rw-r--r--liboil/dct/imdct32_f32.c2
7 files changed, 17 insertions, 11 deletions
diff --git a/liboil/dct/dct12_f32.c b/liboil/dct/dct12_f32.c
index a8130c8..925c483 100644
--- a/liboil/dct/dct12_f32.c
+++ b/liboil/dct/dct12_f32.c
@@ -25,7 +25,7 @@
#include <math.h>
-OIL_DEFINE_CLASS (dct12_f32, "float *dest, int dstr, float *src, int sstr");
+OIL_DEFINE_CLASS (dct12_f32, "float *d_18, int dstr, float *s_18, int sstr");
static void
dct12_f32_ref (float *dest, int dstr, float *src, int sstr)
@@ -103,6 +103,8 @@ dct12_f32_ref (float *dest, int dstr, float *src, int sstr)
OIL_DEFINE_IMPL_REF (dct12_f32_ref, dct12_f32);
+/* FIXME: broken, reads outside src array */
+#if 0
static void
dct12_f32_ref1(float *dest, int dstr, float *src, int sstr)
{
@@ -134,6 +136,7 @@ dct12_f32_ref1(float *dest, int dstr, float *src, int sstr)
}
}
OIL_DEFINE_IMPL (dct12_f32_ref1, dct12_f32);
+#endif
/* copyright: from mpglib */
/*
diff --git a/liboil/dct/dct36_f32.c b/liboil/dct/dct36_f32.c
index cec1c3c..81a48b8 100644
--- a/liboil/dct/dct36_f32.c
+++ b/liboil/dct/dct36_f32.c
@@ -23,13 +23,13 @@
#include <liboil/liboilfunction.h>
#include <liboil/dct/dct.h>
-OIL_DEFINE_CLASS(dct36_f32, "float *dest, int dstr, float *src, int sstr, int n");
+OIL_DEFINE_CLASS(dct36_f32, "float *d_36, int dstr, float *s_36, int sstr");
static void
-dct36_f32_ref(float *dest, int dstr, float *src, int sstr, int n)
+dct36_f32_ref(float *dest, int dstr, float *src, int sstr)
{
int i;
- for(i=0;i<n;i++){
+ for(i=0;i<36;i++){
dest[i] = src[i];
}
}
diff --git a/liboil/dct/fdct8_f64.c b/liboil/dct/fdct8_f64.c
index bf21fc7..a65b4d6 100644
--- a/liboil/dct/fdct8_f64.c
+++ b/liboil/dct/fdct8_f64.c
@@ -24,7 +24,7 @@
#include <liboil/dct/dct.h>
#include <math.h>
-OIL_DEFINE_CLASS (fdct8_f64, "double *dest, double *src, int dstr, int sstr");
+OIL_DEFINE_CLASS (fdct8_f64, "double *d_8, double *s_8, int dstr, int sstr");
#define C0_9808 0.980785280
#define C0_9239 0.923879532
diff --git a/liboil/dct/fdct8x8_f64.c b/liboil/dct/fdct8x8_f64.c
index e59b455..ef050e5 100644
--- a/liboil/dct/fdct8x8_f64.c
+++ b/liboil/dct/fdct8x8_f64.c
@@ -29,7 +29,7 @@
OIL_DEFINE_CLASS(fdct8x8_f64, NULL);
-static void fdct8x8_f64_ref(double *dest, int dstr, double *src, int sstr)
+static void fdct8x8_f64_ref(double *d_8x8, int dstr, double *s_8x8, int sstr)
{
static double fdct_coeff[8][8];
static int fdct_coeff_init = 0;
diff --git a/liboil/dct/idct8_f64.c b/liboil/dct/idct8_f64.c
index 6966248..5fd411e 100644
--- a/liboil/dct/idct8_f64.c
+++ b/liboil/dct/idct8_f64.c
@@ -24,7 +24,7 @@
#include <liboil/dct/dct.h>
#include <math.h>
-OIL_DEFINE_CLASS (idct8_f64, "double *dest, int dstr, double *src, int sstr");
+OIL_DEFINE_CLASS (idct8_f64, "double *d_8, int dstr, double *s_8, int sstr");
#define C0_9808 0.980785280
#define C0_9239 0.923879532
diff --git a/liboil/dct/idct8x8_c.c b/liboil/dct/idct8x8_c.c
index 4bc20d8..a37c3e8 100644
--- a/liboil/dct/idct8x8_c.c
+++ b/liboil/dct/idct8x8_c.c
@@ -34,8 +34,8 @@
#define BLOCK8x8_S16(ptr, stride, row, column) \
(*((int16_t *)((void *)ptr + stride*row) + column))
-OIL_DEFINE_CLASS (idct8x8_f64, "double *dest, int dstr, double *src, int sstr");
-OIL_DEFINE_CLASS (idct8x8_s16, "int16_t *dest, int dstr, int16_t *src, int sstr");
+OIL_DEFINE_CLASS (idct8x8_f64, "double *d_8x8, int dstr, double *s_8x8, int sstr");
+OIL_DEFINE_CLASS (idct8x8_s16, "int16_t *d_8x8, int dstr, int16_t *s_8x8, int sstr");
static void
idct8x8_f64_slow (double *dest, int dstr, double *src, int sstr)
@@ -74,7 +74,7 @@ idct8x8_f64_slow (double *dest, int dstr, double *src, int sstr)
}
}
-OIL_DEFINE_IMPL (idct8x8_f64_slow, idct8x8_f64);
+OIL_DEFINE_IMPL_REF (idct8x8_f64_slow, idct8x8_f64);
#if defined(oil_idct8_f64)
static void
@@ -111,7 +111,10 @@ idct8x8_s16_slow (int16_t *dest, int dstr, int16_t *src, int sstr)
oil_conv8x8_s16_f64 (dest,dstr,d,8*sizeof(double));
}
+OIL_DEFINE_IMPL_REF (idct8x8_s16_slow, idct8x8_s16);
+#if 0
OIL_DEFINE_IMPL_DEPENDS (idct8x8_s16_slow, idct8x8_s16,
conv8x8_f64_s16, idct8x8_f64, conv8x8_s16_f64);
#endif
+#endif
diff --git a/liboil/dct/imdct32_f32.c b/liboil/dct/imdct32_f32.c
index 7d0f033..4b7e3ea 100644
--- a/liboil/dct/imdct32_f32.c
+++ b/liboil/dct/imdct32_f32.c
@@ -24,7 +24,7 @@
#include <liboil/dct/dct.h>
#include <math.h>
-OIL_DEFINE_CLASS (imdct32_f32, "float *dest, float *src");
+OIL_DEFINE_CLASS (imdct32_f32, "float *d_32, float *s_32");
static void imdct32_f32_ref (float *dest, float *src)
{