Renaming INTERPOLATIONFILTERTYPE to INTERPOLATION_TYPE. Change-Id: I1868fb75ed88bfa65c1c2ca24677d65f2894d713
diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h index 1a03269..8939419 100644 --- a/vp9/common/vp9_blockd.h +++ b/vp9/common/vp9_blockd.h
@@ -140,7 +140,7 @@ // Flags used for prediction status of various bit-stream signals unsigned char seg_id_predicted; - INTERPOLATIONFILTERTYPE interp_filter; + INTERPOLATION_TYPE interp_filter; BLOCK_SIZE sb_type; } MB_MODE_INFO;
diff --git a/vp9/common/vp9_filter.c b/vp9/common/vp9_filter.c index cedd44c..8f24052 100644 --- a/vp9/common/vp9_filter.c +++ b/vp9/common/vp9_filter.c
@@ -97,7 +97,7 @@ { 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) { case EIGHTTAP: return vp9_sub_pel_filters_8; @@ -108,7 +108,7 @@ case BILINEAR: return vp9_bilinear_filters; default: - assert(!"Invalid filter type."); + assert(!"Invalid interpolation type."); return NULL; } }
diff --git a/vp9/common/vp9_filter.h b/vp9/common/vp9_filter.h index 3029453..8652a6e 100644 --- a/vp9/common/vp9_filter.h +++ b/vp9/common/vp9_filter.h
@@ -27,7 +27,7 @@ EIGHTTAP_SHARP = 2, BILINEAR = 3, SWITCHABLE = 4 /* should be the last one */ -} INTERPOLATIONFILTERTYPE; +} INTERPOLATION_TYPE; typedef int16_t subpel_kernel[SUBPEL_TAPS]; @@ -36,7 +36,7 @@ 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_sub_pel_filters_6[SUBPEL_SHIFTS];
diff --git a/vp9/common/vp9_onyxc_int.h b/vp9/common/vp9_onyxc_int.h index f2244e5..5b47a00 100644 --- a/vp9/common/vp9_onyxc_int.h +++ b/vp9/common/vp9_onyxc_int.h
@@ -171,7 +171,7 @@ // Persistent mb segment id map used in prediction. unsigned char *last_frame_seg_map; - INTERPOLATIONFILTERTYPE mcomp_filter_type; + INTERPOLATION_TYPE mcomp_filter_type; loop_filter_info_n lf_info;
diff --git a/vp9/common/vp9_reconinter.c b/vp9/common/vp9_reconinter.c index 6f16ac7..b6dbced 100644 --- a/vp9/common/vp9_reconinter.c +++ b/vp9/common/vp9_reconinter.c
@@ -21,7 +21,7 @@ #include "vp9/common/vp9_reconintra.h" void vp9_setup_interp_filters(MACROBLOCKD *xd, - INTERPOLATIONFILTERTYPE mcomp_filter_type, + INTERPOLATION_TYPE mcomp_filter_type, VP9_COMMON *cm) { if (xd->mi_8x8 && xd->mi_8x8[0]) { MB_MODE_INFO *const mbmi = &xd->mi_8x8[0]->mbmi;
diff --git a/vp9/common/vp9_reconinter.h b/vp9/common/vp9_reconinter.h index 504b793..b32e805 100644 --- a/vp9/common/vp9_reconinter.h +++ b/vp9/common/vp9_reconinter.h
@@ -25,7 +25,7 @@ BLOCK_SIZE bsize); void vp9_setup_interp_filters(MACROBLOCKD *xd, - INTERPOLATIONFILTERTYPE filter, + INTERPOLATION_TYPE filter, VP9_COMMON *cm); void vp9_build_inter_predictor(const uint8_t *src, int src_stride,
diff --git a/vp9/decoder/vp9_decodemv.c b/vp9/decoder/vp9_decodemv.c index 33793ee..78c85b0 100644 --- a/vp9/decoder/vp9_decodemv.c +++ b/vp9/decoder/vp9_decodemv.c
@@ -311,7 +311,7 @@ } -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) { const int ctx = vp9_get_pred_context_switchable_interp(xd); const int type = treed_read(r, vp9_switchable_interp_tree,
diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodframe.c index 0cb0709..4426444 100644 --- a/vp9/decoder/vp9_decodframe.c +++ b/vp9/decoder/vp9_decodframe.c
@@ -569,12 +569,12 @@ xd->itxm_add = xd->lossless ? vp9_iwht4x4_add : vp9_idct4x4_add; } -static INTERPOLATIONFILTERTYPE read_interp_filter_type( - struct vp9_read_bit_buffer *rb) { - const INTERPOLATIONFILTERTYPE literal_to_type[] = { EIGHTTAP_SMOOTH, - EIGHTTAP, - EIGHTTAP_SHARP, - BILINEAR }; +static INTERPOLATION_TYPE read_interp_filter_type( + struct vp9_read_bit_buffer *rb) { + const INTERPOLATION_TYPE literal_to_type[] = { EIGHTTAP_SMOOTH, + EIGHTTAP, + EIGHTTAP_SHARP, + BILINEAR }; return vp9_rb_read_bit(rb) ? SWITCHABLE : literal_to_type[vp9_rb_read_literal(rb, 2)]; }
diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c index f82802d..b0cfee3 100644 --- a/vp9/encoder/vp9_bitstream.c +++ b/vp9/encoder/vp9_bitstream.c
@@ -1103,7 +1103,7 @@ } } -static void write_interp_filter_type(INTERPOLATIONFILTERTYPE type, +static void write_interp_filter_type(INTERPOLATION_TYPE type, struct vp9_write_bit_buffer *wb) { const int type_to_literal[] = { 1, 0, 2, 3 };
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 98284a6..edb20ba 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c
@@ -2188,7 +2188,7 @@ if (cpi->sf.RD) { int i, pred_type; - INTERPOLATIONFILTERTYPE filter_type; + INTERPOLATION_TYPE filter_type; /* * This code does a single RD pass over the whole frame assuming * either compound, single or hybrid prediction as per whatever has
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index d39edf3..ddedcee 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c
@@ -2621,7 +2621,7 @@ int *rate_y, int64_t *distortion_y, int *rate_uv, int64_t *distortion_uv, int *mode_excluded, int *disable_skip, - INTERPOLATIONFILTERTYPE *best_filter, + INTERPOLATION_TYPE *best_filter, int_mv (*mode_mv)[MAX_REF_FRAMES], int mi_row, int mi_col, int_mv single_newmv[MAX_REF_FRAMES], @@ -3123,7 +3123,7 @@ int64_t best_inter_rd = INT64_MAX; MB_PREDICTION_MODE best_intra_mode = DC_PRED; 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]; int64_t dist_uv[TX_SIZES]; int skip_uv[TX_SIZES]; @@ -3816,7 +3816,7 @@ vp9_prob comp_mode_p; int64_t best_inter_rd = INT64_MAX; 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]; int64_t dist_uv[TX_SIZES]; int skip_uv[TX_SIZES];