From 0b17ea6f689a2716f314d13000901c9107eb03af Mon Sep 17 00:00:00 2001
From: Yaowu Xu <yaowu@google.com>
Date: Tue, 7 Aug 2012 13:55:49 -0700
Subject: [PATCH] A bit of temporary relief on encoder slowness
The commit replaces run-time initialization of cosine constants with
static constant values, which provides ~30% relief on slow speed. The
real solution, however will be to implement integer versions of those
functions that current use float/double.
Change-Id: Ie3ff1793509653d78dd1aeaf88cc6737da1bc55f
---
test/dct16x16_test.cc | 33 +++++++++++++++++----------------
vp8/common/idctllm.c | 33 +++++++++++++++++----------------
vp8/encoder/dct.c | 33 ++++++++++++++++-----------------
3 files changed, 50 insertions(+), 49 deletions(-)
diff --git a/test/dct16x16_test.cc b/test/dct16x16_test.cc
index 679dd30e9a..26bf4940b0 100644
--- a/test/dct16x16_test.cc
+++ b/test/dct16x16_test.cc
@@ -48,27 +48,28 @@ void reference2_16x16_idct_2d(double *input, double *output) {
}
}
+
+static const double C1 = 0.995184726672197;
+static const double C2 = 0.98078528040323;
+static const double C3 = 0.956940335732209;
+static const double C4 = 0.923879532511287;
+static const double C5 = 0.881921264348355;
+static const double C6 = 0.831469612302545;
+static const double C7 = 0.773010453362737;
+static const double C8 = 0.707106781186548;
+static const double C9 = 0.634393284163646;
+static const double C10 = 0.555570233019602;
+static const double C11 = 0.471396736825998;
+static const double C12 = 0.38268343236509;
+static const double C13 = 0.290284677254462;
+static const double C14 = 0.195090322016128;
+static const double C15 = 0.098017140329561;
+
static void butterfly_16x16_dct_1d(double input[16], double output[16]) {
double step[16];
double intermediate[16];
double temp1, temp2;
- const double C1 = cos(1*PI/(double)32);
- const double C2 = cos(2*PI/(double)32);
- const double C3 = cos(3*PI/(double)32);
- const double C4 = cos(4*PI/(double)32);
- const double C5 = cos(5*PI/(double)32);
- const double C6 = cos(6*PI/(double)32);
- const double C7 = cos(7*PI/(double)32);
- const double C8 = cos(8*PI/(double)32);
- const double C9 = cos(9*PI/(double)32);
- const double C10 = cos(10*PI/(double)32);
- const double C11 = cos(11*PI/(double)32);
- const double C12 = cos(12*PI/(double)32);
- const double C13 = cos(13*PI/(double)32);
- const double C14 = cos(14*PI/(double)32);
- const double C15 = cos(15*PI/(double)32);
-
// step 1
step[ 0] = input[0] + input[15];
step[ 1] = input[1] + input[14];
diff --git a/vp8/common/idctllm.c b/vp8/common/idctllm.c
index 5c7bf78d29..3152ce6a97 100644
--- a/vp8/common/idctllm.c
+++ b/vp8/common/idctllm.c
@@ -722,27 +722,28 @@ void vp8_short_idct16x16_c(short *input, short *output, int pitch) {
}
#endif
+static const double C1 = 0.995184726672197;
+static const double C2 = 0.98078528040323;
+static const double C3 = 0.956940335732209;
+static const double C4 = 0.923879532511287;
+static const double C5 = 0.881921264348355;
+static const double C6 = 0.831469612302545;
+static const double C7 = 0.773010453362737;
+static const double C8 = 0.707106781186548;
+static const double C9 = 0.634393284163646;
+static const double C10 = 0.555570233019602;
+static const double C11 = 0.471396736825998;
+static const double C12 = 0.38268343236509;
+static const double C13 = 0.290284677254462;
+static const double C14 = 0.195090322016128;
+static const double C15 = 0.098017140329561;
+
+
static void butterfly_16x16_idct_1d(double input[16], double output[16]) {
double step[16];
double intermediate[16];
double temp1, temp2;
- const double PI = M_PI;
- const double C1 = cos(1*PI/(double)32);
- const double C2 = cos(2*PI/(double)32);
- const double C3 = cos(3*PI/(double)32);
- const double C4 = cos(4*PI/(double)32);
- const double C5 = cos(5*PI/(double)32);
- const double C6 = cos(6*PI/(double)32);
- const double C7 = cos(7*PI/(double)32);
- const double C8 = cos(8*PI/(double)32);
- const double C9 = cos(9*PI/(double)32);
- const double C10 = cos(10*PI/(double)32);
- const double C11 = cos(11*PI/(double)32);
- const double C12 = cos(12*PI/(double)32);
- const double C13 = cos(13*PI/(double)32);
- const double C14 = cos(14*PI/(double)32);
- const double C15 = cos(15*PI/(double)32);
// step 1 and 2
step[ 0] = input[0] + input[8];
diff --git a/vp8/encoder/dct.c b/vp8/encoder/dct.c
index ae1912903c..90e5e65a22 100644
--- a/vp8/encoder/dct.c
+++ b/vp8/encoder/dct.c
@@ -611,28 +611,27 @@ void vp8_short_walsh8x4_x8_c(short *input, short *output, int pitch) {
#endif
#if CONFIG_TX16X16
+static const double C1 = 0.995184726672197;
+static const double C2 = 0.98078528040323;
+static const double C3 = 0.956940335732209;
+static const double C4 = 0.923879532511287;
+static const double C5 = 0.881921264348355;
+static const double C6 = 0.831469612302545;
+static const double C7 = 0.773010453362737;
+static const double C8 = 0.707106781186548;
+static const double C9 = 0.634393284163646;
+static const double C10 = 0.555570233019602;
+static const double C11 = 0.471396736825998;
+static const double C12 = 0.38268343236509;
+static const double C13 = 0.290284677254462;
+static const double C14 = 0.195090322016128;
+static const double C15 = 0.098017140329561;
+
static void dct16x16_1d(double input[16], double output[16]) {
double step[16];
double intermediate[16];
double temp1, temp2;
- const double PI = 3.1415926535898;
- const double C1 = cos(1*PI/(double)32);
- const double C2 = cos(2*PI/(double)32);
- const double C3 = cos(3*PI/(double)32);
- const double C4 = cos(4*PI/(double)32);
- const double C5 = cos(5*PI/(double)32);
- const double C6 = cos(6*PI/(double)32);
- const double C7 = cos(7*PI/(double)32);
- const double C8 = cos(8*PI/(double)32);
- const double C9 = cos(9*PI/(double)32);
- const double C10 = cos(10*PI/(double)32);
- const double C11 = cos(11*PI/(double)32);
- const double C12 = cos(12*PI/(double)32);
- const double C13 = cos(13*PI/(double)32);
- const double C14 = cos(14*PI/(double)32);
- const double C15 = cos(15*PI/(double)32);
-
// step 1
step[ 0] = input[0] + input[15];
step[ 1] = input[1] + input[14];
--
GitLab