commit 88039f0202896a19daead637137dd27e8ff7972f
author Yaowu Xu <yaowu@google.com> Fri Jan 03 12:09:18 2020 -0800
committer Yaowu Xu <yaowu@google.com> Sat Jan 04 00:21:11 2020 +0000
tree fd491e0757319bfe82a890a440e69a4cba6e53c8
parent f3dba2cf09c0fce7daddf5af25be42bd641b29a5

Inline a small function to reduce indirection

Change-Id: I66fcb751b5c3203c383980f4067288f24ddf2e37

av1/encoder/encodemb.c

diff --git a/av1/encoder/encodemb.c b/av1/encoder/encodemb.c
index bca261e..ac586fe 100644
--- a/av1/encoder/encodemb.c
+++ b/av1/encoder/encodemb.c
@@ -408,23 +408,6 @@
   }
 }
 
-void av1_foreach_transformed_block(const MACROBLOCKD *const xd,
-                                   BLOCK_SIZE bsize,
-                                   foreach_transformed_block_visitor visit,
-                                   void *arg, const int num_planes) {
-  for (int plane = 0; plane < num_planes; ++plane) {
-    const struct macroblockd_plane *const pd = &xd->plane[plane];
-    const int ss_x = pd->subsampling_x;
-    const int ss_y = pd->subsampling_y;
-    if (plane &&
-        !is_chroma_reference(xd->mi_row, xd->mi_col, bsize, ss_x, ss_y)) {
-      continue;
-    }
-    const BLOCK_SIZE plane_bsize = get_plane_block_size(bsize, ss_x, ss_y);
-    av1_foreach_transformed_block_in_plane(xd, plane_bsize, plane, visit, arg);
-  }
-}
-
 typedef struct encode_block_pass1_args {
   AV1_COMMON *cm;
   MACROBLOCK *x;

av1/encoder/encodemb.h

diff --git a/av1/encoder/encodemb.h b/av1/encoder/encodemb.h
index 37c8201..8a5188b 100644
--- a/av1/encoder/encodemb.h
+++ b/av1/encoder/encodemb.h
@@ -52,11 +52,6 @@
     const MACROBLOCKD *const xd, BLOCK_SIZE plane_bsize, int plane,
     foreach_transformed_block_visitor visit, void *arg);
 
-void av1_foreach_transformed_block(const MACROBLOCKD *const xd,
-                                   BLOCK_SIZE bsize,
-                                   foreach_transformed_block_visitor visit,
-                                   void *arg, const int num_planes);
-
 void av1_encode_sby_pass1(AV1_COMMON *cm, MACROBLOCK *x, BLOCK_SIZE bsize);
 
 void av1_setup_xform(const AV1_COMMON *cm, MACROBLOCK *x, TX_SIZE tx_size,

av1/encoder/encodetxb.c

diff --git a/av1/encoder/encodetxb.c b/av1/encoder/encodetxb.c
index 611bcd4..223a793 100644
--- a/av1/encoder/encodetxb.c
+++ b/av1/encoder/encodetxb.c
@@ -2141,8 +2141,19 @@
     av1_reset_skip_context(xd, bsize, num_planes);
     return;
   }
-  av1_foreach_transformed_block(xd, bsize, av1_update_and_record_txb_context,
-                                &arg, num_planes);
+
+  for (int plane = 0; plane < num_planes; ++plane) {
+    const struct macroblockd_plane *const pd = &xd->plane[plane];
+    const int ss_x = pd->subsampling_x;
+    const int ss_y = pd->subsampling_y;
+    if (plane &&
+        !is_chroma_reference(xd->mi_row, xd->mi_col, bsize, ss_x, ss_y)) {
+      continue;
+    }
+    const BLOCK_SIZE plane_bsize = get_plane_block_size(bsize, ss_x, ss_y);
+    av1_foreach_transformed_block_in_plane(
+        xd, plane_bsize, plane, av1_update_and_record_txb_context, &arg);
+  }
 }
 
 CB_COEFF_BUFFER *av1_get_cb_coeff_buffer(const struct AV1_COMP *cpi, int mi_row,