shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Enable encoder to avoid 8x4 or 4x8 partitions"

--- a/vp9/encoder/vp9_pickmode.c

+++ b/vp9/encoder/vp9_pickmode.c

@@ -1858,6 +1858,13 @@

     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 &&

--- a/vp9/encoder/vp9_rdopt.c

+++ b/vp9/encoder/vp9_rdopt.c

@@ -3818,6 +3818,16 @@

     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) {