From 35fa8e5f9fa4836ec61764de3cbaf49ebf8813d1 Mon Sep 17 00:00:00 2001
From: Monty Montgomery <xiphmont@gmail.com>
Date: Thu, 13 Sep 2018 00:34:19 -0400
Subject: [PATCH] run vertical and horizontal deblocking (almost) concurrently
Improve cache behavior by running vertical and horizontal deblocking in one pass. Horizontal lags one SB behind vertical.
---
src/deblock.rs | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/deblock.rs b/src/deblock.rs
index e1c2b781..203004b3 100644
--- a/src/deblock.rs
+++ b/src/deblock.rs
@@ -462,20 +462,22 @@ pub fn deblock_plane(fi: &FrameInvariants, deblock: &DeblockState, plane: &mut P
}
// filter vertical and horizontal edges by super block.
- // TODO: once it's working, do it in one pass
for row in 0..fb_height {
for col in 0..fb_width {
- let sbo = SuperBlockOffset { x: col, y: row };
// filter vertical edges
- deblock_vertical(fi, deblock, plane, pli, bc, &sbo, bit_depth);
- }
- }
- for row in 0..fb_height {
- for col in 0..fb_width {
- let sbo = SuperBlockOffset { x: col, y: row };
- // filter horizontal edges
- deblock_horizontal(fi, deblock, plane, pli, bc, &sbo, bit_depth);
+ {
+ let sbo = SuperBlockOffset { x: col, y: row };
+ deblock_vertical(fi, deblock, plane, pli, bc, &sbo, bit_depth);
+ }
+ // filter horizontal edges. Filters are ordered, so it's always 1 SB behind.
+ if col > 0 {
+ let sbo = SuperBlockOffset { x: col-1, y: row };
+ deblock_horizontal(fi, deblock, plane, pli, bc, &sbo, bit_depth);
+ }
}
+ // filter last horizontal stragglers.
+ let sbo = SuperBlockOffset { x: fb_width-1, y: row };
+ deblock_horizontal(fi, deblock, plane, pli, bc, &sbo, bit_depth);
}
}
--
GitLab