Index: source/libvpx/vp9/common/vp9_idct.c |
=================================================================== |
--- source/libvpx/vp9/common/vp9_idct.c (revision 219822) |
+++ source/libvpx/vp9/common/vp9_idct.c (working copy) |
@@ -225,6 +225,19 @@ |
} |
} |
+void vp9_short_idct8x8_1_add_c(int16_t *input, uint8_t *dest, int dest_stride) { |
+ int i, j; |
+ int a1; |
+ int16_t out = dct_const_round_shift(input[0] * cospi_16_64); |
+ out = dct_const_round_shift(out * cospi_16_64); |
+ a1 = ROUND_POWER_OF_TWO(out, 5); |
+ for (j = 0; j < 8; ++j) { |
+ for (i = 0; i < 8; ++i) |
+ dest[i] = clip_pixel(dest[i] + a1); |
+ dest += dest_stride; |
+ } |
+} |
+ |
static void iadst4_1d(int16_t *input, int16_t *output) { |
int s0, s1, s2, s3, s4, s5, s6, s7; |
@@ -433,12 +446,6 @@ |
} |
} |
-void vp9_short_idct1_8x8_c(int16_t *input, int16_t *output) { |
- int16_t out = dct_const_round_shift(input[0] * cospi_16_64); |
- out = dct_const_round_shift(out * cospi_16_64); |
- output[0] = ROUND_POWER_OF_TWO(out, 5); |
-} |
- |
static void idct16_1d(int16_t *input, int16_t *output) { |
int16_t step1[16], step2[16]; |
int temp1, temp2; |
@@ -857,10 +864,18 @@ |
} |
} |
-void vp9_short_idct1_16x16_c(int16_t *input, int16_t *output) { |
+void vp9_short_idct16x16_1_add_c(int16_t *input, uint8_t *dest, |
+ int dest_stride) { |
+ int i, j; |
+ int a1; |
int16_t out = dct_const_round_shift(input[0] * cospi_16_64); |
out = dct_const_round_shift(out * cospi_16_64); |
- output[0] = ROUND_POWER_OF_TWO(out, 6); |
+ a1 = ROUND_POWER_OF_TWO(out, 6); |
+ for (j = 0; j < 16; ++j) { |
+ for (i = 0; i < 16; ++i) |
+ dest[i] = clip_pixel(dest[i] + a1); |
+ dest += dest_stride; |
+ } |
} |
static void idct32_1d(int16_t *input, int16_t *output) { |
@@ -1259,29 +1274,3 @@ |
out = dct_const_round_shift(out * cospi_16_64); |
output[0] = ROUND_POWER_OF_TWO(out, 6); |
} |
- |
-void vp9_short_idct10_32x32_add_c(int16_t *input, uint8_t *dest, |
- int dest_stride) { |
- int16_t out[32 * 32] = { 0 }; |
- int16_t *outptr = out; |
- int i, j; |
- int16_t temp_in[32], temp_out[32]; |
- |
- // First transform rows. Since all non-zero dct coefficients are in |
- // upper-left 4x4 area, we only need to calculate first 4 rows here. |
- for (i = 0; i < 4; ++i) { |
- idct32_1d(input, outptr); |
- input += 32; |
- outptr += 32; |
- } |
- |
- // Columns |
- for (i = 0; i < 32; ++i) { |
- for (j = 0; j < 32; ++j) |
- temp_in[j] = out[j * 32 + i]; |
- idct32_1d(temp_in, temp_out); |
- for (j = 0; j < 32; ++j) |
- dest[j * dest_stride + i] = clip_pixel(ROUND_POWER_OF_TWO(temp_out[j], 6) |
- + dest[j * dest_stride + i]); |
- } |
-} |