From 0cbf911d705f5e1c98ab9838531d2052e0d7ceae Mon Sep 17 00:00:00 2001
From: James Zern <[EMAIL REDACTED]>
Date: Tue, 13 Aug 2024 17:13:22 -0700
Subject: [PATCH] encodemb.c: make av1_encode_block_intra() static
This function is unused outside of this file.
Bug: aomedia:3416
Change-Id: Iad38a45bda661b4955ef54092765e9a8f4d7708b
---
av1/encoder/encodemb.c | 33 ++++++++++++++++-----------------
av1/encoder/encodemb.h | 3 ---
2 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/av1/encoder/encodemb.c b/av1/encoder/encodemb.c
index c53e8b94d7..a91506b043 100644
--- a/av1/encoder/encodemb.c
+++ b/av1/encoder/encodemb.c
@@ -717,23 +717,9 @@ void av1_encode_sb(const struct AV1_COMP *cpi, MACROBLOCK *x, BLOCK_SIZE bsize,
}
}
-static void encode_block_intra_and_set_context(int plane, int block,
- int blk_row, int blk_col,
- BLOCK_SIZE plane_bsize,
- TX_SIZE tx_size, void *arg) {
- av1_encode_block_intra(plane, block, blk_row, blk_col, plane_bsize, tx_size,
- arg);
-
- struct encode_b_args *const args = arg;
- MACROBLOCK *x = args->x;
- ENTROPY_CONTEXT *a = &args->ta[blk_col];
- ENTROPY_CONTEXT *l = &args->tl[blk_row];
- av1_set_txb_context(x, plane, block, tx_size, a, l);
-}
-
-void av1_encode_block_intra(int plane, int block, int blk_row, int blk_col,
- BLOCK_SIZE plane_bsize, TX_SIZE tx_size,
- void *arg) {
+static void encode_block_intra(int plane, int block, int blk_row, int blk_col,
+ BLOCK_SIZE plane_bsize, TX_SIZE tx_size,
+ void *arg) {
struct encode_b_args *const args = arg;
const AV1_COMP *const cpi = args->cpi;
const AV1_COMMON *const cm = &cpi->common;
@@ -842,6 +828,19 @@ void av1_encode_block_intra(int plane, int block, int blk_row, int blk_col,
}
}
+static void encode_block_intra_and_set_context(int plane, int block,
+ int blk_row, int blk_col,
+ BLOCK_SIZE plane_bsize,
+ TX_SIZE tx_size, void *arg) {
+ encode_block_intra(plane, block, blk_row, blk_col, plane_bsize, tx_size, arg);
+
+ struct encode_b_args *const args = arg;
+ MACROBLOCK *x = args->x;
+ ENTROPY_CONTEXT *a = &args->ta[blk_col];
+ ENTROPY_CONTEXT *l = &args->tl[blk_row];
+ av1_set_txb_context(x, plane, block, tx_size, a, l);
+}
+
void av1_encode_intra_block_plane(const struct AV1_COMP *cpi, MACROBLOCK *x,
BLOCK_SIZE bsize, int plane, RUN_TYPE dry_run,
TRELLIS_OPT_TYPE enable_optimize_b) {
diff --git a/av1/encoder/encodemb.h b/av1/encoder/encodemb.h
index 5f539c48b0..b35265cc2e 100644
--- a/av1/encoder/encodemb.h
+++ b/av1/encoder/encodemb.h
@@ -146,9 +146,6 @@ static inline void av1_set_txb_context(MACROBLOCK *x, int plane, int block,
memset(l, ctx, tx_size_high_unit[tx_size] * sizeof(*l));
}
-void av1_encode_block_intra(int plane, int block, int blk_row, int blk_col,
- BLOCK_SIZE plane_bsize, TX_SIZE tx_size, void *arg);
-
void av1_encode_intra_block_plane(const struct AV1_COMP *cpi, MACROBLOCK *x,
BLOCK_SIZE bsize, int plane, RUN_TYPE dry_run,
TRELLIS_OPT_TYPE enable_optimize_b);