{source, rtc_source, cpu_source}/source.cpp: fix temporal padding for…

… `VAggregate()` related issue: WolframRhodium/VapourSynth-WNNM#4
WolframRhodium · Jul 15, 2022 · c15ec0d · c15ec0d
1 parent b489dcb
commit c15ec0d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/cpu_source/source.cpp b/cpu_source/source.cpp
@@ -1522,7 +1522,11 @@ static const VSFrameRef *VS_CC VAggregateGetFrame(
                     memset(buffer, 0, 2 * plane_width * sizeof(float));
                     for (int i = 0; i < 2 * d->radius + 1; ++i) {
                         auto agg_src = srcps[i];
-                        agg_src += ((2 * d->radius - i) * 2 * plane_height + y) * plane_stride;
+                        // bm3d.VAggregate implements zero padding in temporal dimension
+                        // here we implements replication padding
+                        agg_src += (
+                            std::clamp(2 * d->radius - i, n - d->src_vi->numFrames + 1 + d->radius, n + d->radius)
+                            * 2 * plane_height + y) * plane_stride;
                         for (int x = 0; x < plane_width; ++x) {
                             buffer[x] += agg_src[x];
                         }

diff --git a/rtc_source/source.cpp b/rtc_source/source.cpp
@@ -1193,7 +1193,11 @@ static const VSFrameRef *VS_CC VAggregateGetFrame(
                     memset(buffer, 0, 2 * plane_width * sizeof(float));
                     for (int i = 0; i < 2 * d->radius + 1; ++i) {
                         auto agg_src = srcps[i];
-                        agg_src += ((2 * d->radius - i) * 2 * plane_height + y) * plane_stride;
+                        // bm3d.VAggregate implements zero padding in temporal dimension
+                        // here we implements replication padding
+                        agg_src += (
+                            std::clamp(2 * d->radius - i, n - d->src_vi->numFrames + 1 + d->radius, n + d->radius)
+                            * 2 * plane_height + y) * plane_stride;
                         for (int x = 0; x < plane_width; ++x) {
                             buffer[x] += agg_src[x];
                         }

diff --git a/source/source.cpp b/source/source.cpp
@@ -830,7 +830,11 @@ static const VSFrameRef *VS_CC VAggregateGetFrame(
                     memset(buffer, 0, 2 * plane_width * sizeof(float));
                     for (int i = 0; i < 2 * d->radius + 1; ++i) {
                         const float * agg_src = srcps[i];
-                        agg_src += ((2 * d->radius - i) * 2 * plane_height + y) * plane_stride;
+                        // bm3d.VAggregate implements zero padding in temporal dimension
+                        // here we implements replication padding
+                        agg_src += (
+                            std::clamp(2 * d->radius - i, n - d->src_vi->numFrames + 1 + d->radius, n + d->radius)
+                            * 2 * plane_height + y) * plane_stride;
                         for (int x = 0; x < plane_width; ++x) {
                             buffer[x] += agg_src[x];
                         }