From: Dmitry Kovalev Date: Fri, 11 Oct 2013 18:19:58 +0000 (-0700) Subject: Adding const to the input argument of all 1D transforms. X-Git-Tag: v1.3.0~235^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=44195fda71a1784544d797cd331b625c083f6f89;p=platform%2Fupstream%2Flibvpx.git Adding const to the input argument of all 1D transforms. Also adding static to iadst16_1d and fadst16 functions. Change-Id: I13c7df3b776f0f8efc6e80099bdb0a2f6d29edaf --- diff --git a/vp9/common/vp9_idct.c b/vp9/common/vp9_idct.c index 78d1087..b1aed30 100644 --- a/vp9/common/vp9_idct.c +++ b/vp9/common/vp9_idct.c @@ -96,7 +96,7 @@ void vp9_iwht4x4_1_add_c(int16_t *in, uint8_t *dest, int dest_stride) { } } -static void idct4_1d(int16_t *input, int16_t *output) { +static void idct4_1d(const int16_t *input, int16_t *output) { int16_t step[4]; int temp1, temp2; // stage 1 @@ -156,7 +156,7 @@ void vp9_idct4x4_1_add_c(int16_t *input, uint8_t *dest, int dest_stride) { } } -static void idct8_1d(int16_t *input, int16_t *output) { +static void idct8_1d(const int16_t *input, int16_t *output) { int16_t step1[8], step2[8]; int temp1, temp2; // stage 1 @@ -238,7 +238,7 @@ void vp9_idct8x8_1_add_c(int16_t *input, uint8_t *dest, int dest_stride) { } } -static void iadst4_1d(int16_t *input, int16_t *output) { +static void iadst4_1d(const int16_t *input, int16_t *output) { int s0, s1, s2, s3, s4, s5, s6, s7; int x0 = input[0]; @@ -311,7 +311,7 @@ void vp9_short_iht4x4_add_c(int16_t *input, uint8_t *dest, int dest_stride, + dest[j * dest_stride + i]); } } -static void iadst8_1d(int16_t *input, int16_t *output) { +static void iadst8_1d(const int16_t *input, int16_t *output) { int s0, s1, s2, s3, s4, s5, s6, s7; int x0 = input[7]; @@ -446,7 +446,7 @@ void vp9_idct8x8_10_add_c(int16_t *input, uint8_t *dest, } } -static void idct16_1d(int16_t *input, int16_t *output) { +static void idct16_1d(const int16_t *input, int16_t *output) { int16_t step1[16], step2[16]; int temp1, temp2; @@ -635,7 +635,7 @@ void vp9_idct16x16_256_add_c(int16_t *input, uint8_t *dest, int dest_stride) { } } -void iadst16_1d(int16_t *input, int16_t *output) { +static void iadst16_1d(const int16_t *input, int16_t *output) { int s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13, s14, s15; int x0 = input[15]; @@ -878,7 +878,7 @@ void vp9_idct16x16_1_add_c(int16_t *input, uint8_t *dest, } } -static void idct32_1d(int16_t *input, int16_t *output) { +static void idct32_1d(const int16_t *input, int16_t *output) { int16_t step1[32], step2[32]; int temp1, temp2; diff --git a/vp9/common/vp9_idct.h b/vp9/common/vp9_idct.h index e85404e..e34bbd8 100644 --- a/vp9/common/vp9_idct.h +++ b/vp9/common/vp9_idct.h @@ -81,7 +81,7 @@ static INLINE int dct_const_round_shift(int input) { return rv; } -typedef void (*transform_1d)(int16_t*, int16_t*); +typedef void (*transform_1d)(const int16_t*, int16_t*); typedef struct { transform_1d cols, rows; // vertical and horizontal diff --git a/vp9/encoder/vp9_dct.c b/vp9/encoder/vp9_dct.c index 3008e46..a232a86 100644 --- a/vp9/encoder/vp9_dct.c +++ b/vp9/encoder/vp9_dct.c @@ -17,7 +17,7 @@ #include "vp9/common/vp9_blockd.h" #include "vp9/common/vp9_idct.h" -static void fdct4(int16_t *input, int16_t *output) { +static void fdct4(const int16_t *input, int16_t *output) { int16_t step[4]; int temp1, temp2; @@ -102,7 +102,7 @@ void vp9_short_fdct4x4_c(int16_t *input, int16_t *output, int pitch) { } } -static void fadst4(int16_t *input, int16_t *output) { +static void fadst4(const int16_t *input, int16_t *output) { int x0, x1, x2, x3; int s0, s1, s2, s3, s4, s5, s6, s7; @@ -183,7 +183,7 @@ void vp9_short_fdct8x4_c(int16_t *input, int16_t *output, int pitch) { vp9_short_fdct4x4_c(input + 4, output + 16, pitch); } -static void fdct8(int16_t *input, int16_t *output) { +static void fdct8(const int16_t *input, int16_t *output) { /*canbe16*/ int s0, s1, s2, s3, s4, s5, s6, s7; /*needs32*/ int t0, t1, t2, t3; /*canbe16*/ int x0, x1, x2, x3; @@ -486,7 +486,7 @@ void vp9_short_fdct16x16_c(int16_t *input, int16_t *output, int pitch) { } } -static void fadst8(int16_t *input, int16_t *output) { +static void fadst8(const int16_t *input, int16_t *output) { int s0, s1, s2, s3, s4, s5, s6, s7; int x0 = input[7]; @@ -654,7 +654,7 @@ void vp9_short_walsh8x4_c(int16_t *input, int16_t *output, int pitch) { // Rewrote to use same algorithm as others. -static void fdct16(int16_t in[16], int16_t out[16]) { +static void fdct16(const int16_t in[16], int16_t out[16]) { /*canbe16*/ int step1[8]; /*canbe16*/ int step2[8]; /*canbe16*/ int step3[8]; @@ -795,7 +795,7 @@ static void fdct16(int16_t in[16], int16_t out[16]) { out[15] = dct_const_round_shift(temp2); } -void fadst16(int16_t *input, int16_t *output) { +static void fadst16(const int16_t *input, int16_t *output) { int s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13, s14, s15; int x0 = input[15]; @@ -1003,7 +1003,7 @@ static INLINE int half_round_shift(int input) { return rv; } -static void dct32_1d(int *input, int *output, int round) { +static void dct32_1d(const int *input, int *output, int round) { int step[32]; // Stage 1 step[0] = input[0] + input[(32 - 1)];