Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(847)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: source/libvpx/vp9/common/vp9_idctllm.c

Issue 11974002: libvpx: Pull from upstream (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/libvpx/vp9/common/vp9_header.h ('k') | source/libvpx/vp9/common/vp9_implicit_segmentation.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/libvpx/vp9/common/vp9_idctllm.c
===================================================================
--- source/libvpx/vp9/common/vp9_idctllm.c (revision 177019)
+++ source/libvpx/vp9/common/vp9_idctllm.c (working copy)
@@ -24,10 +24,10 @@
**************************************************************************/
#include <assert.h>
#include <math.h>
-#include "vpx_ports/config.h"
+#include "./vpx_config.h"
#include "vp9/common/vp9_systemdependent.h"
-
#include "vp9/common/vp9_blockd.h"
+#include "vp9/common/vp9_common.h"
static const int cospi8sqrt2minus1 = 20091;
static const int sinpi8sqrt2 = 35468;
@@ -159,10 +159,10 @@
/* Converted the transforms to integer form. */
-#define VERTICAL_SHIFT 14 // 16
+#define HORIZONTAL_SHIFT 14 // 16
+#define HORIZONTAL_ROUNDING ((1 << (HORIZONTAL_SHIFT - 1)) - 1)
+#define VERTICAL_SHIFT 17 // 15
#define VERTICAL_ROUNDING ((1 << (VERTICAL_SHIFT - 1)) - 1)
-#define HORIZONTAL_SHIFT 17 // 15
-#define HORIZONTAL_ROUNDING ((1 << (HORIZONTAL_SHIFT - 1)) - 1)
void vp9_ihtllm_c(const int16_t *input, int16_t *output, int pitch,
TX_TYPE tx_type, int tx_dim, uint16_t eobs) {
int i, j, k;
@@ -218,51 +218,57 @@
}
}
- /* vertical transformation */
+ /* 2-D inverse transform X = M1*Z*Transposed_M2 is calculated in 2 steps
+ * from right to left:
+ * 1. horizontal transform: Y= Z*Transposed_M2
+ * 2. vertical transform: X = M1*Y
+ * In SIMD, doing this way could eliminate the transpose needed if it is
+ * calculated from left to right.
+ */
+ /* Horizontal transformation */
for (j = 0; j < tx_dim; j++) {
for (i = 0; i < nz_dim; i++) {
int temp = 0;
for (k = 0; k < nz_dim; k++) {
- temp += ptv[k] * ip[(k * tx_dim)];
+ temp += ip[k] * pth[k];
}
- im[i] = (int16_t)((temp + VERTICAL_ROUNDING) >> VERTICAL_SHIFT);
- ip++;
+ /* Calculate im and store it in its transposed position. */
+ im[i] = (int16_t)((temp + HORIZONTAL_ROUNDING) >> HORIZONTAL_SHIFT);
+ ip += tx_dim;
}
- im += tx_dim; // 16
- ptv += tx_dim;
+ im += tx_dim;
+ pth += tx_dim;
ip = input;
}
- /* horizontal transformation */
+ /* Vertical transformation */
im = &imbuf[0];
- for (j = 0; j < tx_dim; j++) {
- const int16_t *pthc = pth;
-
- for (i = 0; i < tx_dim; i++) {
+ for (i = 0; i < tx_dim; i++) {
+ for (j = 0; j < tx_dim; j++) {
int temp = 0;
for (k = 0; k < nz_dim; k++) {
- temp += im[k] * pthc[k];
+ temp += ptv[k] * im[k];
}
- op[i] = (int16_t)((temp + HORIZONTAL_ROUNDING) >> HORIZONTAL_SHIFT);
- pthc += tx_dim;
+ op[j] = (int16_t)((temp + VERTICAL_ROUNDING) >> VERTICAL_SHIFT);
+ im += tx_dim;
}
-
- im += tx_dim; // 16
+ im = &imbuf[0];
+ ptv += tx_dim;
op += shortpitch;
}
}
-void vp9_short_idct4x4llm_c(short *input, short *output, int pitch) {
+void vp9_short_idct4x4llm_c(int16_t *input, int16_t *output, int pitch) {
int i;
int a1, b1, c1, d1;
- short *ip = input;
- short *op = output;
+ int16_t *ip = input;
+ int16_t *op = output;
int temp1, temp2;
int shortpitch = pitch >> 1;
@@ -314,10 +320,10 @@
}
}
-void vp9_short_idct4x4llm_1_c(short *input, short *output, int pitch) {
+void vp9_short_idct4x4llm_1_c(int16_t *input, int16_t *output, int pitch) {
int i;
int a1;
- short *op = output;
+ int16_t *op = output;
int shortpitch = pitch >> 1;
a1 = ((input[0] + 16) >> 5);
for (i = 0; i < 4; i++) {
@@ -329,22 +335,14 @@
}
}
-void vp9_dc_only_idct_add_c(short input_dc, unsigned char *pred_ptr,
- unsigned char *dst_ptr, int pitch, int stride) {
+void vp9_dc_only_idct_add_c(int input_dc, uint8_t *pred_ptr,
+ uint8_t *dst_ptr, int pitch, int stride) {
int a1 = ((input_dc + 16) >> 5);
int r, c;
for (r = 0; r < 4; r++) {
for (c = 0; c < 4; c++) {
- int a = a1 + pred_ptr[c];
-
- if (a < 0)
- a = 0;
-
- if (a > 255)
- a = 255;
-
- dst_ptr[c] = (unsigned char) a;
+ dst_ptr[c] = clip_pixel(a1 + pred_ptr[c]);
}
dst_ptr += stride;
@@ -352,11 +350,11 @@
}
}
-void vp9_short_inv_walsh4x4_c(short *input, short *output) {
+void vp9_short_inv_walsh4x4_c(int16_t *input, int16_t *output) {
int i;
int a1, b1, c1, d1;
- short *ip = input;
- short *op = output;
+ int16_t *ip = input;
+ int16_t *op = output;
for (i = 0; i < 4; i++) {
a1 = ((ip[0] + ip[3]));
@@ -389,11 +387,11 @@
}
}
-void vp9_short_inv_walsh4x4_1_c(short *in, short *out) {
+void vp9_short_inv_walsh4x4_1_c(int16_t *in, int16_t *out) {
int i;
- short tmp[4];
- short *ip = in;
- short *op = tmp;
+ int16_t tmp[4];
+ int16_t *ip = in;
+ int16_t *op = tmp;
op[0] = (ip[0] + 1) >> 1;
op[1] = op[2] = op[3] = (ip[0] >> 1);
@@ -409,11 +407,11 @@
}
#if CONFIG_LOSSLESS
-void vp9_short_inv_walsh4x4_lossless_c(short *input, short *output) {
+void vp9_short_inv_walsh4x4_lossless_c(int16_t *input, int16_t *output) {
int i;
int a1, b1, c1, d1;
- short *ip = input;
- short *op = output;
+ int16_t *ip = input;
+ int16_t *op = output;
for (i = 0; i < 4; i++) {
a1 = ((ip[0] + ip[3])) >> Y2_WHT_UPSCALE_FACTOR;
@@ -449,11 +447,11 @@
}
}
-void vp9_short_inv_walsh4x4_1_lossless_c(short *in, short *out) {
+void vp9_short_inv_walsh4x4_1_lossless_c(int16_t *in, int16_t *out) {
int i;
- short tmp[4];
- short *ip = in;
- short *op = tmp;
+ int16_t tmp[4];
+ int16_t *ip = in;
+ int16_t *op = tmp;
op[0] = ((ip[0] >> Y2_WHT_UPSCALE_FACTOR) + 1) >> 1;
op[1] = op[2] = op[3] = ((ip[0] >> Y2_WHT_UPSCALE_FACTOR) >> 1);
@@ -468,11 +466,11 @@
}
}
-void vp9_short_inv_walsh4x4_x8_c(short *input, short *output, int pitch) {
+void vp9_short_inv_walsh4x4_x8_c(int16_t *input, int16_t *output, int pitch) {
int i;
int a1, b1, c1, d1;
- short *ip = input;
- short *op = output;
+ int16_t *ip = input;
+ int16_t *op = output;
int shortpitch = pitch >> 1;
for (i = 0; i < 4; i++) {
@@ -509,11 +507,11 @@
}
}
-void vp9_short_inv_walsh4x4_1_x8_c(short *in, short *out, int pitch) {
+void vp9_short_inv_walsh4x4_1_x8_c(int16_t *in, int16_t *out, int pitch) {
int i;
- short tmp[4];
- short *ip = in;
- short *op = tmp;
+ int16_t tmp[4];
+ int16_t *ip = in;
+ int16_t *op = tmp;
int shortpitch = pitch >> 1;
op[0] = ((ip[0] >> WHT_UPSCALE_FACTOR) + 1) >> 1;
@@ -530,8 +528,8 @@
}
}
-void vp9_dc_only_inv_walsh_add_c(short input_dc, unsigned char *pred_ptr,
- unsigned char *dst_ptr,
+void vp9_dc_only_inv_walsh_add_c(short input_dc, uint8_t *pred_ptr,
+ uint8_t *dst_ptr,
int pitch, int stride) {
int r, c;
short tmp[16];
@@ -539,14 +537,7 @@
for (r = 0; r < 4; r++) {
for (c = 0; c < 4; c++) {
- int a = tmp[r * 4 + c] + pred_ptr[c];
- if (a < 0)
- a = 0;
-
- if (a > 255)
- a = 255;
-
- dst_ptr[c] = (unsigned char) a;
+ dst_ptr[c] = clip_pixel(tmp[r * 4 + c] + pred_ptr[c]);
}
dst_ptr += stride;
@@ -556,25 +547,17 @@
#endif
void vp9_dc_only_idct_add_8x8_c(short input_dc,
- unsigned char *pred_ptr,
- unsigned char *dst_ptr,
+ uint8_t *pred_ptr,
+ uint8_t *dst_ptr,
int pitch, int stride) {
int a1 = ((input_dc + 16) >> 5);
int r, c, b;
- unsigned char *orig_pred = pred_ptr;
- unsigned char *orig_dst = dst_ptr;
+ uint8_t *orig_pred = pred_ptr;
+ uint8_t *orig_dst = dst_ptr;
for (b = 0; b < 4; b++) {
for (r = 0; r < 4; r++) {
for (c = 0; c < 4; c++) {
- int a = a1 + pred_ptr[c];
-
- if (a < 0)
- a = 0;
-
- if (a > 255)
- a = 255;
-
- dst_ptr[c] = (unsigned char) a;
+ dst_ptr[c] = clip_pixel(a1 + pred_ptr[c]);
}
dst_ptr += stride;
@@ -662,8 +645,8 @@
(x4 = blk[8 * 1]) | (x5 = blk[8 * 7]) | (x6 = blk[8 * 5]) |
(x7 = blk[8 * 3]))) {
blk[8 * 0] = blk[8 * 1] = blk[8 * 2] = blk[8 * 3]
- = blk[8 * 4] = blk[8 * 5] = blk[8 * 6]
- = blk[8 * 7] = ((blk[8 * 0] + 32) >> 6);
+ = blk[8 * 4] = blk[8 * 5] = blk[8 * 6]
+ = blk[8 * 7] = ((blk[8 * 0] + 32) >> 6);
return;
}
@@ -708,7 +691,7 @@
}
#define TX_DIM 8
-void vp9_short_idct8x8_c(short *coefs, short *block, int pitch) {
+void vp9_short_idct8x8_c(int16_t *coefs, int16_t *block, int pitch) {
int X[TX_DIM * TX_DIM];
int i, j;
int shortpitch = pitch >> 1;
@@ -827,7 +810,7 @@
blk[8 * 7] = (x7 - x1) >> 14;
}
-void vp9_short_idct10_8x8_c(short *coefs, short *block, int pitch) {
+void vp9_short_idct10_8x8_c(int16_t *coefs, int16_t *block, int pitch) {
int X[TX_DIM * TX_DIM];
int i, j;
int shortpitch = pitch >> 1;
@@ -840,7 +823,7 @@
}
/* Do first 4 row idct only since non-zero dct coefficients are all in
- * upper-left 4x4 area. */
+ * upper-left 4x4 area. */
for (i = 0; i < 4; i++)
idctrow10(X + 8 * i);
@@ -854,10 +837,10 @@
}
}
-void vp9_short_ihaar2x2_c(short *input, short *output, int pitch) {
+void vp9_short_ihaar2x2_c(int16_t *input, int16_t *output, int pitch) {
int i;
- short *ip = input; // 0,1, 4, 8
- short *op = output;
+ int16_t *ip = input; // 0, 1, 4, 8
+ int16_t *op = output;
for (i = 0; i < 16; i++) {
op[i] = 0;
}
@@ -871,7 +854,7 @@
#if 0
// Keep a really bad float version as reference for now.
-void vp9_short_idct16x16_c(short *input, short *output, int pitch) {
+void vp9_short_idct16x16_c(int16_t *input, int16_t *output, int pitch) {
vp9_clear_system_state(); // Make it simd safe : __asm emms;
{
@@ -901,25 +884,25 @@
#define TEST_INT_16x16_IDCT 1
#if !TEST_INT_16x16_IDCT
-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]) {
+ 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;
+
vp9_clear_system_state(); // Make it simd safe : __asm emms;
{
double step[16];
@@ -1131,7 +1114,7 @@
}
#endif
-void vp9_short_idct16x16_c(short *input, short *output, int pitch) {
+void vp9_short_idct16x16_c(int16_t *input, int16_t *output, int pitch) {
vp9_clear_system_state(); // Make it simd safe : __asm emms;
{
@@ -1163,6 +1146,12 @@
}
#else
+
+#define INITIAL_SHIFT 2
+#define INITIAL_ROUNDING (1 << (INITIAL_SHIFT - 1))
+#define RIGHT_SHIFT 14
+#define RIGHT_ROUNDING (1 << (RIGHT_SHIFT - 1))
+
static const int16_t C1 = 16305;
static const int16_t C2 = 16069;
static const int16_t C3 = 15679;
@@ -1179,212 +1168,207 @@
static const int16_t C14 = 3196;
static const int16_t C15 = 1606;
-#define INITIAL_SHIFT 2
-#define INITIAL_ROUNDING (1 << (INITIAL_SHIFT - 1))
-#define RIGHT_SHIFT 14
-#define RIGHT_ROUNDING (1 << (RIGHT_SHIFT - 1))
-
static void butterfly_16x16_idct_1d(int16_t input[16], int16_t output[16],
int last_shift_bits) {
- int16_t step[16];
- int intermediate[16];
- int temp1, temp2;
+ int16_t step[16];
+ int intermediate[16];
+ int temp1, temp2;
- int step1_shift = RIGHT_SHIFT + INITIAL_SHIFT;
- int step1_rounding = 1 << (step1_shift - 1);
- int last_rounding = 0;
+ int step1_shift = RIGHT_SHIFT + INITIAL_SHIFT;
+ int step1_rounding = 1 << (step1_shift - 1);
+ int last_rounding = 0;
- if (last_shift_bits > 0)
- last_rounding = 1 << (last_shift_bits - 1);
+ if (last_shift_bits > 0)
+ last_rounding = 1 << (last_shift_bits - 1);
- // step 1 and 2
- step[ 0] = (input[0] + input[8] + INITIAL_ROUNDING) >> INITIAL_SHIFT;
- step[ 1] = (input[0] - input[8] + INITIAL_ROUNDING) >> INITIAL_SHIFT;
+ // step 1 and 2
+ step[ 0] = (input[0] + input[8] + INITIAL_ROUNDING) >> INITIAL_SHIFT;
+ step[ 1] = (input[0] - input[8] + INITIAL_ROUNDING) >> INITIAL_SHIFT;
- temp1 = input[4] * C12;
- temp2 = input[12] * C4;
- temp1 = (temp1 - temp2 + RIGHT_ROUNDING) >> RIGHT_SHIFT;
- temp1 *= C8;
- step[ 2] = (2 * (temp1) + step1_rounding) >> step1_shift;
+ temp1 = input[4] * C12;
+ temp2 = input[12] * C4;
+ temp1 = (temp1 - temp2 + RIGHT_ROUNDING) >> RIGHT_SHIFT;
+ temp1 *= C8;
+ step[ 2] = (2 * (temp1) + step1_rounding) >> step1_shift;
- temp1 = input[4] * C4;
- temp2 = input[12] * C12;
- temp1 = (temp1 + temp2 + RIGHT_ROUNDING) >> RIGHT_SHIFT;
- temp1 *= C8;
- step[ 3] = (2 * (temp1) + step1_rounding) >> step1_shift;
+ temp1 = input[4] * C4;
+ temp2 = input[12] * C12;
+ temp1 = (temp1 + temp2 + RIGHT_ROUNDING) >> RIGHT_SHIFT;
+ temp1 *= C8;
+ step[ 3] = (2 * (temp1) + step1_rounding) >> step1_shift;
- temp1 = input[2] * C8;
- temp1 = (2 * (temp1) + RIGHT_ROUNDING) >> RIGHT_SHIFT;
- temp2 = input[6] + input[10];
- step[ 4] = (temp1 + temp2 + INITIAL_ROUNDING) >> INITIAL_SHIFT;
- step[ 5] = (temp1 - temp2 + INITIAL_ROUNDING) >> INITIAL_SHIFT;
+ temp1 = input[2] * C8;
+ temp1 = (2 * (temp1) + RIGHT_ROUNDING) >> RIGHT_SHIFT;
+ temp2 = input[6] + input[10];
+ step[ 4] = (temp1 + temp2 + INITIAL_ROUNDING) >> INITIAL_SHIFT;
+ step[ 5] = (temp1 - temp2 + INITIAL_ROUNDING) >> INITIAL_SHIFT;
- temp1 = input[14] * C8;
- temp1 = (2 * (temp1) + RIGHT_ROUNDING) >> RIGHT_SHIFT;
- temp2 = input[6] - input[10];
- step[ 6] = (temp2 - temp1 + INITIAL_ROUNDING) >> INITIAL_SHIFT;
- step[ 7] = (temp2 + temp1 + INITIAL_ROUNDING) >> INITIAL_SHIFT;
+ temp1 = input[14] * C8;
+ temp1 = (2 * (temp1) + RIGHT_ROUNDING) >> RIGHT_SHIFT;
+ temp2 = input[6] - input[10];
+ step[ 6] = (temp2 - temp1 + INITIAL_ROUNDING) >> INITIAL_SHIFT;
+ step[ 7] = (temp2 + temp1 + INITIAL_ROUNDING) >> INITIAL_SHIFT;
- // for odd input
- temp1 = input[3] * C12;
- temp2 = input[13] * C4;
- temp1 = (temp1 + temp2 + RIGHT_ROUNDING) >> RIGHT_SHIFT;
- temp1 *= C8;
- intermediate[ 8] = (2 * (temp1) + RIGHT_ROUNDING) >> RIGHT_SHIFT;
+ // for odd input
+ temp1 = input[3] * C12;
+ temp2 = input[13] * C4;
+ temp1 = (temp1 + temp2 + RIGHT_ROUNDING) >> RIGHT_SHIFT;
+ temp1 *= C8;
+ intermediate[ 8] = (2 * (temp1) + RIGHT_ROUNDING) >> RIGHT_SHIFT;
- temp1 = input[3] * C4;
- temp2 = input[13] * C12;
- temp2 = (temp2 - temp1 + RIGHT_ROUNDING) >> RIGHT_SHIFT;
- temp2 *= C8;
- intermediate[ 9] = (2 * (temp2) + RIGHT_ROUNDING) >> RIGHT_SHIFT;
+ temp1 = input[3] * C4;
+ temp2 = input[13] * C12;
+ temp2 = (temp2 - temp1 + RIGHT_ROUNDING) >> RIGHT_SHIFT;
+ temp2 *= C8;
+ intermediate[ 9] = (2 * (temp2) + RIGHT_ROUNDING) >> RIGHT_SHIFT;
- intermediate[10] = (2 * (input[9] * C8) + RIGHT_ROUNDING) >> RIGHT_SHIFT;
- intermediate[11] = input[15] - input[1];
- intermediate[12] = input[15] + input[1];
- intermediate[13] = (2 * (input[7] * C8) + RIGHT_ROUNDING) >> RIGHT_SHIFT;
+ intermediate[10] = (2 * (input[9] * C8) + RIGHT_ROUNDING) >> RIGHT_SHIFT;
+ intermediate[11] = input[15] - input[1];
+ intermediate[12] = input[15] + input[1];
+ intermediate[13] = (2 * (input[7] * C8) + RIGHT_ROUNDING) >> RIGHT_SHIFT;
- temp1 = input[11] * C12;
- temp2 = input[5] * C4;
- temp2 = (temp2 - temp1 + RIGHT_ROUNDING) >> RIGHT_SHIFT;
- temp2 *= C8;
- intermediate[14] = (2 * (temp2) + RIGHT_ROUNDING) >> RIGHT_SHIFT;
+ temp1 = input[11] * C12;
+ temp2 = input[5] * C4;
+ temp2 = (temp2 - temp1 + RIGHT_ROUNDING) >> RIGHT_SHIFT;
+ temp2 *= C8;
+ intermediate[14] = (2 * (temp2) + RIGHT_ROUNDING) >> RIGHT_SHIFT;
- temp1 = input[11] * C4;
- temp2 = input[5] * C12;
- temp1 = (temp1 + temp2 + RIGHT_ROUNDING) >> RIGHT_SHIFT;
- temp1 *= C8;
- intermediate[15] = (2 * (temp1) + RIGHT_ROUNDING) >> RIGHT_SHIFT;
+ temp1 = input[11] * C4;
+ temp2 = input[5] * C12;
+ temp1 = (temp1 + temp2 + RIGHT_ROUNDING) >> RIGHT_SHIFT;
+ temp1 *= C8;
+ intermediate[15] = (2 * (temp1) + RIGHT_ROUNDING) >> RIGHT_SHIFT;
- step[ 8] = (intermediate[ 8] + intermediate[14] + INITIAL_ROUNDING)
- >> INITIAL_SHIFT;
- step[ 9] = (intermediate[ 9] + intermediate[15] + INITIAL_ROUNDING)
- >> INITIAL_SHIFT;
- step[10] = (intermediate[10] + intermediate[11] + INITIAL_ROUNDING)
- >> INITIAL_SHIFT;
- step[11] = (intermediate[10] - intermediate[11] + INITIAL_ROUNDING)
- >> INITIAL_SHIFT;
- step[12] = (intermediate[12] + intermediate[13] + INITIAL_ROUNDING)
- >> INITIAL_SHIFT;
- step[13] = (intermediate[12] - intermediate[13] + INITIAL_ROUNDING)
- >> INITIAL_SHIFT;
- step[14] = (intermediate[ 8] - intermediate[14] + INITIAL_ROUNDING)
- >> INITIAL_SHIFT;
- step[15] = (intermediate[ 9] - intermediate[15] + INITIAL_ROUNDING)
- >> INITIAL_SHIFT;
+ step[ 8] = (intermediate[ 8] + intermediate[14] + INITIAL_ROUNDING)
+ >> INITIAL_SHIFT;
+ step[ 9] = (intermediate[ 9] + intermediate[15] + INITIAL_ROUNDING)
+ >> INITIAL_SHIFT;
+ step[10] = (intermediate[10] + intermediate[11] + INITIAL_ROUNDING)
+ >> INITIAL_SHIFT;
+ step[11] = (intermediate[10] - intermediate[11] + INITIAL_ROUNDING)
+ >> INITIAL_SHIFT;
+ step[12] = (intermediate[12] + intermediate[13] + INITIAL_ROUNDING)
+ >> INITIAL_SHIFT;
+ step[13] = (intermediate[12] - intermediate[13] + INITIAL_ROUNDING)
+ >> INITIAL_SHIFT;
+ step[14] = (intermediate[ 8] - intermediate[14] + INITIAL_ROUNDING)
+ >> INITIAL_SHIFT;
+ step[15] = (intermediate[ 9] - intermediate[15] + INITIAL_ROUNDING)
+ >> INITIAL_SHIFT;
- // step 3
- output[0] = step[ 0] + step[ 3];
- output[1] = step[ 1] + step[ 2];
- output[2] = step[ 1] - step[ 2];
- output[3] = step[ 0] - step[ 3];
+ // step 3
+ output[0] = step[ 0] + step[ 3];
+ output[1] = step[ 1] + step[ 2];
+ output[2] = step[ 1] - step[ 2];
+ output[3] = step[ 0] - step[ 3];
- temp1 = step[ 4] * C14;
- temp2 = step[ 7] * C2;
- output[4] = (temp1 - temp2 + RIGHT_ROUNDING) >> RIGHT_SHIFT;
+ temp1 = step[ 4] * C14;
+ temp2 = step[ 7] * C2;
+ output[4] = (temp1 - temp2 + RIGHT_ROUNDING) >> RIGHT_SHIFT;
- temp1 = step[ 4] * C2;
- temp2 = step[ 7] * C14;
- output[7] = (temp1 + temp2 + RIGHT_ROUNDING) >> RIGHT_SHIFT;
+ temp1 = step[ 4] * C2;
+ temp2 = step[ 7] * C14;
+ output[7] = (temp1 + temp2 + RIGHT_ROUNDING) >> RIGHT_SHIFT;
- temp1 = step[ 5] * C10;
- temp2 = step[ 6] * C6;
- output[5] = (temp1 - temp2 + RIGHT_ROUNDING) >> RIGHT_SHIFT;
+ temp1 = step[ 5] * C10;
+ temp2 = step[ 6] * C6;
+ output[5] = (temp1 - temp2 + RIGHT_ROUNDING) >> RIGHT_SHIFT;
- temp1 = step[ 5] * C6;
- temp2 = step[ 6] * C10;
- output[6] = (temp1 + temp2 + RIGHT_ROUNDING) >> RIGHT_SHIFT;
+ temp1 = step[ 5] * C6;
+ temp2 = step[ 6] * C10;
+ output[6] = (temp1 + temp2 + RIGHT_ROUNDING) >> RIGHT_SHIFT;
- output[8] = step[ 8] + step[11];
- output[9] = step[ 9] + step[10];
- output[10] = step[ 9] - step[10];
- output[11] = step[ 8] - step[11];
- output[12] = step[12] + step[15];
- output[13] = step[13] + step[14];
- output[14] = step[13] - step[14];
- output[15] = step[12] - step[15];
+ output[8] = step[ 8] + step[11];
+ output[9] = step[ 9] + step[10];
+ output[10] = step[ 9] - step[10];
+ output[11] = step[ 8] - step[11];
+ output[12] = step[12] + step[15];
+ output[13] = step[13] + step[14];
+ output[14] = step[13] - step[14];
+ output[15] = step[12] - step[15];
- // output 4
- step[ 0] = output[0] + output[7];
- step[ 1] = output[1] + output[6];
- step[ 2] = output[2] + output[5];
- step[ 3] = output[3] + output[4];
- step[ 4] = output[3] - output[4];
- step[ 5] = output[2] - output[5];
- step[ 6] = output[1] - output[6];
- step[ 7] = output[0] - output[7];
+ // output 4
+ step[ 0] = output[0] + output[7];
+ step[ 1] = output[1] + output[6];
+ step[ 2] = output[2] + output[5];
+ step[ 3] = output[3] + output[4];
+ step[ 4] = output[3] - output[4];
+ step[ 5] = output[2] - output[5];
+ step[ 6] = output[1] - output[6];
+ step[ 7] = output[0] - output[7];
- temp1 = output[8] * C7;
- temp2 = output[15] * C9;
- step[ 8] = (temp1 - temp2 + RIGHT_ROUNDING) >> RIGHT_SHIFT;
+ temp1 = output[8] * C7;
+ temp2 = output[15] * C9;
+ step[ 8] = (temp1 - temp2 + RIGHT_ROUNDING) >> RIGHT_SHIFT;
- temp1 = output[9] * C11;
- temp2 = output[14] * C5;
- step[ 9] = (temp1 + temp2 + RIGHT_ROUNDING) >> RIGHT_SHIFT;
+ temp1 = output[9] * C11;
+ temp2 = output[14] * C5;
+ step[ 9] = (temp1 + temp2 + RIGHT_ROUNDING) >> RIGHT_SHIFT;
- temp1 = output[10] * C3;
- temp2 = output[13] * C13;
- step[10] = (temp1 - temp2 + RIGHT_ROUNDING) >> RIGHT_SHIFT;
+ temp1 = output[10] * C3;
+ temp2 = output[13] * C13;
+ step[10] = (temp1 - temp2 + RIGHT_ROUNDING) >> RIGHT_SHIFT;
- temp1 = output[11] * C15;
- temp2 = output[12] * C1;
- step[11] = (temp1 + temp2 + RIGHT_ROUNDING) >> RIGHT_SHIFT;
+ temp1 = output[11] * C15;
+ temp2 = output[12] * C1;
+ step[11] = (temp1 + temp2 + RIGHT_ROUNDING) >> RIGHT_SHIFT;
- temp1 = output[11] * C1;
- temp2 = output[12] * C15;
- step[12] = (temp2 - temp1 + RIGHT_ROUNDING) >> RIGHT_SHIFT;
+ temp1 = output[11] * C1;
+ temp2 = output[12] * C15;
+ step[12] = (temp2 - temp1 + RIGHT_ROUNDING) >> RIGHT_SHIFT;
- temp1 = output[10] * C13;
- temp2 = output[13] * C3;
- step[13] = (temp1 + temp2 + RIGHT_ROUNDING) >> RIGHT_SHIFT;
+ temp1 = output[10] * C13;
+ temp2 = output[13] * C3;
+ step[13] = (temp1 + temp2 + RIGHT_ROUNDING) >> RIGHT_SHIFT;
- temp1 = output[9] * C5;
- temp2 = output[14] * C11;
- step[14] = (temp2 - temp1 + RIGHT_ROUNDING) >> RIGHT_SHIFT;
+ temp1 = output[9] * C5;
+ temp2 = output[14] * C11;
+ step[14] = (temp2 - temp1 + RIGHT_ROUNDING) >> RIGHT_SHIFT;
- temp1 = output[8] * C9;
- temp2 = output[15] * C7;
- step[15] = (temp1 + temp2 + RIGHT_ROUNDING) >> RIGHT_SHIFT;
+ temp1 = output[8] * C9;
+ temp2 = output[15] * C7;
+ step[15] = (temp1 + temp2 + RIGHT_ROUNDING) >> RIGHT_SHIFT;
- // step 5
- output[0] = (step[0] + step[15] + last_rounding) >> last_shift_bits;
- output[1] = (step[1] + step[14] + last_rounding) >> last_shift_bits;
- output[2] = (step[2] + step[13] + last_rounding) >> last_shift_bits;
- output[3] = (step[3] + step[12] + last_rounding) >> last_shift_bits;
- output[4] = (step[4] + step[11] + last_rounding) >> last_shift_bits;
- output[5] = (step[5] + step[10] + last_rounding) >> last_shift_bits;
- output[6] = (step[6] + step[ 9] + last_rounding) >> last_shift_bits;
- output[7] = (step[7] + step[ 8] + last_rounding) >> last_shift_bits;
+ // step 5
+ output[0] = (step[0] + step[15] + last_rounding) >> last_shift_bits;
+ output[1] = (step[1] + step[14] + last_rounding) >> last_shift_bits;
+ output[2] = (step[2] + step[13] + last_rounding) >> last_shift_bits;
+ output[3] = (step[3] + step[12] + last_rounding) >> last_shift_bits;
+ output[4] = (step[4] + step[11] + last_rounding) >> last_shift_bits;
+ output[5] = (step[5] + step[10] + last_rounding) >> last_shift_bits;
+ output[6] = (step[6] + step[ 9] + last_rounding) >> last_shift_bits;
+ output[7] = (step[7] + step[ 8] + last_rounding) >> last_shift_bits;
- output[15] = (step[0] - step[15] + last_rounding) >> last_shift_bits;
- output[14] = (step[1] - step[14] + last_rounding) >> last_shift_bits;
- output[13] = (step[2] - step[13] + last_rounding) >> last_shift_bits;
- output[12] = (step[3] - step[12] + last_rounding) >> last_shift_bits;
- output[11] = (step[4] - step[11] + last_rounding) >> last_shift_bits;
- output[10] = (step[5] - step[10] + last_rounding) >> last_shift_bits;
- output[9] = (step[6] - step[ 9] + last_rounding) >> last_shift_bits;
- output[8] = (step[7] - step[ 8] + last_rounding) >> last_shift_bits;
+ output[15] = (step[0] - step[15] + last_rounding) >> last_shift_bits;
+ output[14] = (step[1] - step[14] + last_rounding) >> last_shift_bits;
+ output[13] = (step[2] - step[13] + last_rounding) >> last_shift_bits;
+ output[12] = (step[3] - step[12] + last_rounding) >> last_shift_bits;
+ output[11] = (step[4] - step[11] + last_rounding) >> last_shift_bits;
+ output[10] = (step[5] - step[10] + last_rounding) >> last_shift_bits;
+ output[9] = (step[6] - step[ 9] + last_rounding) >> last_shift_bits;
+ output[8] = (step[7] - step[ 8] + last_rounding) >> last_shift_bits;
}
void vp9_short_idct16x16_c(int16_t *input, int16_t *output, int pitch) {
- int16_t out[16 * 16];
- int16_t *outptr = &out[0];
- const int short_pitch = pitch >> 1;
- int i, j;
- int16_t temp_in[16], temp_out[16];
+ int16_t out[16 * 16];
+ int16_t *outptr = &out[0];
+ const int short_pitch = pitch >> 1;
+ int i, j;
+ int16_t temp_in[16], temp_out[16];
- // First transform rows
- for (i = 0; i < 16; ++i) {
- butterfly_16x16_idct_1d(input, outptr, 0);
- input += short_pitch;
- outptr += 16;
- }
+ // First transform rows
+ for (i = 0; i < 16; ++i) {
+ butterfly_16x16_idct_1d(input, outptr, 0);
+ input += short_pitch;
+ outptr += 16;
+ }
- // Then transform columns
- for (i = 0; i < 16; ++i) {
- for (j = 0; j < 16; ++j)
- temp_in[j] = out[j * 16 + i];
- butterfly_16x16_idct_1d(temp_in, temp_out, 3);
- for (j = 0; j < 16; ++j)
+ // Then transform columns
+ for (i = 0; i < 16; ++i) {
+ for (j = 0; j < 16; ++j)
+ temp_in[j] = out[j * 16 + i];
+ butterfly_16x16_idct_1d(temp_in, temp_out, 3);
+ for (j = 0; j < 16; ++j)
output[j * 16 + i] = temp_out[j];
}
}
@@ -1548,3 +1532,1139 @@
#undef RIGHT_SHIFT
#undef RIGHT_ROUNDING
#endif
+
+#if !CONFIG_DWTDCTHYBRID
+#define DownshiftMultiplyBy2(x) x * 2
+#define DownshiftMultiply(x) x
+
+static void idct16(double *input, double *output, int stride) {
+ 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;
+
+ double step[16];
+ double intermediate[16];
+ double temp1, temp2;
+
+ // step 1 and 2
+ step[ 0] = input[stride*0] + input[stride*8];
+ step[ 1] = input[stride*0] - input[stride*8];
+
+ temp1 = input[stride*4]*C12;
+ temp2 = input[stride*12]*C4;
+
+ temp1 -= temp2;
+ temp1 = DownshiftMultiply(temp1);
+ temp1 *= C8;
+
+ step[ 2] = DownshiftMultiplyBy2(temp1);
+
+ temp1 = input[stride*4]*C4;
+ temp2 = input[stride*12]*C12;
+ temp1 += temp2;
+ temp1 = DownshiftMultiply(temp1);
+ temp1 *= C8;
+ step[ 3] = DownshiftMultiplyBy2(temp1);
+
+ temp1 = input[stride*2]*C8;
+ temp1 = DownshiftMultiplyBy2(temp1);
+ temp2 = input[stride*6] + input[stride*10];
+
+ step[ 4] = temp1 + temp2;
+ step[ 5] = temp1 - temp2;
+
+ temp1 = input[stride*14]*C8;
+ temp1 = DownshiftMultiplyBy2(temp1);
+ temp2 = input[stride*6] - input[stride*10];
+
+ step[ 6] = temp2 - temp1;
+ step[ 7] = temp2 + temp1;
+
+ // for odd input
+ temp1 = input[stride*3]*C12;
+ temp2 = input[stride*13]*C4;
+ temp1 += temp2;
+ temp1 = DownshiftMultiply(temp1);
+ temp1 *= C8;
+ intermediate[ 8] = DownshiftMultiplyBy2(temp1);
+
+ temp1 = input[stride*3]*C4;
+ temp2 = input[stride*13]*C12;
+ temp2 -= temp1;
+ temp2 = DownshiftMultiply(temp2);
+ temp2 *= C8;
+ intermediate[ 9] = DownshiftMultiplyBy2(temp2);
+
+ intermediate[10] = DownshiftMultiplyBy2(input[stride*9]*C8);
+ intermediate[11] = input[stride*15] - input[stride*1];
+ intermediate[12] = input[stride*15] + input[stride*1];
+ intermediate[13] = DownshiftMultiplyBy2((input[stride*7]*C8));
+
+ temp1 = input[stride*11]*C12;
+ temp2 = input[stride*5]*C4;
+ temp2 -= temp1;
+ temp2 = DownshiftMultiply(temp2);
+ temp2 *= C8;
+ intermediate[14] = DownshiftMultiplyBy2(temp2);
+
+ temp1 = input[stride*11]*C4;
+ temp2 = input[stride*5]*C12;
+ temp1 += temp2;
+ temp1 = DownshiftMultiply(temp1);
+ temp1 *= C8;
+ intermediate[15] = DownshiftMultiplyBy2(temp1);
+
+ step[ 8] = intermediate[ 8] + intermediate[14];
+ step[ 9] = intermediate[ 9] + intermediate[15];
+ step[10] = intermediate[10] + intermediate[11];
+ step[11] = intermediate[10] - intermediate[11];
+ step[12] = intermediate[12] + intermediate[13];
+ step[13] = intermediate[12] - intermediate[13];
+ step[14] = intermediate[ 8] - intermediate[14];
+ step[15] = intermediate[ 9] - intermediate[15];
+
+ // step 3
+ output[stride*0] = step[ 0] + step[ 3];
+ output[stride*1] = step[ 1] + step[ 2];
+ output[stride*2] = step[ 1] - step[ 2];
+ output[stride*3] = step[ 0] - step[ 3];
+
+ temp1 = step[ 4]*C14;
+ temp2 = step[ 7]*C2;
+ temp1 -= temp2;
+ output[stride*4] = DownshiftMultiply(temp1);
+
+ temp1 = step[ 4]*C2;
+ temp2 = step[ 7]*C14;
+ temp1 += temp2;
+ output[stride*7] = DownshiftMultiply(temp1);
+
+ temp1 = step[ 5]*C10;
+ temp2 = step[ 6]*C6;
+ temp1 -= temp2;
+ output[stride*5] = DownshiftMultiply(temp1);
+
+ temp1 = step[ 5]*C6;
+ temp2 = step[ 6]*C10;
+ temp1 += temp2;
+ output[stride*6] = DownshiftMultiply(temp1);
+
+ output[stride*8] = step[ 8] + step[11];
+ output[stride*9] = step[ 9] + step[10];
+ output[stride*10] = step[ 9] - step[10];
+ output[stride*11] = step[ 8] - step[11];
+ output[stride*12] = step[12] + step[15];
+ output[stride*13] = step[13] + step[14];
+ output[stride*14] = step[13] - step[14];
+ output[stride*15] = step[12] - step[15];
+
+ // output 4
+ step[ 0] = output[stride*0] + output[stride*7];
+ step[ 1] = output[stride*1] + output[stride*6];
+ step[ 2] = output[stride*2] + output[stride*5];
+ step[ 3] = output[stride*3] + output[stride*4];
+ step[ 4] = output[stride*3] - output[stride*4];
+ step[ 5] = output[stride*2] - output[stride*5];
+ step[ 6] = output[stride*1] - output[stride*6];
+ step[ 7] = output[stride*0] - output[stride*7];
+
+ temp1 = output[stride*8]*C7;
+ temp2 = output[stride*15]*C9;
+ temp1 -= temp2;
+ step[ 8] = DownshiftMultiply(temp1);
+
+ temp1 = output[stride*9]*C11;
+ temp2 = output[stride*14]*C5;
+ temp1 += temp2;
+ step[ 9] = DownshiftMultiply(temp1);
+
+ temp1 = output[stride*10]*C3;
+ temp2 = output[stride*13]*C13;
+ temp1 -= temp2;
+ step[10] = DownshiftMultiply(temp1);
+
+ temp1 = output[stride*11]*C15;
+ temp2 = output[stride*12]*C1;
+ temp1 += temp2;
+ step[11] = DownshiftMultiply(temp1);
+
+ temp1 = output[stride*11]*C1;
+ temp2 = output[stride*12]*C15;
+ temp2 -= temp1;
+ step[12] = DownshiftMultiply(temp2);
+
+ temp1 = output[stride*10]*C13;
+ temp2 = output[stride*13]*C3;
+ temp1 += temp2;
+ step[13] = DownshiftMultiply(temp1);
+
+ temp1 = output[stride*9]*C5;
+ temp2 = output[stride*14]*C11;
+ temp2 -= temp1;
+ step[14] = DownshiftMultiply(temp2);
+
+ temp1 = output[stride*8]*C9;
+ temp2 = output[stride*15]*C7;
+ temp1 += temp2;
+ step[15] = DownshiftMultiply(temp1);
+
+ // step 5
+ output[stride*0] = step[0] + step[15];
+ output[stride*1] = step[1] + step[14];
+ output[stride*2] = step[2] + step[13];
+ output[stride*3] = step[3] + step[12];
+ output[stride*4] = step[4] + step[11];
+ output[stride*5] = step[5] + step[10];
+ output[stride*6] = step[6] + step[ 9];
+ output[stride*7] = step[7] + step[ 8];
+
+ output[stride*15] = step[0] - step[15];
+ output[stride*14] = step[1] - step[14];
+ output[stride*13] = step[2] - step[13];
+ output[stride*12] = step[3] - step[12];
+ output[stride*11] = step[4] - step[11];
+ output[stride*10] = step[5] - step[10];
+ output[stride*9] = step[6] - step[ 9];
+ output[stride*8] = step[7] - step[ 8];
+}
+
+static void butterfly_32_idct_1d(double *input, double *output, int stride) {
+ static const double C1 = 0.998795456205; // cos(pi * 1 / 64)
+ static const double C3 = 0.989176509965; // cos(pi * 3 / 64)
+ static const double C5 = 0.970031253195; // cos(pi * 5 / 64)
+ static const double C7 = 0.941544065183; // cos(pi * 7 / 64)
+ static const double C9 = 0.903989293123; // cos(pi * 9 / 64)
+ static const double C11 = 0.857728610000; // cos(pi * 11 / 64)
+ static const double C13 = 0.803207531481; // cos(pi * 13 / 64)
+ static const double C15 = 0.740951125355; // cos(pi * 15 / 64)
+ static const double C16 = 0.707106781187; // cos(pi * 16 / 64)
+ static const double C17 = 0.671558954847; // cos(pi * 17 / 64)
+ static const double C19 = 0.595699304492; // cos(pi * 19 / 64)
+ static const double C21 = 0.514102744193; // cos(pi * 21 / 64)
+ static const double C23 = 0.427555093430; // cos(pi * 23 / 64)
+ static const double C25 = 0.336889853392; // cos(pi * 25 / 64)
+ static const double C27 = 0.242980179903; // cos(pi * 27 / 64)
+ static const double C29 = 0.146730474455; // cos(pi * 29 / 64)
+ static const double C31 = 0.049067674327; // cos(pi * 31 / 64)
+
+ double step1[32];
+ double step2[32];
+
+ step1[ 0] = input[stride*0];
+ step1[ 1] = input[stride*2];
+ step1[ 2] = input[stride*4];
+ step1[ 3] = input[stride*6];
+ step1[ 4] = input[stride*8];
+ step1[ 5] = input[stride*10];
+ step1[ 6] = input[stride*12];
+ step1[ 7] = input[stride*14];
+ step1[ 8] = input[stride*16];
+ step1[ 9] = input[stride*18];
+ step1[10] = input[stride*20];
+ step1[11] = input[stride*22];
+ step1[12] = input[stride*24];
+ step1[13] = input[stride*26];
+ step1[14] = input[stride*28];
+ step1[15] = input[stride*30];
+
+ step1[16] = DownshiftMultiplyBy2(input[stride*1]*C16);
+ step1[17] = (input[stride*3] + input[stride*1]);
+ step1[18] = (input[stride*5] + input[stride*3]);
+ step1[19] = (input[stride*7] + input[stride*5]);
+ step1[20] = (input[stride*9] + input[stride*7]);
+ step1[21] = (input[stride*11] + input[stride*9]);
+ step1[22] = (input[stride*13] + input[stride*11]);
+ step1[23] = (input[stride*15] + input[stride*13]);
+ step1[24] = (input[stride*17] + input[stride*15]);
+ step1[25] = (input[stride*19] + input[stride*17]);
+ step1[26] = (input[stride*21] + input[stride*19]);
+ step1[27] = (input[stride*23] + input[stride*21]);
+ step1[28] = (input[stride*25] + input[stride*23]);
+ step1[29] = (input[stride*27] + input[stride*25]);
+ step1[30] = (input[stride*29] + input[stride*27]);
+ step1[31] = (input[stride*31] + input[stride*29]);
+
+ idct16(step1, step2, 1);
+ idct16(step1 + 16, step2 + 16, 1);
+
+ step2[16] = DownshiftMultiply(step2[16] / (2*C1));
+ step2[17] = DownshiftMultiply(step2[17] / (2*C3));
+ step2[18] = DownshiftMultiply(step2[18] / (2*C5));
+ step2[19] = DownshiftMultiply(step2[19] / (2*C7));
+ step2[20] = DownshiftMultiply(step2[20] / (2*C9));
+ step2[21] = DownshiftMultiply(step2[21] / (2*C11));
+ step2[22] = DownshiftMultiply(step2[22] / (2*C13));
+ step2[23] = DownshiftMultiply(step2[23] / (2*C15));
+ step2[24] = DownshiftMultiply(step2[24] / (2*C17));
+ step2[25] = DownshiftMultiply(step2[25] / (2*C19));
+ step2[26] = DownshiftMultiply(step2[26] / (2*C21));
+ step2[27] = DownshiftMultiply(step2[27] / (2*C23));
+ step2[28] = DownshiftMultiply(step2[28] / (2*C25));
+ step2[29] = DownshiftMultiply(step2[29] / (2*C27));
+ step2[30] = DownshiftMultiply(step2[30] / (2*C29));
+ step2[31] = DownshiftMultiply(step2[31] / (2*C31));
+
+ output[stride* 0] = step2[ 0] + step2[16];
+ output[stride* 1] = step2[ 1] + step2[17];
+ output[stride* 2] = step2[ 2] + step2[18];
+ output[stride* 3] = step2[ 3] + step2[19];
+ output[stride* 4] = step2[ 4] + step2[20];
+ output[stride* 5] = step2[ 5] + step2[21];
+ output[stride* 6] = step2[ 6] + step2[22];
+ output[stride* 7] = step2[ 7] + step2[23];
+ output[stride* 8] = step2[ 8] + step2[24];
+ output[stride* 9] = step2[ 9] + step2[25];
+ output[stride*10] = step2[10] + step2[26];
+ output[stride*11] = step2[11] + step2[27];
+ output[stride*12] = step2[12] + step2[28];
+ output[stride*13] = step2[13] + step2[29];
+ output[stride*14] = step2[14] + step2[30];
+ output[stride*15] = step2[15] + step2[31];
+ output[stride*16] = step2[15] - step2[(31 - 0)];
+ output[stride*17] = step2[14] - step2[(31 - 1)];
+ output[stride*18] = step2[13] - step2[(31 - 2)];
+ output[stride*19] = step2[12] - step2[(31 - 3)];
+ output[stride*20] = step2[11] - step2[(31 - 4)];
+ output[stride*21] = step2[10] - step2[(31 - 5)];
+ output[stride*22] = step2[ 9] - step2[(31 - 6)];
+ output[stride*23] = step2[ 8] - step2[(31 - 7)];
+ output[stride*24] = step2[ 7] - step2[(31 - 8)];
+ output[stride*25] = step2[ 6] - step2[(31 - 9)];
+ output[stride*26] = step2[ 5] - step2[(31 - 10)];
+ output[stride*27] = step2[ 4] - step2[(31 - 11)];
+ output[stride*28] = step2[ 3] - step2[(31 - 12)];
+ output[stride*29] = step2[ 2] - step2[(31 - 13)];
+ output[stride*30] = step2[ 1] - step2[(31 - 14)];
+ output[stride*31] = step2[ 0] - step2[(31 - 15)];
+}
+
+void vp9_short_idct32x32_c(int16_t *input, int16_t *output, int pitch) {
+ vp9_clear_system_state(); // Make it simd safe : __asm emms;
+ {
+ double out[32*32], out2[32*32];
+ const int short_pitch = pitch >> 1;
+ int i, j;
+ // First transform rows
+ for (i = 0; i < 32; ++i) {
+ double temp_in[32], temp_out[32];
+ for (j = 0; j < 32; ++j)
+ temp_in[j] = input[j + i*short_pitch];
+ butterfly_32_idct_1d(temp_in, temp_out, 1);
+ for (j = 0; j < 32; ++j)
+ out[j + i*32] = temp_out[j];
+ }
+ // Then transform columns
+ for (i = 0; i < 32; ++i) {
+ double temp_in[32], temp_out[32];
+ for (j = 0; j < 32; ++j)
+ temp_in[j] = out[j*32 + i];
+ butterfly_32_idct_1d(temp_in, temp_out, 1);
+ for (j = 0; j < 32; ++j)
+ out2[j*32 + i] = temp_out[j];
+ }
+ for (i = 0; i < 32*32; ++i)
+ output[i] = round(out2[i]/128);
+ }
+ vp9_clear_system_state(); // Make it simd safe : __asm emms;
+}
+
+#else // !CONFIG_DWTDCTHYBRID
+
+#if DWT_TYPE == 53
+
+// Note: block length must be even for this implementation
+static void synthesis_53_row(int length, int16_t *lowpass, int16_t *highpass,
+ int16_t *x) {
+ int16_t r, *a, *b;
+ int n;
+
+ n = length >> 1;
+ b = highpass;
+ a = lowpass;
+ r = *highpass;
+ while (n--) {
+ *a++ -= (r + (*b) + 1) >> 1;
+ r = *b++;
+ }
+
+ n = length >> 1;
+ b = highpass;
+ a = lowpass;
+ while (--n) {
+ *x++ = ((r = *a++) + 1) >> 1;
+ *x++ = *b++ + ((r + (*a) + 2) >> 2);
+ }
+ *x++ = ((r = *a) + 1) >> 1;
+ *x++ = *b + ((r + 1) >> 1);
+}
+
+static void synthesis_53_col(int length, int16_t *lowpass, int16_t *highpass,
+ int16_t *x) {
+ int16_t r, *a, *b;
+ int n;
+
+ n = length >> 1;
+ b = highpass;
+ a = lowpass;
+ r = *highpass;
+ while (n--) {
+ *a++ -= (r + (*b) + 1) >> 1;
+ r = *b++;
+ }
+
+ n = length >> 1;
+ b = highpass;
+ a = lowpass;
+ while (--n) {
+ r = *a++;
+ *x++ = r;
+ *x++ = ((*b++) << 1) + ((r + (*a) + 1) >> 1);
+ }
+ *x++ = *a;
+ *x++ = ((*b) << 1) + *a;
+}
+
+static void dyadic_synthesize_53(int levels, int width, int height, int16_t *c,
+ int pitch_c, int16_t *x, int pitch_x) {
+ int th[16], tw[16], lv, i, j, nh, nw, hh = height, hw = width;
+ short buffer[2 * DWT_MAX_LENGTH];
+
+ th[0] = hh;
+ tw[0] = hw;
+ for (i = 1; i <= levels; i++) {
+ th[i] = (th[i - 1] + 1) >> 1;
+ tw[i] = (tw[i - 1] + 1) >> 1;
+ }
+ for (lv = levels - 1; lv >= 0; lv--) {
+ nh = th[lv];
+ nw = tw[lv];
+ hh = th[lv + 1];
+ hw = tw[lv + 1];
+ if ((nh < 2) || (nw < 2)) continue;
+ for (j = 0; j < nw; j++) {
+ for (i = 0; i < nh; i++)
+ buffer[i] = c[i * pitch_c + j];
+ synthesis_53_col(nh, buffer, buffer + hh, buffer + nh);
+ for (i = 0; i < nh; i++)
+ c[i * pitch_c + j] = buffer[i + nh];
+ }
+ for (i = 0; i < nh; i++) {
+ memcpy(buffer, &c[i * pitch_c], nw * sizeof(*buffer));
+ synthesis_53_row(nw, buffer, buffer + hw, &c[i * pitch_c]);
+ }
+ }
+ for (i = 0; i < height; i++) {
+ for (j = 0; j < width; j++) {
+ x[i * pitch_x + j] = c[i * pitch_c + j] >= 0 ?
+ ((c[i * pitch_c + j] + DWT_PRECISION_RND) >> DWT_PRECISION_BITS) :
+ -((-c[i * pitch_c + j] + DWT_PRECISION_RND) >> DWT_PRECISION_BITS);
+ }
+ }
+}
+
+#elif DWT_TYPE == 26
+
+// Note: block length must be even for this implementation
+static void synthesis_26_row(int length, int16_t *lowpass, int16_t *highpass,
+ int16_t *x) {
+ int16_t r, s, *a, *b;
+ int i, n = length >> 1;
+
+ if (n >= 4) {
+ a = lowpass;
+ b = highpass;
+ r = *lowpass;
+ while (--n) {
+ *b++ += (r - a[1] + 4) >> 3;
+ r = *a++;
+ }
+ *b += (r - *a + 4) >> 3;
+ }
+ a = lowpass;
+ b = highpass;
+ for (i = length >> 1; i; i--) {
+ s = *b++;
+ r = *a++;
+ *x++ = (r + s + 1) >> 1;
+ *x++ = (r - s + 1) >> 1;
+ }
+}
+
+static void synthesis_26_col(int length, int16_t *lowpass, int16_t *highpass,
+ int16_t *x) {
+ int16_t r, s, *a, *b;
+ int i, n = length >> 1;
+
+ if (n >= 4) {
+ a = lowpass;
+ b = highpass;
+ r = *lowpass;
+ while (--n) {
+ *b++ += (r - a[1] + 4) >> 3;
+ r = *a++;
+ }
+ *b += (r - *a + 4) >> 3;
+ }
+ a = lowpass;
+ b = highpass;
+ for (i = length >> 1; i; i--) {
+ s = *b++;
+ r = *a++;
+ *x++ = r + s;
+ *x++ = r - s;
+ }
+}
+
+static void dyadic_synthesize_26(int levels, int width, int height, int16_t *c,
+ int pitch_c, int16_t *x, int pitch_x) {
+ int th[16], tw[16], lv, i, j, nh, nw, hh = height, hw = width;
+ int16_t buffer[2 * DWT_MAX_LENGTH];
+
+ th[0] = hh;
+ tw[0] = hw;
+ for (i = 1; i <= levels; i++) {
+ th[i] = (th[i - 1] + 1) >> 1;
+ tw[i] = (tw[i - 1] + 1) >> 1;
+ }
+ for (lv = levels - 1; lv >= 0; lv--) {
+ nh = th[lv];
+ nw = tw[lv];
+ hh = th[lv + 1];
+ hw = tw[lv + 1];
+ if ((nh < 2) || (nw < 2)) continue;
+ for (j = 0; j < nw; j++) {
+ for (i = 0; i < nh; i++)
+ buffer[i] = c[i * pitch_c + j];
+ synthesis_26_col(nh, buffer, buffer + hh, buffer + nh);
+ for (i = 0; i < nh; i++)
+ c[i * pitch_c + j] = buffer[i + nh];
+ }
+ for (i = 0; i < nh; i++) {
+ memcpy(buffer, &c[i * pitch_c], nw * sizeof(*buffer));
+ synthesis_26_row(nw, buffer, buffer + hw, &c[i * pitch_c]);
+ }
+ }
+ for (i = 0; i < height; i++) {
+ for (j = 0; j < width; j++) {
+ x[i * pitch_x + j] = c[i * pitch_c + j] >= 0 ?
+ ((c[i * pitch_c + j] + DWT_PRECISION_RND) >> DWT_PRECISION_BITS) :
+ -((-c[i * pitch_c + j] + DWT_PRECISION_RND) >> DWT_PRECISION_BITS);
+ }
+ }
+}
+
+#elif DWT_TYPE == 97
+
+static void synthesis_97(int length, double *lowpass, double *highpass,
+ double *x) {
+ static const double a_predict1 = -1.586134342;
+ static const double a_update1 = -0.05298011854;
+ static const double a_predict2 = 0.8829110762;
+ static const double a_update2 = 0.4435068522;
+ static const double s_low = 1.149604398;
+ static const double s_high = 1/1.149604398;
+ static const double inv_s_low = 1 / s_low;
+ static const double inv_s_high = 1 / s_high;
+ int i;
+ double y[DWT_MAX_LENGTH];
+ // Undo pack and scale
+ for (i = 0; i < length / 2; i++) {
+ y[i * 2] = lowpass[i] * inv_s_low;
+ y[i * 2 + 1] = highpass[i] * inv_s_high;
+ }
+ memcpy(x, y, sizeof(*y) * length);
+ // Undo update 2
+ for (i = 2; i < length; i += 2) {
+ x[i] -= a_update2 * (x[i-1] + x[i+1]);
+ }
+ x[0] -= 2 * a_update2 * x[1];
+ // Undo predict 2
+ for (i = 1; i < length - 2; i += 2) {
+ x[i] -= a_predict2 * (x[i - 1] + x[i + 1]);
+ }
+ x[length - 1] -= 2 * a_predict2 * x[length - 2];
+ // Undo update 1
+ for (i = 2; i < length; i += 2) {
+ x[i] -= a_update1 * (x[i - 1] + x[i + 1]);
+ }
+ x[0] -= 2 * a_update1 * x[1];
+ // Undo predict 1
+ for (i = 1; i < length - 2; i += 2) {
+ x[i] -= a_predict1 * (x[i - 1] + x[i + 1]);
+ }
+ x[length - 1] -= 2 * a_predict1 * x[length - 2];
+}
+
+static void dyadic_synthesize_97(int levels, int width, int height, int16_t *c,
+ int pitch_c, int16_t *x, int pitch_x) {
+ int th[16], tw[16], lv, i, j, nh, nw, hh = height, hw = width;
+ double buffer[2 * DWT_MAX_LENGTH];
+ double y[DWT_MAX_LENGTH * DWT_MAX_LENGTH];
+
+ th[0] = hh;
+ tw[0] = hw;
+ for (i = 1; i <= levels; i++) {
+ th[i] = (th[i - 1] + 1) >> 1;
+ tw[i] = (tw[i - 1] + 1) >> 1;
+ }
+ for (lv = levels - 1; lv >= 0; lv--) {
+ nh = th[lv];
+ nw = tw[lv];
+ hh = th[lv + 1];
+ hw = tw[lv + 1];
+ if ((nh < 2) || (nw < 2)) continue;
+ for (j = 0; j < nw; j++) {
+ for (i = 0; i < nh; i++)
+ buffer[i] = c[i * pitch_c + j];
+ synthesis_97(nh, buffer, buffer + hh, buffer + nh);
+ for (i = 0; i < nh; i++)
+ y[i * DWT_MAX_LENGTH + j] = buffer[i + nh];
+ }
+ for (i = 0; i < nh; i++) {
+ memcpy(buffer, &y[i * DWT_MAX_LENGTH], nw * sizeof(*buffer));
+ synthesis_97(nw, buffer, buffer + hw, &y[i * DWT_MAX_LENGTH]);
+ }
+ }
+ for (i = 0; i < height; i++)
+ for (j = 0; j < width; j++)
+ x[i * pitch_x + j] = round(y[i * DWT_MAX_LENGTH + j] /
+ (1 << DWT_PRECISION_BITS));
+}
+
+#endif // DWT_TYPE
+
+// TODO(debargha): Implement scaling differently so as not to have to use the
+// floating point 16x16 dct
+static void butterfly_16x16_idct_1d_f(double input[16], double output[16]) {
+ 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;
+
+ vp9_clear_system_state(); // Make it simd safe : __asm emms;
+ {
+ double step[16];
+ double intermediate[16];
+ double temp1, temp2;
+
+
+ // step 1 and 2
+ step[ 0] = input[0] + input[8];
+ step[ 1] = input[0] - input[8];
+
+ temp1 = input[4]*C12;
+ temp2 = input[12]*C4;
+
+ temp1 -= temp2;
+ temp1 *= C8;
+
+ step[ 2] = 2*(temp1);
+
+ temp1 = input[4]*C4;
+ temp2 = input[12]*C12;
+ temp1 += temp2;
+ temp1 = (temp1);
+ temp1 *= C8;
+ step[ 3] = 2*(temp1);
+
+ temp1 = input[2]*C8;
+ temp1 = 2*(temp1);
+ temp2 = input[6] + input[10];
+
+ step[ 4] = temp1 + temp2;
+ step[ 5] = temp1 - temp2;
+
+ temp1 = input[14]*C8;
+ temp1 = 2*(temp1);
+ temp2 = input[6] - input[10];
+
+ step[ 6] = temp2 - temp1;
+ step[ 7] = temp2 + temp1;
+
+ // for odd input
+ temp1 = input[3]*C12;
+ temp2 = input[13]*C4;
+ temp1 += temp2;
+ temp1 = (temp1);
+ temp1 *= C8;
+ intermediate[ 8] = 2*(temp1);
+
+ temp1 = input[3]*C4;
+ temp2 = input[13]*C12;
+ temp2 -= temp1;
+ temp2 = (temp2);
+ temp2 *= C8;
+ intermediate[ 9] = 2*(temp2);
+
+ intermediate[10] = 2*(input[9]*C8);
+ intermediate[11] = input[15] - input[1];
+ intermediate[12] = input[15] + input[1];
+ intermediate[13] = 2*((input[7]*C8));
+
+ temp1 = input[11]*C12;
+ temp2 = input[5]*C4;
+ temp2 -= temp1;
+ temp2 = (temp2);
+ temp2 *= C8;
+ intermediate[14] = 2*(temp2);
+
+ temp1 = input[11]*C4;
+ temp2 = input[5]*C12;
+ temp1 += temp2;
+ temp1 = (temp1);
+ temp1 *= C8;
+ intermediate[15] = 2*(temp1);
+
+ step[ 8] = intermediate[ 8] + intermediate[14];
+ step[ 9] = intermediate[ 9] + intermediate[15];
+ step[10] = intermediate[10] + intermediate[11];
+ step[11] = intermediate[10] - intermediate[11];
+ step[12] = intermediate[12] + intermediate[13];
+ step[13] = intermediate[12] - intermediate[13];
+ step[14] = intermediate[ 8] - intermediate[14];
+ step[15] = intermediate[ 9] - intermediate[15];
+
+ // step 3
+ output[0] = step[ 0] + step[ 3];
+ output[1] = step[ 1] + step[ 2];
+ output[2] = step[ 1] - step[ 2];
+ output[3] = step[ 0] - step[ 3];
+
+ temp1 = step[ 4]*C14;
+ temp2 = step[ 7]*C2;
+ temp1 -= temp2;
+ output[4] = (temp1);
+
+ temp1 = step[ 4]*C2;
+ temp2 = step[ 7]*C14;
+ temp1 += temp2;
+ output[7] = (temp1);
+
+ temp1 = step[ 5]*C10;
+ temp2 = step[ 6]*C6;
+ temp1 -= temp2;
+ output[5] = (temp1);
+
+ temp1 = step[ 5]*C6;
+ temp2 = step[ 6]*C10;
+ temp1 += temp2;
+ output[6] = (temp1);
+
+ output[8] = step[ 8] + step[11];
+ output[9] = step[ 9] + step[10];
+ output[10] = step[ 9] - step[10];
+ output[11] = step[ 8] - step[11];
+ output[12] = step[12] + step[15];
+ output[13] = step[13] + step[14];
+ output[14] = step[13] - step[14];
+ output[15] = step[12] - step[15];
+
+ // output 4
+ step[ 0] = output[0] + output[7];
+ step[ 1] = output[1] + output[6];
+ step[ 2] = output[2] + output[5];
+ step[ 3] = output[3] + output[4];
+ step[ 4] = output[3] - output[4];
+ step[ 5] = output[2] - output[5];
+ step[ 6] = output[1] - output[6];
+ step[ 7] = output[0] - output[7];
+
+ temp1 = output[8]*C7;
+ temp2 = output[15]*C9;
+ temp1 -= temp2;
+ step[ 8] = (temp1);
+
+ temp1 = output[9]*C11;
+ temp2 = output[14]*C5;
+ temp1 += temp2;
+ step[ 9] = (temp1);
+
+ temp1 = output[10]*C3;
+ temp2 = output[13]*C13;
+ temp1 -= temp2;
+ step[10] = (temp1);
+
+ temp1 = output[11]*C15;
+ temp2 = output[12]*C1;
+ temp1 += temp2;
+ step[11] = (temp1);
+
+ temp1 = output[11]*C1;
+ temp2 = output[12]*C15;
+ temp2 -= temp1;
+ step[12] = (temp2);
+
+ temp1 = output[10]*C13;
+ temp2 = output[13]*C3;
+ temp1 += temp2;
+ step[13] = (temp1);
+
+ temp1 = output[9]*C5;
+ temp2 = output[14]*C11;
+ temp2 -= temp1;
+ step[14] = (temp2);
+
+ temp1 = output[8]*C9;
+ temp2 = output[15]*C7;
+ temp1 += temp2;
+ step[15] = (temp1);
+
+ // step 5
+ output[0] = (step[0] + step[15]);
+ output[1] = (step[1] + step[14]);
+ output[2] = (step[2] + step[13]);
+ output[3] = (step[3] + step[12]);
+ output[4] = (step[4] + step[11]);
+ output[5] = (step[5] + step[10]);
+ output[6] = (step[6] + step[ 9]);
+ output[7] = (step[7] + step[ 8]);
+
+ output[15] = (step[0] - step[15]);
+ output[14] = (step[1] - step[14]);
+ output[13] = (step[2] - step[13]);
+ output[12] = (step[3] - step[12]);
+ output[11] = (step[4] - step[11]);
+ output[10] = (step[5] - step[10]);
+ output[9] = (step[6] - step[ 9]);
+ output[8] = (step[7] - step[ 8]);
+ }
+ vp9_clear_system_state(); // Make it simd safe : __asm emms;
+}
+
+static void vp9_short_idct16x16_c_f(int16_t *input, int16_t *output, int pitch,
+ int scale) {
+ vp9_clear_system_state(); // Make it simd safe : __asm emms;
+ {
+ double out[16*16], out2[16*16];
+ const int short_pitch = pitch >> 1;
+ int i, j;
+ // First transform rows
+ for (i = 0; i < 16; ++i) {
+ double temp_in[16], temp_out[16];
+ for (j = 0; j < 16; ++j)
+ temp_in[j] = input[j + i*short_pitch];
+ butterfly_16x16_idct_1d_f(temp_in, temp_out);
+ for (j = 0; j < 16; ++j)
+ out[j + i*16] = temp_out[j];
+ }
+ // Then transform columns
+ for (i = 0; i < 16; ++i) {
+ double temp_in[16], temp_out[16];
+ for (j = 0; j < 16; ++j)
+ temp_in[j] = out[j*16 + i];
+ butterfly_16x16_idct_1d_f(temp_in, temp_out);
+ for (j = 0; j < 16; ++j)
+ out2[j*16 + i] = temp_out[j];
+ }
+ for (i = 0; i < 16*16; ++i)
+ output[i] = round(out2[i] / (128 >> scale));
+ }
+ vp9_clear_system_state(); // Make it simd safe : __asm emms;
+}
+
+static void idct8_1d(double *x) {
+ int i, j;
+ double t[8];
+ static const double idctmat[64] = {
+ 0.35355339059327, 0.49039264020162, 0.46193976625564, 0.41573480615127,
+ 0.35355339059327, 0.2777851165098, 0.19134171618254, 0.097545161008064,
+ 0.35355339059327, 0.41573480615127, 0.19134171618254, -0.097545161008064,
+ -0.35355339059327, -0.49039264020161, -0.46193976625564, -0.2777851165098,
+ 0.35355339059327, 0.2777851165098, -0.19134171618254, -0.49039264020162,
+ -0.35355339059327, 0.097545161008064, 0.46193976625564, 0.41573480615127,
+ 0.35355339059327, 0.097545161008063, -0.46193976625564, -0.2777851165098,
+ 0.35355339059327, 0.41573480615127, -0.19134171618254, -0.49039264020162,
+ 0.35355339059327, -0.097545161008063, -0.46193976625564, 0.2777851165098,
+ 0.35355339059327, -0.41573480615127, -0.19134171618255, 0.49039264020162,
+ 0.35355339059327, -0.2777851165098, -0.19134171618254, 0.49039264020161,
+ -0.35355339059327, -0.097545161008064, 0.46193976625564, -0.41573480615127,
+ 0.35355339059327, -0.41573480615127, 0.19134171618254, 0.097545161008065,
+ -0.35355339059327, 0.49039264020162, -0.46193976625564, 0.2777851165098,
+ 0.35355339059327, -0.49039264020162, 0.46193976625564, -0.41573480615127,
+ 0.35355339059327, -0.2777851165098, 0.19134171618255, -0.097545161008064
+ };
+ for (i = 0; i < 8; ++i) {
+ t[i] = 0;
+ for (j = 0; j < 8; ++j)
+ t[i] += idctmat[i * 8 + j] * x[j];
+ }
+ for (i = 0; i < 8; ++i) {
+ x[i] = t[i];
+ }
+}
+
+static void vp9_short_idct8x8_c_f(int16_t *coefs, int16_t *block, int pitch,
+ int scale) {
+ double X[8 * 8], Y[8];
+ int i, j;
+ int shortpitch = pitch >> 1;
+
+ vp9_clear_system_state(); // Make it simd safe : __asm emms;
+ {
+ for (i = 0; i < 8; i++) {
+ for (j = 0; j < 8; j++) {
+ X[i * 8 + j] = (double)coefs[i * shortpitch + j];
+ }
+ }
+ for (i = 0; i < 8; i++)
+ idct8_1d(X + 8 * i);
+ for (i = 0; i < 8; i++) {
+ for (j = 0; j < 8; ++j)
+ Y[j] = X[i + 8 * j];
+ idct8_1d(Y);
+ for (j = 0; j < 8; ++j)
+ X[i + 8 * j] = Y[j];
+ }
+ for (i = 0; i < 8; i++) {
+ for (j = 0; j < 8; j++) {
+ block[i * 8 + j] = (int16_t)round(X[i * 8 + j] / (8 >> scale));
+ }
+ }
+ }
+ vp9_clear_system_state(); // Make it simd safe : __asm emms;
+}
+
+#define multiply_bits(d, n) ((n) < 0 ? (d) >> (n) : (d) << (n))
+
+#if DWTDCT_TYPE == DWTDCT16X16_LEAN
+
+void vp9_short_idct32x32_c(int16_t *input, int16_t *output, int pitch) {
+ // assume output is a 32x32 buffer
+ // Temporary buffer to hold a 16x16 block for 16x16 inverse dct
+ int16_t buffer[16 * 16];
+ // Temporary buffer to hold a 32x32 block for inverse 32x32 dwt
+ int16_t buffer2[32 * 32];
+ // Note: pitch is in bytes, short_pitch is in short units
+ const int short_pitch = pitch >> 1;
+ int i, j;
+
+ // TODO(debargha): Implement more efficiently by adding output pitch
+ // argument to the idct16x16 function
+ vp9_short_idct16x16_c_f(input, buffer, pitch,
+ 1 + DWT_PRECISION_BITS);
+ for (i = 0; i < 16; ++i) {
+ vpx_memcpy(buffer2 + i * 32, buffer + i * 16, sizeof(*buffer2) * 16);
+ }
+ for (i = 0; i < 16; ++i) {
+ for (j = 16; j < 32; ++j) {
+ buffer2[i * 32 + j] =
+ multiply_bits(input[i * short_pitch + j], DWT_PRECISION_BITS - 2);
+ }
+ }
+ for (i = 16; i < 32; ++i) {
+ for (j = 0; j < 32; ++j) {
+ buffer2[i * 32 + j] =
+ multiply_bits(input[i * short_pitch + j], DWT_PRECISION_BITS - 2);
+ }
+ }
+#if DWT_TYPE == 26
+ dyadic_synthesize_26(1, 32, 32, buffer2, 32, output, 32);
+#elif DWT_TYPE == 97
+ dyadic_synthesize_97(1, 32, 32, buffer2, 32, output, 32);
+#elif DWT_TYPE == 53
+ dyadic_synthesize_53(1, 32, 32, buffer2, 32, output, 32);
+#endif
+}
+
+#elif DWTDCT_TYPE == DWTDCT16X16
+
+void vp9_short_idct32x32_c(int16_t *input, int16_t *output, int pitch) {
+ // assume output is a 32x32 buffer
+ // Temporary buffer to hold a 16x16 block for 16x16 inverse dct
+ int16_t buffer[16 * 16];
+ // Temporary buffer to hold a 32x32 block for inverse 32x32 dwt
+ int16_t buffer2[32 * 32];
+ // Note: pitch is in bytes, short_pitch is in short units
+ const int short_pitch = pitch >> 1;
+ int i, j;
+
+ // TODO(debargha): Implement more efficiently by adding output pitch
+ // argument to the idct16x16 function
+ vp9_short_idct16x16_c_f(input, buffer, pitch,
+ 1 + DWT_PRECISION_BITS);
+ for (i = 0; i < 16; ++i) {
+ vpx_memcpy(buffer2 + i * 32, buffer + i * 16, sizeof(*buffer2) * 16);
+ }
+ vp9_short_idct16x16_c_f(input + 16, buffer, pitch,
+ 1 + DWT_PRECISION_BITS);
+ for (i = 0; i < 16; ++i) {
+ vpx_memcpy(buffer2 + i * 32 + 16, buffer + i * 16, sizeof(*buffer2) * 16);
+ }
+ vp9_short_idct16x16_c_f(input + 16 * short_pitch, buffer, pitch,
+ 1 + DWT_PRECISION_BITS);
+ for (i = 0; i < 16; ++i) {
+ vpx_memcpy(buffer2 + i * 32 + 16 * 32, buffer + i * 16,
+ sizeof(*buffer2) * 16);
+ }
+ vp9_short_idct16x16_c_f(input + 16 * short_pitch + 16, buffer, pitch,
+ 1 + DWT_PRECISION_BITS);
+ for (i = 0; i < 16; ++i) {
+ vpx_memcpy(buffer2 + i * 32 + 16 * 33, buffer + i * 16,
+ sizeof(*buffer2) * 16);
+ }
+#if DWT_TYPE == 26
+ dyadic_synthesize_26(1, 32, 32, buffer2, 32, output, 32);
+#elif DWT_TYPE == 97
+ dyadic_synthesize_97(1, 32, 32, buffer2, 32, output, 32);
+#elif DWT_TYPE == 53
+ dyadic_synthesize_53(1, 32, 32, buffer2, 32, output, 32);
+#endif
+}
+
+#elif DWTDCT_TYPE == DWTDCT8X8
+
+void vp9_short_idct32x32_c(int16_t *input, int16_t *output, int pitch) {
+ // assume output is a 32x32 buffer
+ // Temporary buffer to hold a 16x16 block for 16x16 inverse dct
+ int16_t buffer[8 * 8];
+ // Temporary buffer to hold a 32x32 block for inverse 32x32 dwt
+ int16_t buffer2[32 * 32];
+ // Note: pitch is in bytes, short_pitch is in short units
+ const int short_pitch = pitch >> 1;
+ int i, j;
+
+ // TODO(debargha): Implement more efficiently by adding output pitch
+ // argument to the idct16x16 function
+ vp9_short_idct8x8_c_f(input, buffer, pitch,
+ 1 + DWT_PRECISION_BITS);
+ for (i = 0; i < 8; ++i) {
+ vpx_memcpy(buffer2 + i * 32, buffer + i * 8, sizeof(*buffer2) * 8);
+ }
+ vp9_short_idct8x8_c_f(input + 8, buffer, pitch,
+ 1 + DWT_PRECISION_BITS);
+ for (i = 0; i < 8; ++i) {
+ vpx_memcpy(buffer2 + i * 32 + 8, buffer + i * 8, sizeof(*buffer2) * 8);
+ }
+ vp9_short_idct8x8_c_f(input + 8 * short_pitch, buffer, pitch,
+ 1 + DWT_PRECISION_BITS);
+ for (i = 0; i < 8; ++i) {
+ vpx_memcpy(buffer2 + i * 32 + 8 * 32, buffer + i * 8,
+ sizeof(*buffer2) * 8);
+ }
+ vp9_short_idct8x8_c_f(input + 8 * short_pitch + 8, buffer, pitch,
+ 1 + DWT_PRECISION_BITS);
+ for (i = 0; i < 8; ++i) {
+ vpx_memcpy(buffer2 + i * 32 + 8 * 33, buffer + i * 8,
+ sizeof(*buffer2) * 8);
+ }
+ for (i = 0; i < 16; ++i) {
+ for (j = 16; j < 32; ++j) {
+ buffer2[i * 32 + j] =
+ multiply_bits(input[i * short_pitch + j], DWT_PRECISION_BITS - 2);
+ }
+ }
+ for (i = 16; i < 32; ++i) {
+ for (j = 0; j < 32; ++j) {
+ buffer2[i * 32 + j] =
+ multiply_bits(input[i * short_pitch + j], DWT_PRECISION_BITS - 2);
+ }
+ }
+#if DWT_TYPE == 26
+ dyadic_synthesize_26(2, 32, 32, buffer2, 32, output, 32);
+#elif DWT_TYPE == 97
+ dyadic_synthesize_97(2, 32, 32, buffer2, 32, output, 32);
+#elif DWT_TYPE == 53
+ dyadic_synthesize_53(2, 32, 32, buffer2, 32, output, 32);
+#endif
+}
+
+#endif
+
+#if CONFIG_TX64X64
+void vp9_short_idct64x64_c(int16_t *input, int16_t *output, int pitch) {
+ // assume output is a 64x64 buffer
+ // Temporary buffer to hold a 16x16 block for 16x16 inverse dct
+ int16_t buffer[16 * 16];
+ // Temporary buffer to hold a 32x32 block for inverse 32x32 dwt
+ int16_t buffer2[64 * 64];
+ // Note: pitch is in bytes, short_pitch is in short units
+ const int short_pitch = pitch >> 1;
+ int i, j;
+
+ // TODO(debargha): Implement more efficiently by adding output pitch
+ // argument to the idct16x16 function
+ vp9_short_idct16x16_c_f(input, buffer, pitch,
+ 2 + DWT_PRECISION_BITS);
+ for (i = 0; i < 16; ++i) {
+ vpx_memcpy(buffer2 + i * 64, buffer + i * 16, sizeof(*buffer2) * 16);
+ }
+#if DWTDCT_TYPE == DWTDCT16X16_LEAN
+ for (i = 0; i < 16; ++i) {
+ for (j = 16; j < 64; ++j) {
+ buffer2[i * 64 + j] =
+ multiply_bits(input[i * short_pitch + j], DWT_PRECISION_BITS - 1);
+ }
+ }
+ for (i = 16; i < 64; ++i) {
+ for (j = 0; j < 64; ++j) {
+ buffer2[i * 64 + j] =
+ multiply_bits(input[i * short_pitch + j], DWT_PRECISION_BITS - 1);
+ }
+ }
+#elif DWTDCT_TYPE == DWTDCT16X16
+ vp9_short_idct16x16_c_f(input + 16, buffer, pitch,
+ 2 + DWT_PRECISION_BITS);
+ for (i = 0; i < 16; ++i) {
+ vpx_memcpy(buffer2 + i * 64 + 16, buffer + i * 16, sizeof(*buffer2) * 16);
+ }
+ vp9_short_idct16x16_c_f(input + 16 * short_pitch, buffer, pitch,
+ 2 + DWT_PRECISION_BITS);
+ for (i = 0; i < 16; ++i) {
+ vpx_memcpy(buffer2 + i * 64 + 16 * 64, buffer + i * 16,
+ sizeof(*buffer2) * 16);
+ }
+ vp9_short_idct16x16_c_f(input + 16 * short_pitch + 16, buffer, pitch,
+ 2 + DWT_PRECISION_BITS);
+ for (i = 0; i < 16; ++i) {
+ vpx_memcpy(buffer2 + i * 64 + 16 * 65, buffer + i * 16,
+ sizeof(*buffer2) * 16);
+ }
+
+ // Copying and scaling highest bands into buffer2
+ for (i = 0; i < 32; ++i) {
+ for (j = 32; j < 64; ++j) {
+ buffer2[i * 64 + j] =
+ multiply_bits(input[i * short_pitch + j], DWT_PRECISION_BITS - 1);
+ }
+ }
+ for (i = 32; i < 64; ++i) {
+ for (j = 0; j < 64; ++j) {
+ buffer2[i * 64 + j] =
+ multiply_bits(input[i * short_pitch + j], DWT_PRECISION_BITS - 1);
+ }
+ }
+#endif // DWTDCT_TYPE
+
+#if DWT_TYPE == 26
+ dyadic_synthesize_26(2, 64, 64, buffer2, 64, output, 64);
+#elif DWT_TYPE == 97
+ dyadic_synthesize_97(2, 64, 64, buffer2, 64, output, 64);
+#elif DWT_TYPE == 53
+ dyadic_synthesize_53(2, 64, 64, buffer2, 64, output, 64);
+#endif
+}
+#endif // CONFIG_TX64X64
+#endif // !CONFIG_DWTDCTHYBRID
« no previous file with comments | « source/libvpx/vp9/common/vp9_header.h ('k') | source/libvpx/vp9/common/vp9_implicit_segmentation.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698