Commit ab20c98e authored by Alex Converse's avatar Alex Converse

Compute skippable inside the block_rd_txfm loop.

Change-Id: Iaa43aeeb7a2074495e00cdb83bb551c3f13d3ed2
parent c62228f2
...@@ -74,6 +74,7 @@ struct rdcost_block_args { ...@@ -74,6 +74,7 @@ struct rdcost_block_args {
int exit_early; int exit_early;
int use_fast_coef_costing; int use_fast_coef_costing;
const scan_order *so; const scan_order *so;
uint8_t skippable;
}; };
#define LAST_NEW_MV_INDEX 6 #define LAST_NEW_MV_INDEX 6
...@@ -544,6 +545,8 @@ static void block_rd_txfm(int plane, int block, BLOCK_SIZE plane_bsize, ...@@ -544,6 +545,8 @@ static void block_rd_txfm(int plane, int block, BLOCK_SIZE plane_bsize,
args->exit_early = 1; args->exit_early = 1;
return; return;
} }
args->skippable &= !x->plane[plane].eobs[block];
} }
static void txfm_rd_in_plane(MACROBLOCK *x, static void txfm_rd_in_plane(MACROBLOCK *x,
...@@ -559,6 +562,7 @@ static void txfm_rd_in_plane(MACROBLOCK *x, ...@@ -559,6 +562,7 @@ static void txfm_rd_in_plane(MACROBLOCK *x,
args.x = x; args.x = x;
args.best_rd = ref_best_rd; args.best_rd = ref_best_rd;
args.use_fast_coef_costing = use_fast_coef_casting; args.use_fast_coef_costing = use_fast_coef_casting;
args.skippable = 1;
if (plane == 0) if (plane == 0)
xd->mi[0]->mbmi.tx_size = tx_size; xd->mi[0]->mbmi.tx_size = tx_size;
...@@ -578,7 +582,7 @@ static void txfm_rd_in_plane(MACROBLOCK *x, ...@@ -578,7 +582,7 @@ static void txfm_rd_in_plane(MACROBLOCK *x,
*distortion = args.this_dist; *distortion = args.this_dist;
*rate = args.this_rate; *rate = args.this_rate;
*sse = args.this_sse; *sse = args.this_sse;
*skippable = vp9_is_skippable_in_plane(x, bsize, plane); *skippable = args.skippable;
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment