diff options
Diffstat (limited to 'vp10')
| -rw-r--r-- | vp10/encoder/encodeframe.c | 2 | ||||
| -rw-r--r-- | vp10/encoder/encoder.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vp10/encoder/encodeframe.c b/vp10/encoder/encodeframe.c index ce1530c63..31a2a268f 100644 --- a/vp10/encoder/encodeframe.c +++ b/vp10/encoder/encodeframe.c @@ -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 { diff --git a/vp10/encoder/encoder.h b/vp10/encoder/encoder.h index 6f3f7113c..2bf0be367 100644 --- a/vp10/encoder/encoder.h +++ b/vp10/encoder/encoder.h @@ -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 |