diff --git a/.gitignore b/.gitignore index f00bd6b..725a2c7 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,10 @@ models/ *.zip *.msi *.userprefs +tmp/ +third_party/Practical-RIFE/ +third_party/rife-ncnn-vulkan/ +third_party/vs-mlrt/ +src/AnimeEnhancer.App/Assets/Beta/faye-cutout.png +src/AnimeEnhancer.App/Assets/Beta/spike-cutout.png +src/AnimeEnhancer.App/Assets/Beta/original-character-source.png diff --git a/Directory.Build.props b/Directory.Build.props index 341bcfc..4a5484a 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -10,9 +10,9 @@ true latest true - 1.0.17 - 1.0.17.0 - 1.0.17.0 + 1.1.0-beta.1 + 1.1.0.0 + 1.1.0.0 picki picki AnimeEnhancer diff --git a/README.md b/README.md index d25b53e..9dfe965 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ AnimeEnhancer also performs actions that heuristic antivirus scanners watch clos Before running the app: 1. Download it only from the [official GitHub Releases page](../../releases/latest). -2. Compare the file's SHA-256 hash with the included `SHA256SUMS.txt`. In PowerShell, run `Get-FileHash .\AnimeEnhancer-1.0.17-win-x64.zip -Algorithm SHA256`. +2. Compare the file's SHA-256 hash with the included `SHA256SUMS.txt`. For the beta ZIP, run `Get-FileHash .\AnimeEnhancer-1.1.0-beta.1-win-x64.zip -Algorithm SHA256` in PowerShell. 3. You can inspect the complete source code here or build it yourself. 4. If the hash matches and SmartScreen shows the blue warning, select **More info**, confirm the publisher is listed as unknown, then choose **Run anyway**. @@ -48,9 +48,15 @@ Do not disable Microsoft Defender or add a broad antivirus exclusion. If Defende Saturation and contrast update live. Stream Cleanup and Smooth Gradients are optional and disabled by default, since they help compressed video but can soften clean sources. Split view makes it easy to compare the original and enhanced image. +## AnimeFlow 60 FPS beta + +The 1.1 beta adds optional RIFE/ncnn Vulkan frame interpolation for NVIDIA RTX systems. AnimeFlow derives presentation timing from the captured video timestamps, skips already-high-frame-rate content automatically, and keeps the normal Anime4K reconstruction path active for interpolated frames. + +AnimeFlow is still experimental. Fast cuts, subtitles, hair, particles, and heavy camera motion can produce temporary warping or uneven motion. Leave it disabled for the most predictable image quality, and please report the source site, GPU, display refresh rate, and a short description of the scene when filing feedback. + ## Lossless Scaling Frame Generation -Version 1.0.17 includes an **LS FrameGen output** mode. It makes AnimeEnhancer's processed output visible to external capture without repeatedly forcing the enhancement overlay above Lossless Scaling or stealing focus from the source video. +AnimeEnhancer includes an **LS FrameGen output** mode. It makes AnimeEnhancer's processed output visible to external capture without repeatedly forcing the enhancement overlay above Lossless Scaling or stealing focus from the source video. 1. Enable **LS FrameGen output** in AnimeEnhancer. 2. Start AnimeEnhancer and wait for the captureable `AnimeEnhancer LS Source` window to appear. @@ -83,7 +89,7 @@ Automatic mode detects fullscreen windows by geometry rather than a browser allo You need the .NET 10 SDK and Git. Clone with submodules, then run: ```powershell -git clone --recurse-submodules https://github.com/yohay2012/AnimeEnhancer.git +git clone --recurse-submodules https://github.com/picki1/AnimeEnhancer.git cd AnimeEnhancer powershell -ExecutionPolicy Bypass -File scripts/bootstrap.ps1 powershell -ExecutionPolicy Bypass -File scripts/build.ps1 diff --git a/docs/SOURCES.md b/docs/SOURCES.md index 5103694..8512557 100644 --- a/docs/SOURCES.md +++ b/docs/SOURCES.md @@ -3,6 +3,9 @@ Retrieval date: 2026-08-01. - Anime4K v4.0.1, commit `4029bf701ecaa15f163cdc49cffe5501c1acf410`, MIT, . Vendored under `third_party/Anime4K`; complete Restore CNN S and Upscale CNN x2 S weights are mechanically translated to HLSL. Official `GLSL_Instructions.md` supplies Mode A/B/C orders. +- rife-ncnn-vulkan by nihui, MIT, . The AnimeFlow native bridge uses its Vulkan/ncnn inference implementation and the bundled RIFE v4.6 model. +- ncnn by Tencent, BSD 3-Clause with bundled third-party notices, . Used by the AnimeFlow native runtime. +- Practical-RIFE by hzwer, MIT, . RIFE architecture and model provenance. - Microsoft Windows.UI.Composition-Win32-Samples, commit `ee50e2ea137dcef7b82ba504eff7435e5ebf5294`, MIT, . Reference-only clone; `BasicCapture.cs` informed WGC lifecycle. No SharpDX dependency or copied implementation. - Vortice.Windows.Samples, commit `c7dd7a7bbf1f71e54698630f8fa5aa27343d9014`, MIT, . Reference-only for current device and swap-chain usage. - Vortice.Direct3D11, Vortice.DXGI, and Vortice.D3DCompiler 3.8.3, MIT, NuGet packages. Binding and shader compiler layer. diff --git a/docs/releases/1.1.0-beta.1.md b/docs/releases/1.1.0-beta.1.md new file mode 100644 index 0000000..df3da19 --- /dev/null +++ b/docs/releases/1.1.0-beta.1.md @@ -0,0 +1,28 @@ +# AnimeEnhancer 1.1.0 Beta 1 + +This is the first public beta of the redesigned AnimeEnhancer interface and the new AnimeFlow motion engine. + +## What's new + +- New compact neon/anime interface with original project artwork +- AnimeFlow 60 FPS experimental RIFE/ncnn Vulkan interpolation for RTX GPUs +- Timestamp-paced presentation to avoid bursts of stale generated frames +- Automatic passthrough for content that is already running at a high frame rate +- Anime4K reconstruction remains active on interpolated frames +- Lower-latency frame queues, scene-cut protection, and adaptive cadence +- GPU selection, saturation, contrast, Stream Cleanup, Smooth Gradients, split view, LS FrameGen output, screenshots, and diagnostics +- Fullscreen side notification, pointer-friendly browser controls, and a visible close control + +## Beta warning + +AnimeFlow is optional and experimental. Fast cuts, subtitles, hair, particles, and complex camera motion can still show temporary warping or uneven pacing. If a scene looks worse, turn AnimeFlow off; the normal Anime4K enhancement path is unchanged. + +Start with a 720p source at minimum. A clean 1080p source gives the best reconstruction. + +## Downloads + +- `AnimeEnhancer-1.1.0-beta.1-win-x64.zip` — portable version; extract and run, no installation required +- `AnimeEnhancer-1.1.0-beta.1-x64.msi` — optional Windows installer +- `SHA256SUMS.txt` — hashes for both packages + +Windows SmartScreen may show an unknown-publisher warning because the binaries are not commercially code-signed. Download only from this repository and verify the SHA-256 hash before running. diff --git a/installer/AnimeEnhancer.Installer.wixproj b/installer/AnimeEnhancer.Installer.wixproj index 7dc3665..8eee49d 100644 --- a/installer/AnimeEnhancer.Installer.wixproj +++ b/installer/AnimeEnhancer.Installer.wixproj @@ -1,4 +1,4 @@ - Packagex64AnimeEnhancer-1.0.17-x64ICE57 - Publish + Packagex64AnimeEnhancer-1.1.0-beta.1-x64ICE57 + Publish diff --git a/installer/Package.wxs b/installer/Package.wxs index 317f799..db5d265 100644 --- a/installer/Package.wxs +++ b/installer/Package.wxs @@ -1,5 +1,5 @@ - + diff --git a/licenses/NCNN-LICENSE.txt b/licenses/NCNN-LICENSE.txt new file mode 100644 index 0000000..2eb0363 --- /dev/null +++ b/licenses/NCNN-LICENSE.txt @@ -0,0 +1,86 @@ +Tencent is pleased to support the open source community by making ncnn available. +Copyright (C) 2017 THL A29 Limited, a Tencent company. All rights reserved. +If you have downloaded a copy of the ncnn binary from Tencent, please note that the ncnn binary is licensed under the BSD 3-Clause License. +If you have downloaded a copy of the ncnn source code from Tencent, please note that ncnn source code is licensed under the BSD 3-Clause License, except for the third-party components listed below which are subject to different license terms. Your integration of ncnn into your own projects may require compliance with the BSD 3-Clause License, as well as the other licenses applicable to the third-party components included within ncnn. +A copy of the BSD 3-Clause License is included in this file. + +Other dependencies and licenses: + +Open Source Software Licensed Under the zlib License: +The below software in this distribution may have been modified by THL A29 Limited (“Tencent Modifications”). All Tencent Modifications are Copyright (C) 2017 THL A29 Limited. +---------------------------------------------------------------------------------------- +1. neon_mathfun.h +Copyright (C) 2011 Julien Pommier + +2. sse_mathfun.h +Copyright (C) 2007 Julien Pommier + +3. avx_mathfun.h +Copyright (C) 2012 Giovanni Garberoglio +Interdisciplinary Laboratory for Computational Science (LISC) +Fondazione Bruno Kessler and University of Trento +via Sommarive, 18 +I-38123 Trento (Italy) + + +Terms of the zlib License: +--------------------------------------------------- +Copyright (c) + +This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. + + + +Open Source Software Licensed Under the BSD 2-Clause License: +The below software in this distribution may have been modified by THL A29 Limited (“Tencent Modifications”). All Tencent Modifications are Copyright (C) 2017 THL A29 Limited. +---------------------------------------------------------------------------------------- +1. squeezenet 1.1 +Copyright (c) 2016 Forrest N. Iandola and Matthew W. Moskewicz and Khalid Ashraf and Song Han and William J. Dally and Kurt Keutzer +All rights reserved. + +2. caffe.proto master +All contributions by the University of California: +Copyright (c) 2014-2017 The Regents of the University of California (Regents) +All rights reserved. + +All other contributions: +Copyright (c) 2014-2017, the respective contributors +All rights reserved. + + +Terms of the BSD 2-Clause License: +-------------------------------------------------------------------- +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + + +Open Source Software Licensed Under the BSD 3-Clause License: +The below software in this distribution may have been modified by THL A29 Limited (“Tencent Modifications”). All Tencent Modifications are Copyright (C) 2017 THL A29 Limited. +---------------------------------------------------------------------------------------- +1. android.toolchain.cmake master +Copyright (c) 2010-2011, Ethan Rublee +Copyright (c) 2011-2014, Andrey Kamaev +All rights reserved. + + +Terms of the BSD 3-Clause License: +-------------------------------------------------------------------- + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. +Neither the name of [copyright holder] nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/licenses/NVIDIA/NOTICE.txt b/licenses/NVIDIA/NOTICE.txt new file mode 100644 index 0000000..f9f2c97 --- /dev/null +++ b/licenses/NVIDIA/NOTICE.txt @@ -0,0 +1,4 @@ +RTX Motion uses NVIDIA Optical Flow FRUC runtime components from the +NVIDIA Optical Flow SDK 5.0.7 under the included NVIDIA DesignWorks SDK license. + +This software contains source code provided by NVIDIA Corporation. diff --git a/licenses/NVIDIA/NVIDIA-DesignWorks-SDK-License.pdf b/licenses/NVIDIA/NVIDIA-DesignWorks-SDK-License.pdf new file mode 100644 index 0000000..af46309 Binary files /dev/null and b/licenses/NVIDIA/NVIDIA-DesignWorks-SDK-License.pdf differ diff --git a/licenses/PRACTICAL-RIFE-LICENSE.txt b/licenses/PRACTICAL-RIFE-LICENSE.txt new file mode 100644 index 0000000..d6c5c55 --- /dev/null +++ b/licenses/PRACTICAL-RIFE-LICENSE.txt @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2021 hzwer + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/licenses/RIFE-NCNN-VULKAN-LICENSE.txt b/licenses/RIFE-NCNN-VULKAN-LICENSE.txt new file mode 100644 index 0000000..21c2dd1 --- /dev/null +++ b/licenses/RIFE-NCNN-VULKAN-LICENSE.txt @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2020 nihui + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/licenses/THIRD-PARTY-NOTICES.md b/licenses/THIRD-PARTY-NOTICES.md index 143ac0c..8044d37 100644 --- a/licenses/THIRD-PARTY-NOTICES.md +++ b/licenses/THIRD-PARTY-NOTICES.md @@ -2,4 +2,4 @@ AnimeEnhancer's original application code, interface, branding, and packaging are Copyright © 2026 picki. All rights reserved. The following third-party components are not owned by picki and retain their original licenses. -Anime4K is MIT licensed by bloc97 and contributors. Vortice.Windows is MIT licensed by Amer Koleci and contributors. The Microsoft composition samples are MIT licensed. Serilog is Apache-2.0 licensed. See NuGet packages and `docs/SOURCES.md` for exact versions. +Anime4K is MIT licensed by bloc97 and contributors. rife-ncnn-vulkan is MIT licensed by nihui. Practical-RIFE is MIT licensed by hzwer. ncnn is BSD 3-Clause licensed by Tencent and includes additional third-party notices. Vortice.Windows is MIT licensed by Amer Koleci and contributors. The Microsoft composition samples are MIT licensed. Serilog is Apache-2.0 licensed. See NuGet packages, the license files in this directory, and `docs/SOURCES.md` for exact sources. diff --git a/native/AnimeFlow/README.md b/native/AnimeFlow/README.md new file mode 100644 index 0000000..3ea2455 --- /dev/null +++ b/native/AnimeFlow/README.md @@ -0,0 +1,7 @@ +# AnimeFlow native bridge + +`rife_native.cpp` is the small C ABI used by `RifeMotionEngine.cs`. The release DLL is built against the official [rife-ncnn-vulkan](https://github.com/nihui/rife-ncnn-vulkan) source with its recursive ncnn dependencies and Vulkan enabled. + +To reproduce the native DLL, clone rife-ncnn-vulkan recursively, copy `rife_native.cpp` into its `src` directory, and add a shared-library target containing `rife_native.cpp`, `rife.cpp`, and `warp.cpp`, linked to the same libraries as the upstream executable. The shipped model directory is `rife-v4.6`. + +The native runtime and model remain subject to their original third-party licenses; see `licenses/` and `docs/SOURCES.md`. diff --git a/native/AnimeFlow/rife_native.cpp b/native/AnimeFlow/rife_native.cpp new file mode 100644 index 0000000..4c3ae97 --- /dev/null +++ b/native/AnimeFlow/rife_native.cpp @@ -0,0 +1,92 @@ +#include "rife.h" +#include "net.h" + +#include +#include +#include + +namespace +{ + struct RifeHandle + { + explicit RifeHandle(int gpu) : engine(gpu, false, false, false, 1, false, true) {} + RIFE engine; + }; + + std::atomic handle_count{0}; +} + +extern "C" __declspec(dllexport) void* __cdecl rife_create(int gpu_id, const wchar_t* model_directory) +{ + if (!model_directory) return nullptr; + if (handle_count.fetch_add(1) == 0) ncnn::create_gpu_instance(); + + RifeHandle* handle = new (std::nothrow) RifeHandle(gpu_id); + if (!handle || handle->engine.load(model_directory) != 0) + { + delete handle; + if (handle_count.fetch_sub(1) == 1) ncnn::destroy_gpu_instance(); + return nullptr; + } + return handle; +} + +extern "C" __declspec(dllexport) int __cdecl rife_default_gpu() +{ + ncnn::create_gpu_instance(); + const int result = ncnn::get_default_gpu_index(); + if (handle_count.load() == 0) ncnn::destroy_gpu_instance(); + return result; +} + +extern "C" __declspec(dllexport) int __cdecl rife_process_bgra( + void* opaque, + const unsigned char* first, + const unsigned char* second, + int width, + int height, + int input_stride, + float timestep, + unsigned char* output, + int output_stride) +{ + if (!opaque || !first || !second || !output || width <= 0 || height <= 0) return -1; + auto* handle = static_cast(opaque); + std::vector bgr0((size_t)width * height * 3); + std::vector bgr1((size_t)width * height * 3); + for (int y = 0; y < height; y++) + { + const unsigned char* row0 = first + (size_t)y * input_stride; + const unsigned char* row1 = second + (size_t)y * input_stride; + unsigned char* dst0 = bgr0.data() + (size_t)y * width * 3; + unsigned char* dst1 = bgr1.data() + (size_t)y * width * 3; + for (int x = 0; x < width; x++) + { + dst0[x * 3] = row0[x * 4]; dst0[x * 3 + 1] = row0[x * 4 + 1]; dst0[x * 3 + 2] = row0[x * 4 + 2]; + dst1[x * 3] = row1[x * 4]; dst1[x * 3 + 1] = row1[x * 4 + 1]; dst1[x * 3 + 2] = row1[x * 4 + 2]; + } + } + ncnn::Mat frame0(width, height, bgr0.data(), (size_t)3, 3); + ncnn::Mat frame1(width, height, bgr1.data(), (size_t)3, 3); + ncnn::Mat interpolated(width, height, (size_t)3, 3); + const int result = handle->engine.process_v4(frame0, frame1, timestep, interpolated); + if (result != 0 || interpolated.empty()) return result != 0 ? result : -2; + const unsigned char* bgr = static_cast(interpolated.data); + for (int y = 0; y < height; y++) + { + const unsigned char* src = bgr + (size_t)y * width * 3; + unsigned char* dst = output + (size_t)y * output_stride; + for (int x = 0; x < width; x++) + { + dst[x * 4] = src[x * 3]; dst[x * 4 + 1] = src[x * 3 + 1]; dst[x * 4 + 2] = src[x * 3 + 2]; dst[x * 4 + 3] = 255; + } + } + return 0; +} + +extern "C" __declspec(dllexport) void __cdecl rife_destroy(void* opaque) +{ + if (!opaque) return; + delete static_cast(opaque); + if (handle_count.fetch_sub(1) == 1) ncnn::destroy_gpu_instance(); +} diff --git a/scripts/package.ps1 b/scripts/package.ps1 index 9ff0a75..413e764 100644 --- a/scripts/package.ps1 +++ b/scripts/package.ps1 @@ -1,14 +1,14 @@ $ErrorActionPreference='Stop';$root=Split-Path $PSScriptRoot -Parent;& (Join-Path $PSScriptRoot 'publish.ps1');if($LASTEXITCODE){exit $LASTEXITCODE} -$portable=Join-Path $root 'artifacts\portable\AnimeEnhancer-1.0.17';$zip=Join-Path $root 'artifacts\portable\AnimeEnhancer-1.0.17-win-x64.zip';if(Test-Path $zip){Remove-Item -LiteralPath $zip -Force};Compress-Archive -Path "$portable\*" -DestinationPath $zip +$portable=Join-Path $root 'artifacts\portable\AnimeEnhancer-1.1.0-beta.1';$zip=Join-Path $root 'artifacts\portable\AnimeEnhancer-1.1.0-beta.1-win-x64.zip';if(Test-Path $zip){Remove-Item -LiteralPath $zip -Force};Compress-Archive -Path "$portable\*" -DestinationPath $zip $checks=Join-Path $root 'artifacts\checksums';New-Item -ItemType Directory -Force $checks|Out-Null;(Get-FileHash $zip -Algorithm SHA256).Hash.ToLower()+" "+(Split-Path $zip -Leaf)|Set-Content (Join-Path $checks 'SHA256SUMS.txt') -$manifest=[ordered]@{version='1.0.17';runtime='win-x64';framework='net10.0-windows10.0.26100.0';minimumWindows='10.0.19041.0';created=(Get-Date).ToUniversalTime().ToString('o')};$manifest|ConvertTo-Json|Set-Content (Join-Path $checks 'version.json') +$manifest=[ordered]@{version='1.1.0-beta.1';runtime='win-x64';framework='net10.0-windows10.0.26100.0';minimumWindows='10.0.19041.0';created=(Get-Date).ToUniversalTime().ToString('o')};$manifest|ConvertTo-Json|Set-Content (Join-Path $checks 'version.json') $dotnet=Get-Command dotnet -ErrorAction SilentlyContinue if(-not $dotnet){$workspace=Split-Path (Split-Path $root -Parent) -Parent;$dotnet=Join-Path $workspace 'work\.dotnet\dotnet.exe'} $installerOut=Join-Path $root 'artifacts\installer';New-Item -ItemType Directory -Force $installerOut|Out-Null & $dotnet build (Join-Path $root 'installer\AnimeEnhancer.Installer.wixproj') -c Release if($LASTEXITCODE){throw 'Installer build failed.'} $builtMsi=Get-ChildItem (Join-Path $root 'installer') -Recurse -Filter *.msi|Where-Object Name -NotLike '*_validate.msi'|Sort-Object LastWriteTime -Descending|Select-Object -First 1;if(-not $builtMsi){throw 'Installer MSI was not produced.'} -$msiPath=Join-Path $installerOut 'AnimeEnhancer-1.0.17-x64.msi';$copied=$false +$msiPath=Join-Path $installerOut 'AnimeEnhancer-1.1.0-beta.1-x64.msi';$copied=$false for($attempt=0;$attempt -lt 20 -and -not $copied;$attempt++){try{Copy-Item $builtMsi.FullName $msiPath -Force;$copied=$true}catch{Start-Sleep -Milliseconds 250}} if(-not $copied){throw 'Installer MSI remained locked after build.'};$msi=Get-Item $msiPath $msiLine=(Get-FileHash $msi.FullName -Algorithm SHA256).Hash.ToLower()+" "+$msi.Name;Add-Content -LiteralPath (Join-Path $checks 'SHA256SUMS.txt') -Value $msiLine diff --git a/scripts/publish.ps1 b/scripts/publish.ps1 index 562be9c..0fd835a 100644 --- a/scripts/publish.ps1 +++ b/scripts/publish.ps1 @@ -1,5 +1,5 @@ $ErrorActionPreference='Stop';$root=Split-Path $PSScriptRoot -Parent;$dotnet=Get-Command dotnet -ErrorAction SilentlyContinue;if(-not $dotnet){$workspace=Split-Path (Split-Path $root -Parent) -Parent;$dotnet=Join-Path $workspace 'work\.dotnet\dotnet.exe'} & (Join-Path $PSScriptRoot 'build.ps1') -Configuration Release;if($LASTEXITCODE){exit $LASTEXITCODE} -$out=Join-Path $root 'artifacts\portable\AnimeEnhancer-1.0.17';New-Item -ItemType Directory -Force $out|Out-Null +$out=Join-Path $root 'artifacts\portable\AnimeEnhancer-1.1.0-beta.1';New-Item -ItemType Directory -Force $out|Out-Null & $dotnet publish (Join-Path $root 'src\AnimeEnhancer.App\AnimeEnhancer.App.csproj') -c Release -r win-x64 --self-contained true -o $out --no-build if($LASTEXITCODE){exit $LASTEXITCODE} diff --git a/scripts/verify-release.ps1 b/scripts/verify-release.ps1 index d054615..6354d75 100644 --- a/scripts/verify-release.ps1 +++ b/scripts/verify-release.ps1 @@ -1,5 +1,5 @@ -$ErrorActionPreference='Stop';$root=Split-Path $PSScriptRoot -Parent;$p=Join-Path $root 'artifacts\portable\AnimeEnhancer-1.0.17' -$required=@('AnimeEnhancer.exe','AnimeEnhancer.dll','Vortice.Direct3D11.dll','Vortice.DXGI.dll','shaders\shaders.json','licenses\Anime4K-LICENSE.txt','docs\PRIVACY.md') +$ErrorActionPreference='Stop';$root=Split-Path $PSScriptRoot -Parent;$p=Join-Path $root 'artifacts\portable\AnimeEnhancer-1.1.0-beta.1' +$required=@('AnimeEnhancer.exe','AnimeEnhancer.dll','animeflow-rife.dll','AnimeFlow\rife-v4.6\flownet.bin','Vortice.Direct3D11.dll','Vortice.DXGI.dll','shaders\shaders.json','licenses\Anime4K-LICENSE.txt','licenses\RIFE-NCNN-VULKAN-LICENSE.txt','licenses\NCNN-LICENSE.txt','docs\PRIVACY.md') foreach($f in $required){if(-not(Test-Path (Join-Path $p $f))){throw "Missing release file: $f"}} if(Get-ChildItem $p -Recurse -Directory|Where-Object Name -eq '.reference'){throw '.reference was packaged'} $manifest=Get-Content (Join-Path $p 'shaders\shaders.json') -Raw|ConvertFrom-Json;foreach($s in $manifest.shaders){if(-not(Test-Path (Join-Path $p ('shaders\'+$s.bytecodeFile)))){throw "Missing shader bytecode: $($s.bytecodeFile)"}} diff --git a/shaders/Presentation/Copy.hlsl b/shaders/Presentation/Copy.hlsl new file mode 100644 index 0000000..2d44045 --- /dev/null +++ b/shaders/Presentation/Copy.hlsl @@ -0,0 +1,8 @@ +struct VSOutput { float4 Position : SV_Position; float2 UV : TEXCOORD0; }; +Texture2D SourceTexture : register(t0); +SamplerState LinearSampler : register(s0); + +float4 PSMain(VSOutput input) : SV_Target +{ + return SourceTexture.SampleLevel(LinearSampler, input.UV, 0); +} diff --git a/shaders/Presentation/MotionStabilize.hlsl b/shaders/Presentation/MotionStabilize.hlsl new file mode 100644 index 0000000..8536c26 --- /dev/null +++ b/shaders/Presentation/MotionStabilize.hlsl @@ -0,0 +1,63 @@ +struct VSOutput { float4 Position : SV_Position; float2 UV : TEXCOORD0; }; +Texture2D MotionFrame : register(t0); +Texture2D RealFrame : register(t1); +SamplerState LinearSampler : register(s0); + +cbuffer Params : register(b0) +{ + float2 SourceSize; + float2 OutputSize; + float Strength; + float Split; + uint Comparison; + float Saturation; + float Contrast; + float3 Padding; +}; + +float Luma(float3 color) { return dot(color, float3(0.2126, 0.7152, 0.0722)); } +float MaxChannel(float3 value) { return max(value.r, max(value.g, value.b)); } + +float4 PSMain(VSOutput input) : SV_Target +{ + float2 px = 1.0 / SourceSize; + float3 generated = MotionFrame.SampleLevel(LinearSampler, input.UV, 0).rgb; + float3 generatedNorth = MotionFrame.SampleLevel(LinearSampler, input.UV + float2(0, -px.y), 0).rgb; + float3 generatedSouth = MotionFrame.SampleLevel(LinearSampler, input.UV + float2(0, px.y), 0).rgb; + float3 generatedEast = MotionFrame.SampleLevel(LinearSampler, input.UV + float2(px.x, 0), 0).rgb; + float3 generatedWest = MotionFrame.SampleLevel(LinearSampler, input.UV + float2(-px.x, 0), 0).rgb; + float3 real = RealFrame.SampleLevel(LinearSampler, input.UV, 0).rgb; + float3 north = RealFrame.SampleLevel(LinearSampler, input.UV + float2(0, -px.y), 0).rgb; + float3 south = RealFrame.SampleLevel(LinearSampler, input.UV + float2(0, px.y), 0).rgb; + float3 east = RealFrame.SampleLevel(LinearSampler, input.UV + float2(px.x, 0), 0).rgb; + float3 west = RealFrame.SampleLevel(LinearSampler, input.UV + float2(-px.x, 0), 0).rgb; + + float3 localMin = min(real, min(min(north, south), min(east, west))); + float3 localMax = max(real, max(max(north, south), max(east, west))); + float realEdge = max(max(abs(Luma(north) - Luma(south)), abs(Luma(east) - Luma(west))), + max(abs(Luma(real) - Luma(north)), abs(Luma(real) - Luma(east)))); + float generatedEdge = max(max(abs(Luma(generatedNorth) - Luma(generatedSouth)), abs(Luma(generatedEast) - Luma(generatedWest))), + max(abs(Luma(generated) - Luma(generatedNorth)), abs(Luma(generated) - Luma(generatedEast)))); + float disagreement = MaxChannel(abs(generated - real)); + + // Large disagreement is normal on moving fills, but disagreement directly + // on strong anime line art is where FRUC produces curls, tears and text + // fragments. Clamp only those suspicious pixels to the real-frame + // neighbourhood and retain most of the interpolated motion everywhere else. + float lineDisagreement = smoothstep(0.08, 0.28, disagreement) * smoothstep(0.018, 0.11, realEdge); + float edgeMismatch = smoothstep(0.025, 0.14, abs(generatedEdge - realEdge)); + float inventedTexture = smoothstep(0.025, 0.12, generatedEdge - realEdge) * smoothstep(0.045, 0.24, disagreement); + float suspicious = saturate(lineDisagreement + edgeMismatch * 0.72 + inventedTexture * 0.92); + float room = lerp(0.075, 0.035, smoothstep(0.02, 0.14, realEdge)); + float3 bounded = clamp(generated, localMin - room, localMax + room); + float3 stable = lerp(generated, bounded, suspicious * 0.94); + stable = lerp(stable, real, suspicious * 0.30); + + // FRUC's warp can soften otherwise-correct lines slightly. A restrained + // edge-only correction keeps generated and real frames equally crisp. + float3 neighbourhood = (north + south + east + west) * 0.25; + float3 detail = real - neighbourhood; + stable += detail * (0.10 * smoothstep(0.02, 0.12, realEdge) * (1.0 - suspicious)); + + return float4(saturate(stable), 1.0); +} diff --git a/src/AnimeEnhancer.App/AnimeEnhancer.App.csproj b/src/AnimeEnhancer.App/AnimeEnhancer.App.csproj index 73e8b13..c2039a8 100644 --- a/src/AnimeEnhancer.App/AnimeEnhancer.App.csproj +++ b/src/AnimeEnhancer.App/AnimeEnhancer.App.csproj @@ -7,6 +7,7 @@ + @@ -19,4 +20,10 @@ + + + + + + diff --git a/src/AnimeEnhancer.App/App.xaml b/src/AnimeEnhancer.App/App.xaml index eabd6d5..678c703 100644 --- a/src/AnimeEnhancer.App/App.xaml +++ b/src/AnimeEnhancer.App/App.xaml @@ -1,13 +1,19 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/src/AnimeEnhancer.App/App.xaml.cs b/src/AnimeEnhancer.App/App.xaml.cs index a803103..14181df 100644 --- a/src/AnimeEnhancer.App/App.xaml.cs +++ b/src/AnimeEnhancer.App/App.xaml.cs @@ -13,7 +13,7 @@ protected override void OnStartup(StartupEventArgs e) var otherCopies = Process.GetProcessesByName("AnimeEnhancer").Count(p => p.Id != Environment.ProcessId); if (!ownsMutex || otherCopies > 0) { - System.Windows.MessageBox.Show($"AnimeEnhancer found {Math.Max(1, otherCopies)} other running copy/copies.\n\nExit every old copy from the tray icon, then start AnimeEnhancer 1.0.17 again. Multiple capture overlays cannot run together.", "Close old AnimeEnhancer copies", MessageBoxButton.OK, MessageBoxImage.Warning); + System.Windows.MessageBox.Show($"AnimeEnhancer found {Math.Max(1, otherCopies)} other running copy/copies.\n\nExit every old copy from the tray icon, then start AnimeEnhancer 1.1 Beta again. Multiple capture overlays cannot run together.", "Close old AnimeEnhancer copies", MessageBoxButton.OK, MessageBoxImage.Warning); Shutdown(); return; } LocalLog.Initialize(); DispatcherUnhandledException += (_, a) => { Log.Fatal(a.Exception, "Unhandled UI exception"); System.Windows.MessageBox.Show(a.Exception.Message, "AnimeEnhancer error"); a.Handled = true; }; diff --git a/src/AnimeEnhancer.App/Assets/Beta/original-character.png b/src/AnimeEnhancer.App/Assets/Beta/original-character.png new file mode 100644 index 0000000..91ba7d9 Binary files /dev/null and b/src/AnimeEnhancer.App/Assets/Beta/original-character.png differ diff --git a/src/AnimeEnhancer.App/MainWindow.xaml b/src/AnimeEnhancer.App/MainWindow.xaml index 961e38c..673dc34 100644 --- a/src/AnimeEnhancer.App/MainWindow.xaml +++ b/src/AnimeEnhancer.App/MainWindow.xaml @@ -1,29 +1,41 @@ - - + + + + + + + + + + + + + + - - - - + + + + - + - + -