Commit fe178850 authored by Yunqing Wang's avatar Yunqing Wang
Browse files

Fixed style warnings

Fixed some style warnings.

Change-Id: I9eb77c3bf6d63628feef1b0c936e905bf4f2089d
parent 8a9e4e8a
...@@ -22,15 +22,14 @@ ...@@ -22,15 +22,14 @@
* so * so
* x * sqrt(2) * cos (pi/8) = x + x * (sqrt(2) *cos(pi/8)-1). * x * sqrt(2) * cos (pi/8) = x + x * (sqrt(2) *cos(pi/8)-1).
**************************************************************************/ **************************************************************************/
#include <assert.h>
#include <math.h>
#include "vpx_ports/config.h" #include "vpx_ports/config.h"
#include "vp8/common/idct.h" #include "vp8/common/idct.h"
#include "vp8/common/systemdependent.h" #include "vp8/common/systemdependent.h"
#include "vp8/common/blockd.h" #include "vp8/common/blockd.h"
#include <assert.h>
#include <math.h>
static const int cospi8sqrt2minus1 = 20091; static const int cospi8sqrt2minus1 = 20091;
static const int sinpi8sqrt2 = 35468; static const int sinpi8sqrt2 = 35468;
static const int rounding = 0; static const int rounding = 0;
...@@ -401,7 +400,7 @@ void vp8_ihtllm_float_c(const int16_t *input, int16_t *output, int pitch, ...@@ -401,7 +400,7 @@ void vp8_ihtllm_float_c(const int16_t *input, int16_t *output, int pitch,
-(int16_t)( - pfa[i] / 8 + 0.49); -(int16_t)( - pfa[i] / 8 + 0.49);
} }
op += shortpitch; op += shortpitch;
pfa += tx_dim; pfa += tx_dim;
} }
} }
...@@ -409,9 +408,9 @@ void vp8_ihtllm_float_c(const int16_t *input, int16_t *output, int pitch, ...@@ -409,9 +408,9 @@ void vp8_ihtllm_float_c(const int16_t *input, int16_t *output, int pitch,
} }
/* Converted the transforms to integer form. */ /* Converted the transforms to integer form. */
#define VERTICAL_SHIFT 14 //16 #define VERTICAL_SHIFT 14 // 16
#define VERTICAL_ROUNDING ((1 << (VERTICAL_SHIFT - 1)) - 1) #define VERTICAL_ROUNDING ((1 << (VERTICAL_SHIFT - 1)) - 1)
#define HORIZONTAL_SHIFT 17 //15 #define HORIZONTAL_SHIFT 17 // 15
#define HORIZONTAL_ROUNDING ((1 << (HORIZONTAL_SHIFT - 1)) - 1) #define HORIZONTAL_ROUNDING ((1 << (HORIZONTAL_SHIFT - 1)) - 1)
void vp8_ihtllm_int_c(const int16_t *input, int16_t *output, int pitch, void vp8_ihtllm_int_c(const int16_t *input, int16_t *output, int pitch,
TX_TYPE tx_type, int tx_dim) { TX_TYPE tx_type, int tx_dim) {
...@@ -446,7 +445,8 @@ void vp8_ihtllm_int_c(const int16_t *input, int16_t *output, int pitch, ...@@ -446,7 +445,8 @@ void vp8_ihtllm_int_c(const int16_t *input, int16_t *output, int pitch,
break; break;
case DCT_DCT : case DCT_DCT :
ptv = pth = (tx_dim == 4) ? &idct_i4[0] ptv = pth = (tx_dim == 4) ? &idct_i4[0]
: ((tx_dim == 8) ? &idct_i8[0] : &idct_i16[0]); : ((tx_dim == 8) ? &idct_i8[0]
: &idct_i16[0]);
break; break;
default: default:
assert(0); assert(0);
...@@ -465,7 +465,7 @@ void vp8_ihtllm_int_c(const int16_t *input, int16_t *output, int pitch, ...@@ -465,7 +465,7 @@ void vp8_ihtllm_int_c(const int16_t *input, int16_t *output, int pitch,
im[i] = (int16_t)((temp + VERTICAL_ROUNDING) >> VERTICAL_SHIFT); im[i] = (int16_t)((temp + VERTICAL_ROUNDING) >> VERTICAL_SHIFT);
ip++; ip++;
} }
im += tx_dim; //16 im += tx_dim; // 16
ptv += tx_dim; ptv += tx_dim;
ip = input; ip = input;
} }
...@@ -487,7 +487,7 @@ void vp8_ihtllm_int_c(const int16_t *input, int16_t *output, int pitch, ...@@ -487,7 +487,7 @@ void vp8_ihtllm_int_c(const int16_t *input, int16_t *output, int pitch,
pthc += tx_dim; pthc += tx_dim;
} }
im += tx_dim; //16 im += tx_dim; // 16
op += shortpitch; op += shortpitch;
} }
} }
......
...@@ -701,7 +701,7 @@ void vp8_fht_int_c(const int16_t *input, int pitch, int16_t *output, ...@@ -701,7 +701,7 @@ void vp8_fht_int_c(const int16_t *input, int pitch, int16_t *output,
im[i] = (int16_t)((temp + VERTICAL_ROUNDING) >> VERTICAL_SHIFT); im[i] = (int16_t)((temp + VERTICAL_ROUNDING) >> VERTICAL_SHIFT);
ip++; ip++;
} }
im += tx_dim; //16 im += tx_dim; // 16
ptv += tx_dim; ptv += tx_dim;
ip = input; ip = input;
} }
...@@ -723,7 +723,7 @@ void vp8_fht_int_c(const int16_t *input, int pitch, int16_t *output, ...@@ -723,7 +723,7 @@ void vp8_fht_int_c(const int16_t *input, int pitch, int16_t *output,
pthc += tx_dim; pthc += tx_dim;
} }
im += tx_dim; //16 im += tx_dim; // 16
op += tx_dim; op += tx_dim;
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment