Rename some intra mode functions for clarity.
BUG=aomedia:2044
Change-Id: I8ec9ea894cbebead51176536b34b75921635ae83
diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 3b939ee..7cc5e2e 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -66,11 +66,11 @@
aom_writer *const w, int plane,
FRAME_COUNTS *counts);
-static void write_intra_mode_kf(FRAME_CONTEXT *frame_ctx,
- const MB_MODE_INFO *mi,
- const MB_MODE_INFO *above_mi,
- const MB_MODE_INFO *left_mi,
- PREDICTION_MODE mode, aom_writer *w) {
+static void write_intra_y_mode_kf(FRAME_CONTEXT *frame_ctx,
+ const MB_MODE_INFO *mi,
+ const MB_MODE_INFO *above_mi,
+ const MB_MODE_INFO *left_mi,
+ PREDICTION_MODE mode, aom_writer *w) {
assert(!is_intrabc_block(mi));
(void)mi;
aom_write_symbol(w, mode, get_y_mode_cdf(frame_ctx, above_mi, left_mi),
@@ -836,8 +836,8 @@
}
}
-static void write_intra_mode(FRAME_CONTEXT *frame_ctx, BLOCK_SIZE bsize,
- PREDICTION_MODE mode, aom_writer *w) {
+static void write_intra_y_mode_nonkf(FRAME_CONTEXT *frame_ctx, BLOCK_SIZE bsize,
+ PREDICTION_MODE mode, aom_writer *w) {
aom_write_symbol(w, mode, frame_ctx->y_mode_cdf[size_group_lookup[bsize]],
INTRA_MODES);
}
@@ -992,9 +992,9 @@
if (is_keyframe) {
const MB_MODE_INFO *const above_mi = xd->above_mbmi;
const MB_MODE_INFO *const left_mi = xd->left_mbmi;
- write_intra_mode_kf(ec_ctx, mbmi, above_mi, left_mi, mode, w);
+ write_intra_y_mode_kf(ec_ctx, mbmi, above_mi, left_mi, mode, w);
} else {
- write_intra_mode(ec_ctx, bsize, mode, w);
+ write_intra_y_mode_nonkf(ec_ctx, bsize, mode, w);
}
// Y angle delta.
