From fe1788500c40e0ba37a5788bbd5425907ae8ac50 Mon Sep 17 00:00:00 2001 From: Yunqing Wang Date: Tue, 30 Oct 2012 17:54:22 -0700 Subject: [PATCH] Fixed style warnings Fixed some style warnings. Change-Id: I9eb77c3bf6d63628feef1b0c936e905bf4f2089d --- vp8/common/idctllm.c | 18 +++++++++--------- vp8/encoder/dct.c | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/vp8/common/idctllm.c b/vp8/common/idctllm.c index a0313bd..562dc7e 100644 --- a/vp8/common/idctllm.c +++ b/vp8/common/idctllm.c @@ -22,15 +22,14 @@ * so * x * sqrt(2) * cos (pi/8) = x + x * (sqrt(2) *cos(pi/8)-1). **************************************************************************/ +#include +#include #include "vpx_ports/config.h" #include "vp8/common/idct.h" #include "vp8/common/systemdependent.h" #include "vp8/common/blockd.h" -#include -#include - static const int cospi8sqrt2minus1 = 20091; static const int sinpi8sqrt2 = 35468; static const int rounding = 0; @@ -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); } - op += shortpitch; + op += shortpitch; pfa += tx_dim; } } @@ -409,9 +408,9 @@ void vp8_ihtllm_float_c(const int16_t *input, int16_t *output, int pitch, } /* 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 HORIZONTAL_SHIFT 17 //15 +#define HORIZONTAL_SHIFT 17 // 15 #define HORIZONTAL_ROUNDING ((1 << (HORIZONTAL_SHIFT - 1)) - 1) void vp8_ihtllm_int_c(const int16_t *input, int16_t *output, int pitch, 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, break; case DCT_DCT : 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; default: assert(0); @@ -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); ip++; } - im += tx_dim; //16 + im += tx_dim; // 16 ptv += tx_dim; ip = input; } @@ -487,7 +487,7 @@ void vp8_ihtllm_int_c(const int16_t *input, int16_t *output, int pitch, pthc += tx_dim; } - im += tx_dim; //16 + im += tx_dim; // 16 op += shortpitch; } } diff --git a/vp8/encoder/dct.c b/vp8/encoder/dct.c index edb6674..fb23b0d 100644 --- a/vp8/encoder/dct.c +++ b/vp8/encoder/dct.c @@ -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); ip++; } - im += tx_dim; //16 + im += tx_dim; // 16 ptv += tx_dim; ip = input; } @@ -723,7 +723,7 @@ void vp8_fht_int_c(const int16_t *input, int pitch, int16_t *output, pthc += tx_dim; } - im += tx_dim; //16 + im += tx_dim; // 16 op += tx_dim; } } -- 2.7.4