Remove av1_foreach_transformed_block() function Change-Id: I3fa9d24f2a61dd1b4a234fb1cfea679af06ebdb5
diff --git a/av1/common/blockd.c b/av1/common/blockd.c index b9e5073..46e334d 100644 --- a/av1/common/blockd.c +++ b/av1/common/blockd.c
@@ -191,15 +191,6 @@ } #endif -void av1_foreach_transformed_block(const MACROBLOCKD *const xd, - BLOCK_SIZE bsize, - foreach_transformed_block_visitor visit, - void *arg) { - int plane; - for (plane = 0; plane < MAX_MB_PLANE; ++plane) - av1_foreach_transformed_block_in_plane(xd, bsize, plane, visit, arg); -} - #if !CONFIG_PVQ void av1_set_contexts(const MACROBLOCKD *xd, struct macroblockd_plane *pd, int plane, TX_SIZE tx_size, int has_eob, int aoff,
diff --git a/av1/common/blockd.h b/av1/common/blockd.h index a592d20..436a9f1 100644 --- a/av1/common/blockd.h +++ b/av1/common/blockd.h
@@ -908,11 +908,6 @@ foreach_transformed_block_visitor mi_visit, void *arg); #endif -void av1_foreach_transformed_block(const MACROBLOCKD *const xd, - BLOCK_SIZE bsize, - foreach_transformed_block_visitor visit, - void *arg); - #if CONFIG_COEF_INTERLEAVE static INLINE int get_max_4x4_size(int num_4x4, int mb_to_edge, int subsampling) {
diff --git a/av1/encoder/tokenize.c b/av1/encoder/tokenize.c index c9a6550..dea1a1c 100644 --- a/av1/encoder/tokenize.c +++ b/av1/encoder/tokenize.c
@@ -822,9 +822,15 @@ } #endif } else if (dry_run == DRY_RUN_NORMAL) { - av1_foreach_transformed_block(xd, bsize, set_entropy_context_b, &arg); + int plane; + for (plane = 0; plane < MAX_MB_PLANE; ++plane) + av1_foreach_transformed_block_in_plane(xd, bsize, plane, + set_entropy_context_b, &arg); } else if (dry_run == DRY_RUN_COSTCOEFFS) { - av1_foreach_transformed_block(xd, bsize, cost_coeffs_b, &arg); + int plane; + for (plane = 0; plane < MAX_MB_PLANE; ++plane) + av1_foreach_transformed_block_in_plane(xd, bsize, plane, cost_coeffs_b, + &arg); } #else if (!dry_run) { @@ -870,10 +876,16 @@ (*t)++; } } else if (dry_run == DRY_RUN_NORMAL) { - av1_foreach_transformed_block(xd, bsize, set_entropy_context_b, &arg); + int plane; + for (plane = 0; plane < MAX_MB_PLANE; ++plane) + av1_foreach_transformed_block_in_plane(xd, bsize, plane, + set_entropy_context_b, &arg); *t = t_backup; } else if (dry_run == DRY_RUN_COSTCOEFFS) { - av1_foreach_transformed_block(xd, bsize, cost_coeffs_b, &arg); + int plane; + for (plane = 0; plane < MAX_MB_PLANE; ++plane) + av1_foreach_transformed_block_in_plane(xd, bsize, plane, cost_coeffs_b, + &arg); } if (rate) *rate += arg.this_rate; }