Commit ad867fe2 authored by Dmitry Kovalev's avatar Dmitry Kovalev
Browse files

Renaming INTERPOLATIONFILTERTYPE to INTERPOLATION_TYPE.

Change-Id: I1868fb75ed88bfa65c1c2ca24677d65f2894d713
parent a53075f7
...@@ -140,7 +140,7 @@ typedef struct { ...@@ -140,7 +140,7 @@ typedef struct {
// Flags used for prediction status of various bit-stream signals // Flags used for prediction status of various bit-stream signals
unsigned char seg_id_predicted; unsigned char seg_id_predicted;
INTERPOLATIONFILTERTYPE interp_filter; INTERPOLATION_TYPE interp_filter;
BLOCK_SIZE sb_type; BLOCK_SIZE sb_type;
} MB_MODE_INFO; } MB_MODE_INFO;
......
...@@ -97,7 +97,7 @@ DECLARE_ALIGNED(256, const subpel_kernel, ...@@ -97,7 +97,7 @@ DECLARE_ALIGNED(256, const subpel_kernel,
{ 0, -3, 1, 38, 64, 32, -1, -3} { 0, -3, 1, 38, 64, 32, -1, -3}
}; };
const subpel_kernel *vp9_get_filter_kernel(INTERPOLATIONFILTERTYPE type) { const subpel_kernel *vp9_get_filter_kernel(INTERPOLATION_TYPE type) {
switch (type) { switch (type) {
case EIGHTTAP: case EIGHTTAP:
return vp9_sub_pel_filters_8; return vp9_sub_pel_filters_8;
...@@ -108,7 +108,7 @@ const subpel_kernel *vp9_get_filter_kernel(INTERPOLATIONFILTERTYPE type) { ...@@ -108,7 +108,7 @@ const subpel_kernel *vp9_get_filter_kernel(INTERPOLATIONFILTERTYPE type) {
case BILINEAR: case BILINEAR:
return vp9_bilinear_filters; return vp9_bilinear_filters;
default: default:
assert(!"Invalid filter type."); assert(!"Invalid interpolation type.");
return NULL; return NULL;
} }
} }
......
...@@ -27,7 +27,7 @@ typedef enum { ...@@ -27,7 +27,7 @@ typedef enum {
EIGHTTAP_SHARP = 2, EIGHTTAP_SHARP = 2,
BILINEAR = 3, BILINEAR = 3,
SWITCHABLE = 4 /* should be the last one */ SWITCHABLE = 4 /* should be the last one */
} INTERPOLATIONFILTERTYPE; } INTERPOLATION_TYPE;
typedef int16_t subpel_kernel[SUBPEL_TAPS]; typedef int16_t subpel_kernel[SUBPEL_TAPS];
...@@ -36,7 +36,7 @@ struct subpix_fn_table { ...@@ -36,7 +36,7 @@ struct subpix_fn_table {
const subpel_kernel *filter_y; const subpel_kernel *filter_y;
}; };
const subpel_kernel *vp9_get_filter_kernel(INTERPOLATIONFILTERTYPE type); const subpel_kernel *vp9_get_filter_kernel(INTERPOLATION_TYPE type);
extern const subpel_kernel vp9_bilinear_filters[SUBPEL_SHIFTS]; extern const subpel_kernel vp9_bilinear_filters[SUBPEL_SHIFTS];
extern const subpel_kernel vp9_sub_pel_filters_6[SUBPEL_SHIFTS]; extern const subpel_kernel vp9_sub_pel_filters_6[SUBPEL_SHIFTS];
......
...@@ -171,7 +171,7 @@ typedef struct VP9Common { ...@@ -171,7 +171,7 @@ typedef struct VP9Common {
// Persistent mb segment id map used in prediction. // Persistent mb segment id map used in prediction.
unsigned char *last_frame_seg_map; unsigned char *last_frame_seg_map;
INTERPOLATIONFILTERTYPE mcomp_filter_type; INTERPOLATION_TYPE mcomp_filter_type;
loop_filter_info_n lf_info; loop_filter_info_n lf_info;
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include "vp9/common/vp9_reconintra.h" #include "vp9/common/vp9_reconintra.h"
void vp9_setup_interp_filters(MACROBLOCKD *xd, void vp9_setup_interp_filters(MACROBLOCKD *xd,
INTERPOLATIONFILTERTYPE mcomp_filter_type, INTERPOLATION_TYPE mcomp_filter_type,
VP9_COMMON *cm) { VP9_COMMON *cm) {
if (xd->mi_8x8 && xd->mi_8x8[0]) { if (xd->mi_8x8 && xd->mi_8x8[0]) {
MB_MODE_INFO *const mbmi = &xd->mi_8x8[0]->mbmi; MB_MODE_INFO *const mbmi = &xd->mi_8x8[0]->mbmi;
......
...@@ -25,7 +25,7 @@ void vp9_build_inter_predictors_sb(MACROBLOCKD *xd, int mi_row, int mi_col, ...@@ -25,7 +25,7 @@ void vp9_build_inter_predictors_sb(MACROBLOCKD *xd, int mi_row, int mi_col,
BLOCK_SIZE bsize); BLOCK_SIZE bsize);
void vp9_setup_interp_filters(MACROBLOCKD *xd, void vp9_setup_interp_filters(MACROBLOCKD *xd,
INTERPOLATIONFILTERTYPE filter, INTERPOLATION_TYPE filter,
VP9_COMMON *cm); VP9_COMMON *cm);
void vp9_build_inter_predictor(const uint8_t *src, int src_stride, void vp9_build_inter_predictor(const uint8_t *src, int src_stride,
......
...@@ -311,7 +311,7 @@ static void read_ref_frames(VP9_COMMON *const cm, MACROBLOCKD *const xd, ...@@ -311,7 +311,7 @@ static void read_ref_frames(VP9_COMMON *const cm, MACROBLOCKD *const xd,
} }
static INLINE INTERPOLATIONFILTERTYPE read_switchable_filter_type( static INLINE INTERPOLATION_TYPE read_switchable_filter_type(
VP9_COMMON *const cm, MACROBLOCKD *const xd, vp9_reader *r) { VP9_COMMON *const cm, MACROBLOCKD *const xd, vp9_reader *r) {
const int ctx = vp9_get_pred_context_switchable_interp(xd); const int ctx = vp9_get_pred_context_switchable_interp(xd);
const int type = treed_read(r, vp9_switchable_interp_tree, const int type = treed_read(r, vp9_switchable_interp_tree,
......
...@@ -569,12 +569,12 @@ static void setup_quantization(VP9D_COMP *pbi, struct vp9_read_bit_buffer *rb) { ...@@ -569,12 +569,12 @@ static void setup_quantization(VP9D_COMP *pbi, struct vp9_read_bit_buffer *rb) {
xd->itxm_add = xd->lossless ? vp9_iwht4x4_add : vp9_idct4x4_add; xd->itxm_add = xd->lossless ? vp9_iwht4x4_add : vp9_idct4x4_add;
} }
static INTERPOLATIONFILTERTYPE read_interp_filter_type( static INTERPOLATION_TYPE read_interp_filter_type(
struct vp9_read_bit_buffer *rb) { struct vp9_read_bit_buffer *rb) {
const INTERPOLATIONFILTERTYPE literal_to_type[] = { EIGHTTAP_SMOOTH, const INTERPOLATION_TYPE literal_to_type[] = { EIGHTTAP_SMOOTH,
EIGHTTAP, EIGHTTAP,
EIGHTTAP_SHARP, EIGHTTAP_SHARP,
BILINEAR }; BILINEAR };
return vp9_rb_read_bit(rb) ? SWITCHABLE return vp9_rb_read_bit(rb) ? SWITCHABLE
: literal_to_type[vp9_rb_read_literal(rb, 2)]; : literal_to_type[vp9_rb_read_literal(rb, 2)];
} }
......
...@@ -1103,7 +1103,7 @@ static void encode_txfm_probs(VP9_COMP *cpi, vp9_writer *w) { ...@@ -1103,7 +1103,7 @@ static void encode_txfm_probs(VP9_COMP *cpi, vp9_writer *w) {
} }
} }
static void write_interp_filter_type(INTERPOLATIONFILTERTYPE type, static void write_interp_filter_type(INTERPOLATION_TYPE type,
struct vp9_write_bit_buffer *wb) { struct vp9_write_bit_buffer *wb) {
const int type_to_literal[] = { 1, 0, 2, 3 }; const int type_to_literal[] = { 1, 0, 2, 3 };
......
...@@ -2188,7 +2188,7 @@ void vp9_encode_frame(VP9_COMP *cpi) { ...@@ -2188,7 +2188,7 @@ void vp9_encode_frame(VP9_COMP *cpi) {
if (cpi->sf.RD) { if (cpi->sf.RD) {
int i, pred_type; int i, pred_type;
INTERPOLATIONFILTERTYPE filter_type; INTERPOLATION_TYPE filter_type;
/* /*
* This code does a single RD pass over the whole frame assuming * This code does a single RD pass over the whole frame assuming
* either compound, single or hybrid prediction as per whatever has * either compound, single or hybrid prediction as per whatever has
......
...@@ -2621,7 +2621,7 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, ...@@ -2621,7 +2621,7 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
int *rate_y, int64_t *distortion_y, int *rate_y, int64_t *distortion_y,
int *rate_uv, int64_t *distortion_uv, int *rate_uv, int64_t *distortion_uv,
int *mode_excluded, int *disable_skip, int *mode_excluded, int *disable_skip,
INTERPOLATIONFILTERTYPE *best_filter, INTERPOLATION_TYPE *best_filter,
int_mv (*mode_mv)[MAX_REF_FRAMES], int_mv (*mode_mv)[MAX_REF_FRAMES],
int mi_row, int mi_col, int mi_row, int mi_col,
int_mv single_newmv[MAX_REF_FRAMES], int_mv single_newmv[MAX_REF_FRAMES],
...@@ -3123,7 +3123,7 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, ...@@ -3123,7 +3123,7 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
int64_t best_inter_rd = INT64_MAX; int64_t best_inter_rd = INT64_MAX;
MB_PREDICTION_MODE best_intra_mode = DC_PRED; MB_PREDICTION_MODE best_intra_mode = DC_PRED;
MV_REFERENCE_FRAME best_inter_ref_frame = LAST_FRAME; MV_REFERENCE_FRAME best_inter_ref_frame = LAST_FRAME;
INTERPOLATIONFILTERTYPE tmp_best_filter = SWITCHABLE; INTERPOLATION_TYPE tmp_best_filter = SWITCHABLE;
int rate_uv_intra[TX_SIZES], rate_uv_tokenonly[TX_SIZES]; int rate_uv_intra[TX_SIZES], rate_uv_tokenonly[TX_SIZES];
int64_t dist_uv[TX_SIZES]; int64_t dist_uv[TX_SIZES];
int skip_uv[TX_SIZES]; int skip_uv[TX_SIZES];
...@@ -3816,7 +3816,7 @@ int64_t vp9_rd_pick_inter_mode_sub8x8(VP9_COMP *cpi, MACROBLOCK *x, ...@@ -3816,7 +3816,7 @@ int64_t vp9_rd_pick_inter_mode_sub8x8(VP9_COMP *cpi, MACROBLOCK *x,
vp9_prob comp_mode_p; vp9_prob comp_mode_p;
int64_t best_inter_rd = INT64_MAX; int64_t best_inter_rd = INT64_MAX;
MV_REFERENCE_FRAME best_inter_ref_frame = LAST_FRAME; MV_REFERENCE_FRAME best_inter_ref_frame = LAST_FRAME;
INTERPOLATIONFILTERTYPE tmp_best_filter = SWITCHABLE; INTERPOLATION_TYPE tmp_best_filter = SWITCHABLE;
int rate_uv_intra[TX_SIZES], rate_uv_tokenonly[TX_SIZES]; int rate_uv_intra[TX_SIZES], rate_uv_tokenonly[TX_SIZES];
int64_t dist_uv[TX_SIZES]; int64_t dist_uv[TX_SIZES];
int skip_uv[TX_SIZES]; int skip_uv[TX_SIZES];
......
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