Prefix interpolation_filter_search functions with av1_
Change-Id: Ic53380f0dc9338a69edb8ebdaa2a9d8c203a1e0c
diff --git a/av1/encoder/interp_search.c b/av1/encoder/interp_search.c
index 91d570b..5805dae 100644
--- a/av1/encoder/interp_search.c
+++ b/av1/encoder/interp_search.c
@@ -90,12 +90,11 @@
return -1; // no match result found
}
-int find_interp_filter_match(MB_MODE_INFO *const mbmi,
- const AV1_COMP *const cpi,
- const InterpFilter assign_filter,
- const int need_search,
- INTERPOLATION_FILTER_STATS *interp_filter_stats,
- int interp_filter_stats_idx) {
+int av1_find_interp_filter_match(
+ MB_MODE_INFO *const mbmi, const AV1_COMP *const cpi,
+ const InterpFilter assign_filter, const int need_search,
+ INTERPOLATION_FILTER_STATS *interp_filter_stats,
+ int interp_filter_stats_idx) {
int match_found_idx = -1;
if (cpi->sf.interp_sf.use_interp_filter && need_search)
match_found_idx = find_interp_filter_in_stats(
@@ -593,7 +592,7 @@
}
}
-int64_t interpolation_filter_search(
+int64_t av1_interpolation_filter_search(
MACROBLOCK *const x, const AV1_COMP *const cpi,
const TileDataEnc *tile_data, BLOCK_SIZE bsize,
const BUFFER_SET *const tmp_dst, const BUFFER_SET *const orig_dst,
@@ -615,7 +614,7 @@
int match_found_idx = -1;
const InterpFilter assign_filter = cm->interp_filter;
- match_found_idx = find_interp_filter_match(
+ match_found_idx = av1_find_interp_filter_match(
mbmi, cpi, assign_filter, need_search, args->interp_filter_stats,
args->interp_filter_stats_idx);
diff --git a/av1/encoder/interp_search.h b/av1/encoder/interp_search.h
index 63eec8c..38c47cf 100644
--- a/av1/encoder/interp_search.h
+++ b/av1/encoder/interp_search.h
@@ -65,14 +65,13 @@
{ 0x00000002 }, { 0x00010002 }, { 0x00020002 }, // y = 2
};
-int find_interp_filter_match(MB_MODE_INFO *const mbmi,
- const AV1_COMP *const cpi,
- const InterpFilter assign_filter,
- const int need_search,
- INTERPOLATION_FILTER_STATS *interp_filter_stats,
- int interp_filter_stats_idx);
+int av1_find_interp_filter_match(
+ MB_MODE_INFO *const mbmi, const AV1_COMP *const cpi,
+ const InterpFilter assign_filter, const int need_search,
+ INTERPOLATION_FILTER_STATS *interp_filter_stats,
+ int interp_filter_stats_idx);
-int64_t interpolation_filter_search(
+int64_t av1_interpolation_filter_search(
MACROBLOCK *const x, const AV1_COMP *const cpi,
const TileDataEnc *tile_data, BLOCK_SIZE bsize,
const BUFFER_SET *const tmp_dst, const BUFFER_SET *const orig_dst,
diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 3d2ef4c..ea1cec4 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -4670,9 +4670,9 @@
const int need_search = av1_is_interp_needed(xd);
const InterpFilter assign_filter = cm->interp_filter;
int is_luma_interp_done = 0;
- find_interp_filter_match(mbmi, cpi, assign_filter, need_search,
- args->interp_filter_stats,
- args->interp_filter_stats_idx);
+ av1_find_interp_filter_match(mbmi, cpi, assign_filter, need_search,
+ args->interp_filter_stats,
+ args->interp_filter_stats_idx);
int64_t best_rd_compound;
int64_t rd_thresh;
@@ -4712,9 +4712,9 @@
#if CONFIG_COLLECT_COMPONENT_TIMING
start_timing(cpi, interpolation_filter_search_time);
#endif
- ret_val = interpolation_filter_search(x, cpi, tile_data, bsize, &tmp_dst,
- &orig_dst, &rd, &rs, &skip_build_pred,
- args, ref_best_rd);
+ ret_val = av1_interpolation_filter_search(
+ x, cpi, tile_data, bsize, &tmp_dst, &orig_dst, &rd, &rs,
+ &skip_build_pred, args, ref_best_rd);
#if CONFIG_COLLECT_COMPONENT_TIMING
end_timing(cpi, interpolation_filter_search_time);
#endif
diff --git a/av1/encoder/speed_features.h b/av1/encoder/speed_features.h
index 959329e..4c247d2 100644
--- a/av1/encoder/speed_features.h
+++ b/av1/encoder/speed_features.h
@@ -662,7 +662,7 @@
// Disable dual filter
int disable_dual_filter;
- // Save results of interpolation_filter_search for a block
+ // Save results of av1_interpolation_filter_search for a block
// Check mv and ref_frames before search, if they are very close with previous
// saved results, filter search can be skipped.
int use_interp_filter;
