generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

s/INTERP_FILTER/InterpFilter/

Browse Source 
this matches style guidelines and stabilizes successive runs of
clang-format across the tree. remaining types should be address in
successive commits.

Change-Id: I6ad3f69cf0a22cb9a9b895b272195f891f71170f
This commit is contained in:
James Zern
2016-05-18 23:48:05 -07:00
committed by Yaowu Xu
parent 9fa47587d9
commit 7b9407a81b
20 changed files with 99 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
av1/common/av1_convolve.c
View File

@@ -96,9 +96,9 @@ static void convolve_copy(const uint8_t *src, int src_stride, uint8_t *dst,
void av1_convolve(const uint8_t *src, int src_stride, uint8_t *dst, void av1_convolve(const uint8_t *src, int src_stride, uint8_t *dst,
int dst_stride, int w, int h, int dst_stride, int w, int h,
#if CONFIG_DUAL_FILTER #if CONFIG_DUAL_FILTER
const INTERP_FILTER *interp_filter, const InterpFilter *interp_filter,
#else #else
const INTERP_FILTER interp_filter, const InterpFilter interp_filter,
#endif #endif
const int subpel_x_q4, int x_step_q4, const int subpel_y_q4, const int subpel_x_q4, int x_step_q4, const int subpel_y_q4,
int y_step_q4, int ref_idx) { int y_step_q4, int ref_idx) {
@@ -270,9 +270,9 @@ static void highbd_convolve_copy(const uint16_t *src, int src_stride,
void av1_highbd_convolve(const uint8_t *src8, int src_stride, uint8_t *dst8, void av1_highbd_convolve(const uint8_t *src8, int src_stride, uint8_t *dst8,
int dst_stride, int w, int h, int dst_stride, int w, int h,
#if CONFIG_DUAL_FILTER #if CONFIG_DUAL_FILTER
const INTERP_FILTER *interp_filter, const InterpFilter *interp_filter,
#else #else
const INTERP_FILTER interp_filter, const InterpFilter interp_filter,
#endif #endif
const int subpel_x_q4, int x_step_q4, const int subpel_x_q4, int x_step_q4,
const int subpel_y_q4, int y_step_q4, int ref_idx, const int subpel_y_q4, int y_step_q4, int ref_idx,

8
av1/common/av1_convolve.h
View File

@@ -9,9 +9,9 @@ extern "C" {
void av1_convolve(const uint8_t *src, int src_stride, uint8_t *dst, void av1_convolve(const uint8_t *src, int src_stride, uint8_t *dst,
int dst_stride, int w, int h, int dst_stride, int w, int h,
#if CONFIG_DUAL_FILTER #if CONFIG_DUAL_FILTER
const INTERP_FILTER *interp_filter, const InterpFilter *interp_filter,
#else #else
const INTERP_FILTER interp_filter, const InterpFilter interp_filter,
#endif #endif
const int subpel_x, int xstep, const int subpel_y, int ystep, const int subpel_x, int xstep, const int subpel_y, int ystep,
int avg); int avg);
@@ -20,9 +20,9 @@ void av1_convolve(const uint8_t *src, int src_stride, uint8_t *dst,
void av1_highbd_convolve(const uint8_t *src, int src_stride, uint8_t *dst, void av1_highbd_convolve(const uint8_t *src, int src_stride, uint8_t *dst,
int dst_stride, int w, int h, int dst_stride, int w, int h,
#if CONFIG_DUAL_FILTER #if CONFIG_DUAL_FILTER
const INTERP_FILTER *interp_filter, const InterpFilter *interp_filter,
#else #else
const INTERP_FILTER interp_filter, const InterpFilter interp_filter,
#endif #endif
const int subpel_x, int xstep, const int subpel_y, const int subpel_x, int xstep, const int subpel_y,
int ystep, int avg, int bd); int ystep, int avg, int bd);

4
av1/common/blockd.h
View File

@@ -203,9 +203,9 @@ typedef struct {
// Only for INTER blocks // Only for INTER blocks
#if CONFIG_DUAL_FILTER #if CONFIG_DUAL_FILTER
INTERP_FILTER interp_filter[4]; InterpFilter interp_filter[4];
#else #else
INTERP_FILTER interp_filter; InterpFilter interp_filter;
#endif #endif
MV_REFERENCE_FRAME ref_frame[2]; MV_REFERENCE_FRAME ref_frame[2];
TX_TYPE tx_type; TX_TYPE tx_type;

4
av1/common/filter.c
View File

@@ -222,7 +222,7 @@ static const InterpFilterParams av1_interp_temporalfilter_12tap = {
#endif // USE_TEMPORALFILTER_12TAP #endif // USE_TEMPORALFILTER_12TAP
InterpFilterParams av1_get_interp_filter_params( InterpFilterParams av1_get_interp_filter_params(
const INTERP_FILTER interp_filter) { const InterpFilter interp_filter) {
#if USE_TEMPORALFILTER_12TAP #if USE_TEMPORALFILTER_12TAP
if (interp_filter == TEMPORALFILTER_12TAP) if (interp_filter == TEMPORALFILTER_12TAP)
return av1_interp_temporalfilter_12tap; return av1_interp_temporalfilter_12tap;
@@ -230,7 +230,7 @@ InterpFilterParams av1_get_interp_filter_params(
return av1_interp_filter_params_list[interp_filter]; return av1_interp_filter_params_list[interp_filter];
} }
const int16_t *av1_get_interp_filter_kernel(const INTERP_FILTER interp_filter) { const int16_t *av1_get_interp_filter_kernel(const InterpFilter interp_filter) {
#if USE_TEMPORALFILTER_12TAP #if USE_TEMPORALFILTER_12TAP
if (interp_filter == TEMPORALFILTER_12TAP) if (interp_filter == TEMPORALFILTER_12TAP)
return av1_interp_temporalfilter_12tap.filter_ptr; return av1_interp_temporalfilter_12tap.filter_ptr;

8
av1/common/filter.h
View File

@@ -55,7 +55,7 @@ extern "C" {
#define SWITCHABLE_FILTER_CONTEXTS (SWITCHABLE_FILTERS + 1) #define SWITCHABLE_FILTER_CONTEXTS (SWITCHABLE_FILTERS + 1)
#endif #endif
typedef uint8_t INTERP_FILTER; typedef uint8_t InterpFilter;
#if CONFIG_EXT_INTRA #if CONFIG_EXT_INTRA
typedef enum { typedef enum {
@@ -76,9 +76,9 @@ typedef struct InterpFilterParams {
} InterpFilterParams; } InterpFilterParams;
InterpFilterParams av1_get_interp_filter_params( InterpFilterParams av1_get_interp_filter_params(
const INTERP_FILTER interp_filter); const InterpFilter interp_filter);
const int16_t *av1_get_interp_filter_kernel(const INTERP_FILTER interp_filter); const int16_t *av1_get_interp_filter_kernel(const InterpFilter interp_filter);
static INLINE const int16_t *av1_get_interp_filter_subpel_kernel( static INLINE const int16_t *av1_get_interp_filter_subpel_kernel(
const InterpFilterParams filter_params, const int subpel) { const InterpFilterParams filter_params, const int subpel) {
@@ -86,7 +86,7 @@ static INLINE const int16_t *av1_get_interp_filter_subpel_kernel(
} }
static INLINE int av1_is_interpolating_filter( static INLINE int av1_is_interpolating_filter(
const INTERP_FILTER interp_filter) { const InterpFilter interp_filter) {
const InterpFilterParams ip = av1_get_interp_filter_params(interp_filter); const InterpFilterParams ip = av1_get_interp_filter_params(interp_filter);
return (ip.filter_ptr[ip.taps / 2 - 1] == 128); return (ip.filter_ptr[ip.taps / 2 - 1] == 128);
} }

2
av1/common/onyxc_int.h
View File

@@ -271,7 +271,7 @@ typedef struct AV1Common {
uint8_t *current_frame_seg_map; uint8_t *current_frame_seg_map;
int seg_map_alloc_size; int seg_map_alloc_size;
INTERP_FILTER interp_filter; InterpFilter interp_filter;
loop_filter_info_n lf_info; loop_filter_info_n lf_info;
#if CONFIG_LOOP_RESTORATION #if CONFIG_LOOP_RESTORATION

8
av1/common/pred_common.c
View File

@@ -16,10 +16,10 @@
// Returns a context number for the given MB prediction signal // Returns a context number for the given MB prediction signal
#if CONFIG_DUAL_FILTER #if CONFIG_DUAL_FILTER
static INTERP_FILTER get_ref_filter_type(const MODE_INFO *mi, static InterpFilter get_ref_filter_type(const MODE_INFO *mi,
const MACROBLOCKD *xd, int dir, const MACROBLOCKD *xd, int dir,
MV_REFERENCE_FRAME ref_frame) { MV_REFERENCE_FRAME ref_frame) {
INTERP_FILTER ref_type = SWITCHABLE_FILTERS; InterpFilter ref_type = SWITCHABLE_FILTERS;
const MB_MODE_INFO *ref_mbmi = &mi->mbmi; const MB_MODE_INFO *ref_mbmi = &mi->mbmi;
int use_subpel[2] = { int use_subpel[2] = {
has_subpel_mv_component(mi, xd, dir), has_subpel_mv_component(mi, xd, dir),

16
av1/common/reconinter.c
View File

@@ -418,9 +418,9 @@ void av1_make_masked_inter_predictor(const uint8_t *pre, int pre_stride,
const struct scale_factors *sf, int w, const struct scale_factors *sf, int w,
int h, int h,
#if CONFIG_DUAL_FILTER #if CONFIG_DUAL_FILTER
const INTERP_FILTER *interp_filter, const InterpFilter *interp_filter,
#else #else
const INTERP_FILTER interp_filter, const InterpFilter interp_filter,
#endif #endif
int xs, int ys, int xs, int ys,
#if CONFIG_SUPERTX #if CONFIG_SUPERTX
@@ -431,11 +431,11 @@ void av1_make_masked_inter_predictor(const uint8_t *pre, int pre_stride,
// The prediction filter types used here should be those for // The prediction filter types used here should be those for
// the second reference block. // the second reference block.
#if CONFIG_DUAL_FILTER #if CONFIG_DUAL_FILTER
INTERP_FILTER tmp_ipf[4] = { InterpFilter tmp_ipf[4] = {
interp_filter[2], interp_filter[3], interp_filter[2], interp_filter[3], interp_filter[2], interp_filter[3], interp_filter[2], interp_filter[3],
}; };
#else #else
INTERP_FILTER tmp_ipf = interp_filter; InterpFilter tmp_ipf = interp_filter;
#endif // CONFIG_DUAL_FILTER #endif // CONFIG_DUAL_FILTER
#if CONFIG_AOM_HIGHBITDEPTH #if CONFIG_AOM_HIGHBITDEPTH
DECLARE_ALIGNED(16, uint8_t, tmp_dst_[2 * MAX_SB_SQUARE]); DECLARE_ALIGNED(16, uint8_t, tmp_dst_[2 * MAX_SB_SQUARE]);
@@ -491,9 +491,9 @@ void av1_highbd_build_inter_predictor(
const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride,
const MV *src_mv, const struct scale_factors *sf, int w, int h, int ref, const MV *src_mv, const struct scale_factors *sf, int w, int h, int ref,
#if CONFIG_DUAL_FILTER #if CONFIG_DUAL_FILTER
const INTERP_FILTER *interp_filter, const InterpFilter *interp_filter,
#else #else
const INTERP_FILTER interp_filter, const InterpFilter interp_filter,
#endif #endif
enum mv_precision precision, int x, int y, int bd) { enum mv_precision precision, int x, int y, int bd) {
const int is_q4 = precision == MV_PRECISION_Q4; const int is_q4 = precision == MV_PRECISION_Q4;
@@ -516,9 +516,9 @@ void av1_build_inter_predictor(const uint8_t *src, int src_stride, uint8_t *dst,
const struct scale_factors *sf, int w, int h, const struct scale_factors *sf, int w, int h,
int ref, int ref,
#if CONFIG_DUAL_FILTER #if CONFIG_DUAL_FILTER
const INTERP_FILTER *interp_filter, const InterpFilter *interp_filter,
#else #else
const INTERP_FILTER interp_filter, const InterpFilter interp_filter,
#endif #endif
enum mv_precision precision, int x, int y) { enum mv_precision precision, int x, int y) {
const int is_q4 = precision == MV_PRECISION_Q4; const int is_q4 = precision == MV_PRECISION_Q4;

24
av1/common/reconinter.h
View File

@@ -27,9 +27,9 @@ static INLINE void inter_predictor(const uint8_t *src, int src_stride,
const struct scale_factors *sf, int w, int h, const struct scale_factors *sf, int w, int h,
int ref_idx, int ref_idx,
#if CONFIG_DUAL_FILTER #if CONFIG_DUAL_FILTER
const INTERP_FILTER *interp_filter, const InterpFilter *interp_filter,
#else #else
const INTERP_FILTER interp_filter, const InterpFilter interp_filter,
#endif #endif
int xs, int ys) { int xs, int ys) {
#if CONFIG_DUAL_FILTER #if CONFIG_DUAL_FILTER
@@ -86,9 +86,9 @@ static INLINE void highbd_inter_predictor(const uint8_t *src, int src_stride,
const struct scale_factors *sf, int w, const struct scale_factors *sf, int w,
int h, int ref, int h, int ref,
#if CONFIG_DUAL_FILTER #if CONFIG_DUAL_FILTER
const INTERP_FILTER *interp_filter, const InterpFilter *interp_filter,
#else #else
const INTERP_FILTER interp_filter, const InterpFilter interp_filter,
#endif #endif
int xs, int ys, int bd) { int xs, int ys, int bd) {
#if CONFIG_DUAL_FILTER #if CONFIG_DUAL_FILTER
@@ -229,9 +229,9 @@ static INLINE void av1_make_inter_predictor(
const int subpel_x, const int subpel_y, const struct scale_factors *sf, const int subpel_x, const int subpel_y, const struct scale_factors *sf,
int w, int h, int ref, int w, int h, int ref,
#if CONFIG_DUAL_FILTER #if CONFIG_DUAL_FILTER
const INTERP_FILTER *interp_filter, const InterpFilter *interp_filter,
#else #else
const INTERP_FILTER interp_filter, const InterpFilter interp_filter,
#endif #endif
int xs, int ys, const MACROBLOCKD *xd) { int xs, int ys, const MACROBLOCKD *xd) {
(void)xd; (void)xd;
@@ -252,9 +252,9 @@ void av1_make_masked_inter_predictor(const uint8_t *pre, int pre_stride,
const struct scale_factors *sf, int w, const struct scale_factors *sf, int w,
int h, int h,
#if CONFIG_DUAL_FILTER #if CONFIG_DUAL_FILTER
const INTERP_FILTER *interp_filter, const InterpFilter *interp_filter,
#else #else
const INTERP_FILTER interp_filter, const InterpFilter interp_filter,
#endif #endif
int xs, int ys, int xs, int ys,
#if CONFIG_SUPERTX #if CONFIG_SUPERTX
@@ -371,9 +371,9 @@ void av1_build_inter_predictor(const uint8_t *src, int src_stride, uint8_t *dst,
const struct scale_factors *sf, int w, int h, const struct scale_factors *sf, int w, int h,
int do_avg, int do_avg,
#if CONFIG_DUAL_FILTER #if CONFIG_DUAL_FILTER
const INTERP_FILTER *interp_filter, const InterpFilter *interp_filter,
#else #else
const INTERP_FILTER interp_filter, const InterpFilter interp_filter,
#endif #endif
enum mv_precision precision, int x, int y); enum mv_precision precision, int x, int y);
@@ -382,9 +382,9 @@ void av1_highbd_build_inter_predictor(
const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride,
const MV *mv_q3, const struct scale_factors *sf, int w, int h, int do_avg, const MV *mv_q3, const struct scale_factors *sf, int w, int h, int do_avg,
#if CONFIG_DUAL_FILTER #if CONFIG_DUAL_FILTER
const INTERP_FILTER *interp_filter, const InterpFilter *interp_filter,
#else #else
const INTERP_FILTER interp_filter, const InterpFilter interp_filter,
#endif #endif
enum mv_precision precision, int x, int y, int bd); enum mv_precision precision, int x, int y, int bd);
#endif #endif

2
av1/decoder/decodeframe.c
View File

@@ -2108,7 +2108,7 @@ static void setup_segmentation_dequant(AV1_COMMON *const cm) {
} }
} }
static INTERP_FILTER read_interp_filter(struct aom_read_bit_buffer *rb) { static InterpFilter read_interp_filter(struct aom_read_bit_buffer *rb) {
return aom_rb_read_bit(rb) ? SWITCHABLE return aom_rb_read_bit(rb) ? SWITCHABLE
: aom_rb_read_literal(rb, 2 + CONFIG_EXT_INTERP); : aom_rb_read_literal(rb, 2 + CONFIG_EXT_INTERP);
} }

10
av1/decoder/decodemv.c
View File

@@ -862,12 +862,12 @@ static MOTION_VARIATION read_motvar_block(AV1_COMMON *const cm,
} }
#endif // CONFIG_OBMC || CONFIG_WARPED_MOTION #endif // CONFIG_OBMC || CONFIG_WARPED_MOTION
static INLINE INTERP_FILTER read_interp_filter(AV1_COMMON *const cm, static INLINE InterpFilter read_interp_filter(AV1_COMMON *const cm,
MACROBLOCKD *const xd, MACROBLOCKD *const xd,
#if CONFIG_DUAL_FILTER #if CONFIG_DUAL_FILTER
int dir, int dir,
#endif #endif
aom_reader *r) { aom_reader *r) {
#if CONFIG_EXT_INTERP #if CONFIG_EXT_INTERP
if (!av1_is_interp_needed(xd)) return EIGHTTAP_REGULAR; if (!av1_is_interp_needed(xd)) return EIGHTTAP_REGULAR;
#endif #endif
@@ -880,7 +880,7 @@ static INLINE INTERP_FILTER read_interp_filter(AV1_COMMON *const cm,
const int ctx = av1_get_pred_context_switchable_interp(xd); const int ctx = av1_get_pred_context_switchable_interp(xd);
#endif #endif
FRAME_COUNTS *counts = xd->counts; FRAME_COUNTS *counts = xd->counts;
const INTERP_FILTER type = (INTERP_FILTER)aom_read_tree( const InterpFilter type = (InterpFilter)aom_read_tree(
r, av1_switchable_interp_tree, cm->fc->switchable_interp_prob[ctx]); r, av1_switchable_interp_tree, cm->fc->switchable_interp_prob[ctx]);
if (counts) ++counts->switchable_interp[ctx][type]; if (counts) ++counts->switchable_interp[ctx][type];
return type; return type;

2
av1/encoder/bitstream.c
View File

@@ -2624,7 +2624,7 @@ static void update_txfm_probs(AV1_COMMON *cm, aom_writer *w,
} }
} }
static void write_interp_filter(INTERP_FILTER filter, static void write_interp_filter(InterpFilter filter,
struct aom_write_bit_buffer *wb) { struct aom_write_bit_buffer *wb) {
aom_wb_write_bit(wb, filter == SWITCHABLE); aom_wb_write_bit(wb, filter == SWITCHABLE);
if (filter != SWITCHABLE) if (filter != SWITCHABLE)

2
av1/encoder/context_tree.h
View File

@@ -58,7 +58,7 @@ typedef struct {
// motion vector cache for adaptive motion search control in partition // motion vector cache for adaptive motion search control in partition
// search loop // search loop
MV pred_mv[TOTAL_REFS_PER_FRAME]; MV pred_mv[TOTAL_REFS_PER_FRAME];
INTERP_FILTER pred_interp_filter; InterpFilter pred_interp_filter;
#if CONFIG_EXT_PARTITION_TYPES #if CONFIG_EXT_PARTITION_TYPES
PARTITION_TYPE partition; PARTITION_TYPE partition;
#endif #endif

2
av1/encoder/encoder.c
View File

@@ -4429,7 +4429,7 @@ static void set_arf_sign_bias(AV1_COMP *cpi) {
} }
static int setup_interp_filter_search_mask(AV1_COMP *cpi) { static int setup_interp_filter_search_mask(AV1_COMP *cpi) {
INTERP_FILTER ifilter; InterpFilter ifilter;
int ref_total[TOTAL_REFS_PER_FRAME] = { 0 }; int ref_total[TOTAL_REFS_PER_FRAME] = { 0 };
MV_REFERENCE_FRAME ref; MV_REFERENCE_FRAME ref;
int mask = 0; int mask = 0;

37
av1/encoder/rdopt.c
View File

@@ -4569,12 +4569,12 @@ static void joint_motion_search(AV1_COMP *cpi, MACROBLOCK *x, BLOCK_SIZE bsize,
int_mv ref_mv[2]; int_mv ref_mv[2];
int ite, ref; int ite, ref;
#if CONFIG_DUAL_FILTER #if CONFIG_DUAL_FILTER
INTERP_FILTER interp_filter[4] = { InterpFilter interp_filter[4] = {
mbmi->interp_filter[0], mbmi->interp_filter[1], mbmi->interp_filter[2], mbmi->interp_filter[0], mbmi->interp_filter[1], mbmi->interp_filter[2],
mbmi->interp_filter[3], mbmi->interp_filter[3],
}; };
#else #else
const INTERP_FILTER interp_filter = mbmi->interp_filter; const InterpFilter interp_filter = mbmi->interp_filter;
#endif #endif
struct scale_factors sf; struct scale_factors sf;
@@ -6335,11 +6335,11 @@ static int estimate_wedge_sign(const AV1_COMP *cpi, const MACROBLOCK *x,
#endif // CONFIG_EXT_INTER #endif // CONFIG_EXT_INTER
#if !CONFIG_DUAL_FILTER #if !CONFIG_DUAL_FILTER
static INTERP_FILTER predict_interp_filter( static InterpFilter predict_interp_filter(
const AV1_COMP *cpi, const MACROBLOCK *x, const BLOCK_SIZE bsize, const AV1_COMP *cpi, const MACROBLOCK *x, const BLOCK_SIZE bsize,
const int mi_row, const int mi_col, const int mi_row, const int mi_col,
INTERP_FILTER (*single_filter)[TOTAL_REFS_PER_FRAME]) { InterpFilter (*single_filter)[TOTAL_REFS_PER_FRAME]) {
INTERP_FILTER best_filter = SWITCHABLE; InterpFilter best_filter = SWITCHABLE;
const AV1_COMMON *cm = &cpi->common; const AV1_COMMON *cm = &cpi->common;
const MACROBLOCKD *xd = &x->e_mbd; const MACROBLOCKD *xd = &x->e_mbd;
int bsl = mi_width_log2_lookup[bsize]; int bsl = mi_width_log2_lookup[bsize];
@@ -6359,7 +6359,7 @@ static INTERP_FILTER predict_interp_filter(
return SWITCHABLE; return SWITCHABLE;
#else #else
if (pred_filter_search) { if (pred_filter_search) {
INTERP_FILTER af = SWITCHABLE, lf = SWITCHABLE; InterpFilter af = SWITCHABLE, lf = SWITCHABLE;
if (xd->up_available) af = xd->mi[-xd->mi_stride]->mbmi.interp_filter; if (xd->up_available) af = xd->mi[-xd->mi_stride]->mbmi.interp_filter;
if (xd->left_available) lf = xd->mi[-1]->mbmi.interp_filter; if (xd->left_available) lf = xd->mi[-1]->mbmi.interp_filter;
@@ -6647,7 +6647,7 @@ static int64_t handle_inter_mode(
#else #else
int_mv single_newmv[TOTAL_REFS_PER_FRAME], int_mv single_newmv[TOTAL_REFS_PER_FRAME],
#endif // CONFIG_EXT_INTER #endif // CONFIG_EXT_INTER
INTERP_FILTER (*single_filter)[TOTAL_REFS_PER_FRAME], InterpFilter (*single_filter)[TOTAL_REFS_PER_FRAME],
int (*single_skippable)[TOTAL_REFS_PER_FRAME], int64_t *psse, int (*single_skippable)[TOTAL_REFS_PER_FRAME], int64_t *psse,
const int64_t ref_best_rd) { const int64_t ref_best_rd) {
AV1_COMMON *cm = &cpi->common; AV1_COMMON *cm = &cpi->common;
@@ -6712,11 +6712,11 @@ static int64_t handle_inter_mode(
// Index use case: // Index use case:
// {0, 1} -> (vertical, horizontal) filter types for the first ref frame // {0, 1} -> (vertical, horizontal) filter types for the first ref frame
// {2, 3} -> (vertical, horizontal) filter types for the second ref frame // {2, 3} -> (vertical, horizontal) filter types for the second ref frame
INTERP_FILTER best_filter[4] = { InterpFilter best_filter[4] = {
SWITCHABLE, SWITCHABLE, SWITCHABLE, SWITCHABLE, SWITCHABLE, SWITCHABLE, SWITCHABLE, SWITCHABLE,
}; };
#else #else
INTERP_FILTER best_filter = SWITCHABLE; InterpFilter best_filter = SWITCHABLE;
#endif #endif
int skip_txfm_sb = 0; int skip_txfm_sb = 0;
@@ -7510,12 +7510,12 @@ static int64_t handle_inter_mode(
#endif // CONFIG_EXT_INTER #endif // CONFIG_EXT_INTER
#if CONFIG_EXT_INTERP #if CONFIG_EXT_INTERP
#if CONFIG_DUAL_FILTER #if CONFIG_DUAL_FILTER
INTERP_FILTER obmc_interp_filter[2][2] = { InterpFilter obmc_interp_filter[2][2] = {
{ mbmi->interp_filter[0], mbmi->interp_filter[1] }, // obmc == 0 { mbmi->interp_filter[0], mbmi->interp_filter[1] }, // obmc == 0
{ mbmi->interp_filter[0], mbmi->interp_filter[1] } // obmc == 1 { mbmi->interp_filter[0], mbmi->interp_filter[1] } // obmc == 1
}; };
#else #else
INTERP_FILTER obmc_interp_filter[2] = { InterpFilter obmc_interp_filter[2] = {
mbmi->interp_filter, // obmc == 0 mbmi->interp_filter, // obmc == 0
mbmi->interp_filter // obmc == 1 mbmi->interp_filter // obmc == 1
}; };
@@ -8193,7 +8193,7 @@ void av1_rd_pick_inter_mode_sb(AV1_COMP *cpi, TileDataEnc *tile_data,
#else #else
int_mv single_newmv[TOTAL_REFS_PER_FRAME] = { { 0 } }; int_mv single_newmv[TOTAL_REFS_PER_FRAME] = { { 0 } };
#endif // CONFIG_EXT_INTER #endif // CONFIG_EXT_INTER
INTERP_FILTER single_inter_filter[MB_MODE_COUNT][TOTAL_REFS_PER_FRAME]; InterpFilter single_inter_filter[MB_MODE_COUNT][TOTAL_REFS_PER_FRAME];
int single_skippable[MB_MODE_COUNT][TOTAL_REFS_PER_FRAME]; int single_skippable[MB_MODE_COUNT][TOTAL_REFS_PER_FRAME];
static const int flag_list[TOTAL_REFS_PER_FRAME] = { static const int flag_list[TOTAL_REFS_PER_FRAME] = {
0, 0,
@@ -8982,10 +8982,9 @@ void av1_rd_pick_inter_mode_sb(AV1_COMP *cpi, TileDataEnc *tile_data,
clamp_mv2(&cur_mv.as_mv, xd); clamp_mv2(&cur_mv.as_mv, xd);
if (!mv_check_bounds(x, &cur_mv.as_mv)) { if (!mv_check_bounds(x, &cur_mv.as_mv)) {
INTERP_FILTER InterpFilter
dummy_single_inter_filter[MB_MODE_COUNT][TOTAL_REFS_PER_FRAME] = { dummy_single_inter_filter[MB_MODE_COUNT][TOTAL_REFS_PER_FRAME] =
{ 0 } { { 0 } };
};
int dummy_single_skippable[MB_MODE_COUNT][TOTAL_REFS_PER_FRAME] = { int dummy_single_skippable[MB_MODE_COUNT][TOTAL_REFS_PER_FRAME] = {
{ 0 } { 0 }
}; };
@@ -9763,7 +9762,7 @@ void av1_rd_pick_inter_mode_sb_seg_skip(AV1_COMP *cpi, TileDataEnc *tile_data,
unsigned int ref_costs_single[TOTAL_REFS_PER_FRAME]; unsigned int ref_costs_single[TOTAL_REFS_PER_FRAME];
unsigned int ref_costs_comp[TOTAL_REFS_PER_FRAME]; unsigned int ref_costs_comp[TOTAL_REFS_PER_FRAME];
aom_prob comp_mode_p; aom_prob comp_mode_p;
INTERP_FILTER best_filter = SWITCHABLE; InterpFilter best_filter = SWITCHABLE;
int64_t this_rd = INT64_MAX; int64_t this_rd = INT64_MAX;
int rate2 = 0; int rate2 = 0;
const int64_t distortion2 = 0; const int64_t distortion2 = 0;
@@ -9923,9 +9922,9 @@ void av1_rd_pick_inter_mode_sub8x8(struct AV1_COMP *cpi, TileDataEnc *tile_data,
unsigned int ref_costs_comp[TOTAL_REFS_PER_FRAME]; unsigned int ref_costs_comp[TOTAL_REFS_PER_FRAME];
aom_prob comp_mode_p; aom_prob comp_mode_p;
#if CONFIG_DUAL_FILTER #if CONFIG_DUAL_FILTER
INTERP_FILTER tmp_best_filter[4] = { 0 }; InterpFilter tmp_best_filter[4] = { 0 };
#else #else
INTERP_FILTER tmp_best_filter = SWITCHABLE; InterpFilter tmp_best_filter = SWITCHABLE;
#endif #endif
int rate_uv_intra, rate_uv_tokenonly; int rate_uv_intra, rate_uv_tokenonly;
int64_t dist_uv; int64_t dist_uv;

2
av1/encoder/speed_features.h
View File

@@ -453,7 +453,7 @@ typedef struct SPEED_FEATURES {
int encode_breakout_thresh; int encode_breakout_thresh;
// default interp filter choice // default interp filter choice
INTERP_FILTER default_interp_filter; InterpFilter default_interp_filter;
// Early termination in transform size search, which only applies while // Early termination in transform size search, which only applies while
// tx_size_search_method is USE_FULL_RD. // tx_size_search_method is USE_FULL_RD.

12
av1/encoder/temporal_filter.c
View File

@@ -42,16 +42,16 @@ static void temporal_filter_predictors_mb_c(
#if USE_TEMPORALFILTER_12TAP #if USE_TEMPORALFILTER_12TAP
#if CONFIG_DUAL_FILTER #if CONFIG_DUAL_FILTER
const INTERP_FILTER interp_filter[4] = { TEMPORALFILTER_12TAP, const InterpFilter interp_filter[4] = { TEMPORALFILTER_12TAP,
TEMPORALFILTER_12TAP, TEMPORALFILTER_12TAP,
TEMPORALFILTER_12TAP, TEMPORALFILTER_12TAP,
TEMPORALFILTER_12TAP }; TEMPORALFILTER_12TAP };
#else #else
const INTERP_FILTER interp_filter = TEMPORALFILTER_12TAP; const InterpFilter interp_filter = TEMPORALFILTER_12TAP;
#endif #endif
(void)xd; (void)xd;
#else #else
const INTERP_FILTER interp_filter = xd->mi[0]->mbmi.interp_filter; const InterpFilter interp_filter = xd->mi[0]->mbmi.interp_filter;
#endif // USE_TEMPORALFILTER_12TAP #endif // USE_TEMPORALFILTER_12TAP
if (uv_block_width == 8) { if (uv_block_width == 8) {

6
test/av1_convolve_optimz_test.cc
View File

@@ -34,14 +34,14 @@ typedef void (*hbd_conv_filter_t)(const uint16_t *, int, uint16_t *, int, int,
// <convolve_horiz_func, convolve_vert_func, // <convolve_horiz_func, convolve_vert_func,
// <width, height>, filter_params, subpel_x_q4, avg> // <width, height>, filter_params, subpel_x_q4, avg>
typedef tuple<int, int> BlockDimension; typedef tuple<int, int> BlockDimension;
typedef tuple<conv_filter_t, conv_filter_t, BlockDimension, INTERP_FILTER, int, typedef tuple<conv_filter_t, conv_filter_t, BlockDimension, InterpFilter, int,
int> ConvParams; int> ConvParams;
#if CONFIG_AOM_HIGHBITDEPTH #if CONFIG_AOM_HIGHBITDEPTH
// Test parameter list: // Test parameter list:
// <convolve_horiz_func, convolve_vert_func, // <convolve_horiz_func, convolve_vert_func,
// <width, height>, filter_params, subpel_x_q4, avg, bit_dpeth> // <width, height>, filter_params, subpel_x_q4, avg, bit_dpeth>
typedef tuple<hbd_conv_filter_t, hbd_conv_filter_t, BlockDimension, typedef tuple<hbd_conv_filter_t, hbd_conv_filter_t, BlockDimension,
INTERP_FILTER, int, int, int> HbdConvParams; InterpFilter, int, int, int> HbdConvParams;
#endif #endif
// Note: // Note:
@@ -211,7 +211,7 @@ const BlockDimension kBlockDim[] = {
}; };
// 10/12-tap filters // 10/12-tap filters
const INTERP_FILTER kFilter[] = { 6, 4, 2 }; const InterpFilter kFilter[] = { 6, 4, 2 };
const int kSubpelQ4[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }; const int kSubpelQ4[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };

34
test/av1_convolve_test.cc
View File

@@ -32,12 +32,12 @@ void setup_convolve() {
TEST(AV1ConvolveTest, av1_convolve8) { TEST(AV1ConvolveTest, av1_convolve8) {
ACMRandom rnd(ACMRandom::DeterministicSeed()); ACMRandom rnd(ACMRandom::DeterministicSeed());
#if CONFIG_DUAL_FILTER #if CONFIG_DUAL_FILTER
INTERP_FILTER interp_filter[4] = { EIGHTTAP_REGULAR, EIGHTTAP_REGULAR, InterpFilter interp_filter[4] = { EIGHTTAP_REGULAR, EIGHTTAP_REGULAR,
EIGHTTAP_REGULAR, EIGHTTAP_REGULAR }; EIGHTTAP_REGULAR, EIGHTTAP_REGULAR };
InterpFilterParams filter_params = InterpFilterParams filter_params =
av1_get_interp_filter_params(interp_filter[0]); av1_get_interp_filter_params(interp_filter[0]);
#else #else
INTERP_FILTER interp_filter = EIGHTTAP_REGULAR; InterpFilter interp_filter = EIGHTTAP_REGULAR;
InterpFilterParams filter_params = InterpFilterParams filter_params =
av1_get_interp_filter_params(interp_filter); av1_get_interp_filter_params(interp_filter);
#endif #endif
@@ -79,12 +79,12 @@ TEST(AV1ConvolveTest, av1_convolve8) {
TEST(AV1ConvolveTest, av1_convolve) { TEST(AV1ConvolveTest, av1_convolve) {
ACMRandom rnd(ACMRandom::DeterministicSeed()); ACMRandom rnd(ACMRandom::DeterministicSeed());
#if CONFIG_DUAL_FILTER #if CONFIG_DUAL_FILTER
INTERP_FILTER interp_filter[4] = { EIGHTTAP_REGULAR, EIGHTTAP_REGULAR, InterpFilter interp_filter[4] = { EIGHTTAP_REGULAR, EIGHTTAP_REGULAR,
EIGHTTAP_REGULAR, EIGHTTAP_REGULAR }; EIGHTTAP_REGULAR, EIGHTTAP_REGULAR };
InterpFilterParams filter_params = InterpFilterParams filter_params =
av1_get_interp_filter_params(interp_filter[0]); av1_get_interp_filter_params(interp_filter[0]);
#else #else
INTERP_FILTER interp_filter = EIGHTTAP_REGULAR; InterpFilter interp_filter = EIGHTTAP_REGULAR;
InterpFilterParams filter_params = InterpFilterParams filter_params =
av1_get_interp_filter_params(interp_filter); av1_get_interp_filter_params(interp_filter);
#endif #endif
@@ -139,12 +139,12 @@ TEST(AV1ConvolveTest, av1_convolve) {
TEST(AV1ConvolveTest, av1_convolve_avg) { TEST(AV1ConvolveTest, av1_convolve_avg) {
ACMRandom rnd(ACMRandom::DeterministicSeed()); ACMRandom rnd(ACMRandom::DeterministicSeed());
#if CONFIG_DUAL_FILTER #if CONFIG_DUAL_FILTER
INTERP_FILTER interp_filter[4] = { EIGHTTAP_REGULAR, EIGHTTAP_REGULAR, InterpFilter interp_filter[4] = { EIGHTTAP_REGULAR, EIGHTTAP_REGULAR,
EIGHTTAP_REGULAR, EIGHTTAP_REGULAR }; EIGHTTAP_REGULAR, EIGHTTAP_REGULAR };
InterpFilterParams filter_params = InterpFilterParams filter_params =
av1_get_interp_filter_params(interp_filter[0]); av1_get_interp_filter_params(interp_filter[0]);
#else #else
INTERP_FILTER interp_filter = EIGHTTAP_REGULAR; InterpFilter interp_filter = EIGHTTAP_REGULAR;
InterpFilterParams filter_params = InterpFilterParams filter_params =
av1_get_interp_filter_params(interp_filter); av1_get_interp_filter_params(interp_filter);
#endif #endif
@@ -205,12 +205,12 @@ TEST(AV1ConvolveTest, av1_convolve_avg) {
TEST(AV1ConvolveTest, av1_highbd_convolve) { TEST(AV1ConvolveTest, av1_highbd_convolve) {
ACMRandom rnd(ACMRandom::DeterministicSeed()); ACMRandom rnd(ACMRandom::DeterministicSeed());
#if CONFIG_DUAL_FILTER #if CONFIG_DUAL_FILTER
INTERP_FILTER interp_filter[4] = { EIGHTTAP_REGULAR, EIGHTTAP_REGULAR, InterpFilter interp_filter[4] = { EIGHTTAP_REGULAR, EIGHTTAP_REGULAR,
EIGHTTAP_REGULAR, EIGHTTAP_REGULAR }; EIGHTTAP_REGULAR, EIGHTTAP_REGULAR };
InterpFilterParams filter_params = InterpFilterParams filter_params =
av1_get_interp_filter_params(interp_filter[0]); av1_get_interp_filter_params(interp_filter[0]);
#else #else
INTERP_FILTER interp_filter = EIGHTTAP_REGULAR; InterpFilter interp_filter = EIGHTTAP_REGULAR;
InterpFilterParams filter_params = InterpFilterParams filter_params =
av1_get_interp_filter_params(interp_filter); av1_get_interp_filter_params(interp_filter);
#endif #endif
@@ -266,12 +266,12 @@ TEST(AV1ConvolveTest, av1_highbd_convolve) {
TEST(AV1ConvolveTest, av1_highbd_convolve_avg) { TEST(AV1ConvolveTest, av1_highbd_convolve_avg) {
ACMRandom rnd(ACMRandom::DeterministicSeed()); ACMRandom rnd(ACMRandom::DeterministicSeed());
#if CONFIG_DUAL_FILTER #if CONFIG_DUAL_FILTER
INTERP_FILTER interp_filter[4] = { EIGHTTAP_REGULAR, EIGHTTAP_REGULAR, InterpFilter interp_filter[4] = { EIGHTTAP_REGULAR, EIGHTTAP_REGULAR,
EIGHTTAP_REGULAR, EIGHTTAP_REGULAR }; EIGHTTAP_REGULAR, EIGHTTAP_REGULAR };
InterpFilterParams filter_params = InterpFilterParams filter_params =
av1_get_interp_filter_params(interp_filter[0]); av1_get_interp_filter_params(interp_filter[0]);
#else #else
INTERP_FILTER interp_filter = EIGHTTAP_REGULAR; InterpFilter interp_filter = EIGHTTAP_REGULAR;
InterpFilterParams filter_params = InterpFilterParams filter_params =
av1_get_interp_filter_params(interp_filter); av1_get_interp_filter_params(interp_filter);
#endif #endif
@@ -337,7 +337,7 @@ TEST(AV1ConvolveTest, av1_highbd_convolve_avg) {
#define highbd_convolve_speed(func, block_size, frame_size) \ #define highbd_convolve_speed(func, block_size, frame_size) \
TEST(AV1ConvolveTest, func##_speed_##block_size##_##frame_size) { \ TEST(AV1ConvolveTest, func##_speed_##block_size##_##frame_size) { \
ACMRandom rnd(ACMRandom::DeterministicSeed()); \ ACMRandom rnd(ACMRandom::DeterministicSeed()); \
INTERP_FILTER interp_filter = EIGHTTAP; \ InterpFilter interp_filter = EIGHTTAP; \
InterpFilterParams filter_params = \ InterpFilterParams filter_params = \
av1_get_interp_filter_params(interp_filter); \ av1_get_interp_filter_params(interp_filter); \
int filter_size = filter_params.tap; \ int filter_size = filter_params.tap; \
@@ -389,7 +389,7 @@ TEST(AV1ConvolveTest, av1_highbd_convolve_avg) {
#define lowbd_convolve_speed(func, block_size, frame_size) \ #define lowbd_convolve_speed(func, block_size, frame_size) \
TEST(AV1ConvolveTest, func##_speed_l_##block_size##_##frame_size) { \ TEST(AV1ConvolveTest, func##_speed_l_##block_size##_##frame_size) { \
ACMRandom rnd(ACMRandom::DeterministicSeed()); \ ACMRandom rnd(ACMRandom::DeterministicSeed()); \
INTERP_FILTER interp_filter = EIGHTTAP; \ InterpFilter interp_filter = EIGHTTAP; \
InterpFilterParams filter_params = \ InterpFilterParams filter_params = \
av1_get_interp_filter_params(interp_filter); \ av1_get_interp_filter_params(interp_filter); \
int filter_size = filter_params.tap; \ int filter_size = filter_params.tap; \

8
test/convolve_test.cc
View File

@@ -636,7 +636,7 @@ const int kNumFilters = 16;
TEST(ConvolveTest, FiltersWontSaturateWhenAddedPairwise) { TEST(ConvolveTest, FiltersWontSaturateWhenAddedPairwise) {
for (int filter_bank = 0; filter_bank < kNumFilterBanks; ++filter_bank) { for (int filter_bank = 0; filter_bank < kNumFilterBanks; ++filter_bank) {
const InterpKernel *filters = const InterpKernel *filters =
av1_filter_kernels[static_cast<INTERP_FILTER>(filter_bank)]; av1_filter_kernels[static_cast<InterpFilter>(filter_bank)];
for (int i = 0; i < kNumFilters; i++) { for (int i = 0; i < kNumFilters; i++) {
const int p0 = filters[i][0] + filters[i][1]; const int p0 = filters[i][0] + filters[i][1];
const int p1 = filters[i][2] + filters[i][3]; const int p1 = filters[i][2] + filters[i][3];
@@ -674,7 +674,7 @@ TEST_P(ConvolveTest, MatchesReferenceSubpixelFilter) {
for (int filter_bank = 0; filter_bank < kNumFilterBanks; ++filter_bank) { for (int filter_bank = 0; filter_bank < kNumFilterBanks; ++filter_bank) {
const InterpKernel *filters = const InterpKernel *filters =
av1_filter_kernels[static_cast<INTERP_FILTER>(filter_bank)]; av1_filter_kernels[static_cast<InterpFilter>(filter_bank)];
for (int filter_x = 0; filter_x < kNumFilters; ++filter_x) { for (int filter_x = 0; filter_x < kNumFilters; ++filter_x) {
for (int filter_y = 0; filter_y < kNumFilters; ++filter_y) { for (int filter_y = 0; filter_y < kNumFilters; ++filter_y) {
@@ -751,7 +751,7 @@ TEST_P(ConvolveTest, MatchesReferenceAveragingSubpixelFilter) {
for (int filter_bank = 0; filter_bank < kNumFilterBanks; ++filter_bank) { for (int filter_bank = 0; filter_bank < kNumFilterBanks; ++filter_bank) {
const InterpKernel *filters = const InterpKernel *filters =
av1_filter_kernels[static_cast<INTERP_FILTER>(filter_bank)]; av1_filter_kernels[static_cast<InterpFilter>(filter_bank)];
for (int filter_x = 0; filter_x < kNumFilters; ++filter_x) { for (int filter_x = 0; filter_x < kNumFilters; ++filter_x) {
for (int filter_y = 0; filter_y < kNumFilters; ++filter_y) { for (int filter_y = 0; filter_y < kNumFilters; ++filter_y) {
@@ -848,7 +848,7 @@ TEST_P(ConvolveTest, FilterExtremes) {
for (int filter_bank = 0; filter_bank < kNumFilterBanks; ++filter_bank) { for (int filter_bank = 0; filter_bank < kNumFilterBanks; ++filter_bank) {
const InterpKernel *filters = const InterpKernel *filters =
av1_filter_kernels[static_cast<INTERP_FILTER>(filter_bank)]; av1_filter_kernels[static_cast<InterpFilter>(filter_bank)];
for (int filter_x = 0; filter_x < kNumFilters; ++filter_x) { for (int filter_x = 0; filter_x < kNumFilters; ++filter_x) {
for (int filter_y = 0; filter_y < kNumFilters; ++filter_y) { for (int filter_y = 0; filter_y < kNumFilters; ++filter_y) {
wrapper_filter_block2d_8_c(in, kInputStride, filters[filter_x], wrapper_filter_block2d_8_c(in, kInputStride, filters[filter_x],