Rename av1_rd_pick_inter_mode_sb to av1_rd_pick_inter_mode
This function applies to all coding blocks in av1, since we
have unified the sub8x8 blocks and larger ones.
Change-Id: I79c60241682ccd6aca2ec60aac5111e0ae444858
diff --git a/av1/encoder/block.h b/av1/encoder/block.h
index 7b8f5dc..d77c281 100644
--- a/av1/encoder/block.h
+++ b/av1/encoder/block.h
@@ -1116,7 +1116,7 @@
/*! \brief Whether to reuse the mode stored in intermode_cache. */
int use_intermode_cache;
- /*! \brief The mode to reuse during \ref av1_rd_pick_inter_mode_sb. */
+ /*! \brief The mode to reuse during \ref av1_rd_pick_inter_mode. */
const MB_MODE_INFO *intermode_cache;
/**@}*/
diff --git a/av1/encoder/partition_search.c b/av1/encoder/partition_search.c
index d8f42b8..edb5ab4 100644
--- a/av1/encoder/partition_search.c
+++ b/av1/encoder/partition_search.c
@@ -681,8 +681,8 @@
av1_rd_pick_inter_mode_sb_seg_skip(cpi, tile_data, x, mi_row, mi_col,
rd_cost, bsize, ctx, best_rd.rdcost);
} else {
- av1_rd_pick_inter_mode_sb(cpi, tile_data, x, rd_cost, bsize, ctx,
- best_rd.rdcost);
+ av1_rd_pick_inter_mode(cpi, tile_data, x, rd_cost, bsize, ctx,
+ best_rd.rdcost);
}
#if CONFIG_COLLECT_COMPONENT_TIMING
end_timing(cpi, av1_rd_pick_inter_mode_sb_time);
diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index c53fb53..05ee48c 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -5312,11 +5312,10 @@
}
// TODO(chiyotsai@google.com): See the todo for av1_rd_pick_intra_mode_sb.
-void av1_rd_pick_inter_mode_sb(struct AV1_COMP *cpi,
- struct TileDataEnc *tile_data,
- struct macroblock *x, struct RD_STATS *rd_cost,
- BLOCK_SIZE bsize, PICK_MODE_CONTEXT *ctx,
- int64_t best_rd_so_far) {
+void av1_rd_pick_inter_mode(struct AV1_COMP *cpi, struct TileDataEnc *tile_data,
+ struct macroblock *x, struct RD_STATS *rd_cost,
+ BLOCK_SIZE bsize, PICK_MODE_CONTEXT *ctx,
+ int64_t best_rd_so_far) {
AV1_COMMON *const cm = &cpi->common;
const FeatureFlags *const features = &cm->features;
const int num_planes = av1_num_planes(cm);
diff --git a/av1/encoder/rdopt.h b/av1/encoder/rdopt.h
index 8717024..df080b0 100644
--- a/av1/encoder/rdopt.h
+++ b/av1/encoder/rdopt.h
@@ -90,11 +90,10 @@
* in this function. The rd_cost struct is also updated with the RD stats
* corresponding to the best mode found.
*/
-void av1_rd_pick_inter_mode_sb(struct AV1_COMP *cpi,
- struct TileDataEnc *tile_data,
- struct macroblock *x, struct RD_STATS *rd_cost,
- BLOCK_SIZE bsize, PICK_MODE_CONTEXT *ctx,
- int64_t best_rd_so_far);
+void av1_rd_pick_inter_mode(struct AV1_COMP *cpi, struct TileDataEnc *tile_data,
+ struct macroblock *x, struct RD_STATS *rd_cost,
+ BLOCK_SIZE bsize, PICK_MODE_CONTEXT *ctx,
+ int64_t best_rd_so_far);
/*!\brief AV1 intra mode selection based on Non-RD optimized model.
*
diff --git a/doc/dev_guide/av1_encoder.dox b/doc/dev_guide/av1_encoder.dox
index 81ebadc..7241b95 100644
--- a/doc/dev_guide/av1_encoder.dox
+++ b/doc/dev_guide/av1_encoder.dox
@@ -1105,7 +1105,7 @@
As with the intra mode search, libaom supports an RD based pathway and a non
rd pathway for speed critical use cases. The entry points for these two cases
-are \ref av1_rd_pick_inter_mode_sb() and \ref av1_nonrd_pick_inter_mode_sb()
+are \ref av1_rd_pick_inter_mode() and \ref av1_nonrd_pick_inter_mode_sb()
respectively.
Various heuristics and predictive strategies are used to prune the search tree
