Commit 2e45ce14 authored by Ronald S. Bultje's avatar Ronald S. Bultje

vp10: update assertion/allocation for tokens.

We only write EOSB tokens if we write tokens (i.e. not for skip blocks),
and we write EOSB tokens per-plane instead of per block.

Change-Id: I8d7ee99f8ec50eb7ae809f9f9282c1c91dbf6537
parent ba7ea445
......@@ -2423,7 +2423,7 @@ static void rd_pick_partition(VP10_COMP *cpi, ThreadData *td,
}
if (bsize == BLOCK_64X64) {
assert(tp_orig < *tp);
assert(tp_orig < *tp || (tp_orig == *tp && xd->mi[0]->mbmi.skip));
assert(best_rdc.rate < INT_MAX);
assert(best_rdc.dist < INT64_MAX);
} else {
......
......@@ -572,8 +572,8 @@ static INLINE int get_token_alloc(int mb_rows, int mb_cols) {
// 32x32 transform crossing a boundary at a multiple of 16.
// mb_rows, cols are in units of 16 pixels. We assume 3 planes all at full
// resolution. We assume up to 1 token per pixel, and then allow
// a head room of 4.
return mb_rows * mb_cols * (16 * 16 * 3 + 4);
// a head room of 1 EOSB token per 8x8 block per plane.
return mb_rows * mb_cols * (16 * 16 + 4) * 3;
}
// Get the allocated token size for a tile. It does the same calculation as in
......
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