diff options
| author | Yaowu Xu <yaowu@google.com> | 2016-01-05 20:35:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-01-05 20:35:46 +0000 |
| commit | ce6d3f1de4cf64879d15ebd4a00d59f31d046ccc (patch) | |
| tree | 0227762b2a1fb6e5938494c0227a2ff360cc3d44 /vp9/common | |
| parent | e9e726f744698c16f6b7c6f3d8fd221935f30d9c (diff) | |
| parent | 03a021a6fc22f15b3083d6fa4285dcd9a87fc9cf (diff) | |
| download | libvpx-ce6d3f1de4cf64879d15ebd4a00d59f31d046ccc.tar libvpx-ce6d3f1de4cf64879d15ebd4a00d59f31d046ccc.tar.gz libvpx-ce6d3f1de4cf64879d15ebd4a00d59f31d046ccc.tar.bz2 libvpx-ce6d3f1de4cf64879d15ebd4a00d59f31d046ccc.zip | |
Merge "Assert no 8x4/4x8 partition for scaled references"
Diffstat (limited to 'vp9/common')
| -rw-r--r-- | vp9/common/vp9_reconinter.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/vp9/common/vp9_reconinter.c b/vp9/common/vp9_reconinter.c index d8c14ecc8..3eb19b124 100644 --- a/vp9/common/vp9_reconinter.c +++ b/vp9/common/vp9_reconinter.c @@ -187,6 +187,10 @@ static void build_inter_predictors(MACROBLOCKD *xd, int plane, int block, const int is_scaled = vp9_is_scaled(sf); if (is_scaled) { +#if CONFIG_BETTER_HW_COMPATIBILITY + assert(xd->mi[0]->mbmi.sb_type != BLOCK_4X8 && + xd->mi[0]->mbmi.sb_type != BLOCK_8X4); +#endif // Co-ordinate of containing block to pixel precision. const int x_start = (-xd->mb_to_left_edge >> (3 + pd->subsampling_x)); const int y_start = (-xd->mb_to_top_edge >> (3 + pd->subsampling_y)); |