Commit e6c89a1f authored by Dmitry Kovalev's avatar Dmitry Kovalev Committed by Gerrit Code Review
Browse files

Merge "Code cleanup." into experimental

parents 441f24de eb6aee50
...@@ -51,7 +51,7 @@ typedef struct { ...@@ -51,7 +51,7 @@ typedef struct {
int r, c; int r, c;
} POS; } POS;
typedef enum PlaneType { typedef enum {
PLANE_TYPE_Y_WITH_DC, PLANE_TYPE_Y_WITH_DC,
PLANE_TYPE_UV, PLANE_TYPE_UV,
} PLANE_TYPE; } PLANE_TYPE;
...@@ -63,7 +63,7 @@ typedef struct { ...@@ -63,7 +63,7 @@ typedef struct {
ENTROPY_CONTEXT v[2]; ENTROPY_CONTEXT v[2];
} ENTROPY_CONTEXT_PLANES; } ENTROPY_CONTEXT_PLANES;
#define VP9_COMBINEENTROPYCONTEXTS( Dest, A, B) \ #define VP9_COMBINEENTROPYCONTEXTS(Dest, A, B) \
Dest = ((A)!=0) + ((B)!=0); Dest = ((A)!=0) + ((B)!=0);
typedef enum { typedef enum {
...@@ -606,8 +606,8 @@ static TX_TYPE get_tx_type(const MACROBLOCKD *xd, const BLOCKD *b) { ...@@ -606,8 +606,8 @@ static TX_TYPE get_tx_type(const MACROBLOCKD *xd, const BLOCKD *b) {
return tx_type; return tx_type;
} }
extern void vp9_build_block_doffsets(MACROBLOCKD *xd); void vp9_build_block_doffsets(MACROBLOCKD *xd);
extern void vp9_setup_block_dptrs(MACROBLOCKD *xd); void vp9_setup_block_dptrs(MACROBLOCKD *xd);
static void update_blockd_bmi(MACROBLOCKD *xd) { static void update_blockd_bmi(MACROBLOCKD *xd) {
int i; int i;
......
...@@ -60,7 +60,7 @@ static const int sinpi_4_9 = 15212; ...@@ -60,7 +60,7 @@ static const int sinpi_4_9 = 15212;
static INLINE int dct_const_round_shift(int input) { static INLINE int dct_const_round_shift(int input) {
int rv = (input + DCT_CONST_ROUNDING) >> DCT_CONST_BITS; int rv = (input + DCT_CONST_ROUNDING) >> DCT_CONST_BITS;
assert((rv <= INT16_MAX) && (rv >= INT16_MIN)); assert(INT16_MIN <= rv && rv <= INT16_MAX);
return rv; return rv;
} }
#endif #endif
...@@ -15,31 +15,31 @@ ...@@ -15,31 +15,31 @@
#include "vpx/vpx_integer.h" #include "vpx/vpx_integer.h"
#include "vp9/common/vp9_blockd.h" #include "vp9/common/vp9_blockd.h"
extern void vp9_inverse_transform_b_4x4(MACROBLOCKD *xd, int block, int pitch); void vp9_inverse_transform_b_4x4(MACROBLOCKD *xd, int block, int pitch);
extern void vp9_inverse_transform_mb_4x4(MACROBLOCKD *xd); void vp9_inverse_transform_mb_4x4(MACROBLOCKD *xd);
extern void vp9_inverse_transform_mby_4x4(MACROBLOCKD *xd); void vp9_inverse_transform_mby_4x4(MACROBLOCKD *xd);
extern void vp9_inverse_transform_mbuv_4x4(MACROBLOCKD *xd); void vp9_inverse_transform_mbuv_4x4(MACROBLOCKD *xd);
extern void vp9_inverse_transform_b_8x8(int16_t *input_dqcoeff, void vp9_inverse_transform_b_8x8(int16_t *input_dqcoeff,
int16_t *output_coeff, int pitch); int16_t *output_coeff, int pitch);
extern void vp9_inverse_transform_mb_8x8(MACROBLOCKD *xd); void vp9_inverse_transform_mb_8x8(MACROBLOCKD *xd);
extern void vp9_inverse_transform_mby_8x8(MACROBLOCKD *xd); void vp9_inverse_transform_mby_8x8(MACROBLOCKD *xd);
extern void vp9_inverse_transform_mbuv_8x8(MACROBLOCKD *xd); void vp9_inverse_transform_mbuv_8x8(MACROBLOCKD *xd);
extern void vp9_inverse_transform_b_16x16(int16_t *input_dqcoeff, void vp9_inverse_transform_b_16x16(int16_t *input_dqcoeff,
int16_t *output_coeff, int pitch); int16_t *output_coeff, int pitch);
extern void vp9_inverse_transform_mb_16x16(MACROBLOCKD *xd); void vp9_inverse_transform_mb_16x16(MACROBLOCKD *xd);
extern void vp9_inverse_transform_mby_16x16(MACROBLOCKD *xd); void vp9_inverse_transform_mby_16x16(MACROBLOCKD *xd);
extern void vp9_inverse_transform_sby_32x32(SUPERBLOCKD *xd_sb); void vp9_inverse_transform_sby_32x32(SUPERBLOCKD *xd_sb);
extern void vp9_inverse_transform_sbuv_16x16(SUPERBLOCKD *xd_sb); void vp9_inverse_transform_sbuv_16x16(SUPERBLOCKD *xd_sb);
#endif // VP9_COMMON_VP9_INVTRANS_H_ #endif // VP9_COMMON_VP9_INVTRANS_H_
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