shithub: dav1d

Info  •  Files  •  Log  •  Branches

Fix calculation of unit_idx to identify Av1RestorationUnit

ruy and rux are in unit_size dimensions, whereas lr_mask are in sb128
dimensions, and unit_idx is in sb64 dimensions, so one can't be derived
from the other. Instead, remove ruy/rux and derive unit_idx and sb_idx
directly from the block positions aligned to the unit_size.

--- a/src/lr_apply_tmpl.c

+++ b/src/lr_apply_tmpl.c

@@ -226,13 +226,8 @@

     // with a 4:2:0 chroma subsampling, do we store the filter information at

     // the AV1Filter unit located at (128,128) or (256,256)

     // TODO Support chroma subsampling.

-    const int shift_ver = 7 - ss_ver;

     const int shift_hor = 7 - ss_hor;

-    int ruy = (row_y >> unit_size_log2);

-    // Merge last restoration unit if its height is < half_unit_size

-    if (ruy > 0) ruy -= (ruy << unit_size_log2) + half_unit_size > h;

-

     pixel pre_lr_border[2][128 + 8 /* maximum sbrow height is 128 + 8 rows offset */][4];

     int unit_w = unit_size, bit = 0;

@@ -240,7 +235,13 @@

     enum LrEdgeFlags edges = (y > 0 ? LR_HAVE_TOP : 0) |

                              (row_h < h ? LR_HAVE_BOTTOM : 0);

-    for (int x = 0, rux = 0; x < w; x+= unit_w, rux++, edges |= LR_HAVE_LEFT, bit ^= 1) {

+    int aligned_unit_pos = row_y & ~(unit_size - 1);

+    if (aligned_unit_pos && aligned_unit_pos + half_unit_size > h)

+        aligned_unit_pos -= unit_size;

+    aligned_unit_pos <<= ss_ver;

+    const int sb_idx = (aligned_unit_pos >> 7) * f->sr_sb128w;

+    const int unit_idx = ((aligned_unit_pos >> 6) & 1) << 1;

+    for (int x = 0; x < w; x += unit_w, edges |= LR_HAVE_LEFT, bit ^= 1) {

         // TODO Clean up this if statement.

         if (x + max_unit_size > w) {

             unit_w = w - x;

@@ -251,10 +252,9 @@

         // Based on the position of the restoration unit, find the corresponding

         // AV1Filter unit.

-        const int unit_idx = ((ruy & 16) >> 3) + ((rux & 16) >> 4);

+        const int u_idx = unit_idx + ((x >> (shift_hor - 1)) & 1);

         const Av1RestorationUnit *const lr =

-            &f->lf.lr_mask[(((ruy << (unit_size_log2)) >> shift_ver) * f->sr_sb128w) +

-                           (x >> shift_hor)].lr[plane][unit_idx];

+            &f->lf.lr_mask[sb_idx + (x >> shift_hor)].lr[plane][u_idx];

         // FIXME Don't backup if the next restoration unit is RESTORE_NONE

         // This also requires not restoring in the same conditions.