diff options
| author | Yaowu Xu <yaowu@google.com> | 2016-01-07 09:43:26 -0800 |
|---|---|---|
| committer | Yaowu Xu <yaowu@google.com> | 2016-01-07 09:53:14 -0800 |
| commit | 9cac17d157804b40d24bb8c23cf56d92ac3c7a35 (patch) | |
| tree | 1751ebfb219cc777347bbc2833f0d09756f3ec2c /vp9 | |
| parent | 650a2d7628169b041cb10fe632e651fb018fb7ed (diff) | |
| download | libvpx-9cac17d157804b40d24bb8c23cf56d92ac3c7a35.tar libvpx-9cac17d157804b40d24bb8c23cf56d92ac3c7a35.tar.gz libvpx-9cac17d157804b40d24bb8c23cf56d92ac3c7a35.tar.bz2 libvpx-9cac17d157804b40d24bb8c23cf56d92ac3c7a35.zip | |
Enable encoder to avoid 8x4 or 4x8 partitions
This commit enables encoder to avoid 8x4 and 4x8 partitions for
scaled reference frames when libvpx is configured and built with
--enable-better-hw-compatibility
Change-Id: I02ad65c386f5855f4325d72570c49164ed52f413
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_pickmode.c | 7 | ||||
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 10 |
2 files changed, 17 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index b929758ca..3f87875cd 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -1855,6 +1855,13 @@ void vp9_pick_inter_mode_sub8x8(VP9_COMP *cpi, MACROBLOCK *x, if (ref_frame_skip_mask & (1 << ref_frame)) continue; +#if CONFIG_BETTER_HW_COMPATIBILITY + if ((bsize == BLOCK_8X4 || bsize == BLOCK_4X8) && + ref_frame > INTRA_FRAME && + vp9_is_scaled(&cm->frame_refs[ref_frame - 1].sf)) + continue; +#endif + // TODO(jingning, agrange): Scaling reference frame not supported for // sub8x8 blocks. Is this supported now? if (ref_frame > INTRA_FRAME && diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 9402a4a2b..b8d17205d 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -3818,6 +3818,16 @@ void vp9_rd_pick_inter_mode_sub8x8(VP9_COMP *cpi, ref_frame = vp9_ref_order[ref_index].ref_frame[0]; second_ref_frame = vp9_ref_order[ref_index].ref_frame[1]; +#if CONFIG_BETTER_HW_COMPATIBILITY + // forbid 8X4 and 4X8 partitions if any reference frame is scaled. + if (bsize == BLOCK_8X4 || bsize == BLOCK_4X8) { + int ref_scaled = vp9_is_scaled(&cm->frame_refs[ref_frame - 1].sf); + if (second_ref_frame > INTRA_FRAME) + ref_scaled += vp9_is_scaled(&cm->frame_refs[second_ref_frame - 1].sf); + if (ref_scaled) + continue; + } +#endif // Look at the reference frame of the best mode so far and set the // skip mask to look at a subset of the remaining modes. if (ref_index > 2 && sf->mode_skip_start < MAX_MODES) { |