新渲染系统

.github/workflows/build.yml

@@ -9,6 +9,9 @@ on:
 jobs:
   build:
     runs-on: windows-latest
+    strategy:
+      matrix:
+        platform: ["x64", "ARM64"]
 
     steps:
     - uses: actions/checkout@v4
@@ -24,10 +27,10 @@ jobs:
       uses: actions/cache@v4
       with:
         path: ~/.conan2/p
-        key: ${{ runner.os }}-conan-${{ hashFiles('src/**/conanfile.txt') }}
+        key: Conan-${{ hashFiles('src/**/conanfile.txt') }}-${{ matrix.platform }}
 
     - name: Build
-      run: python publish.py
+      run: python publish.py ${{ matrix.platform }}
 
     - name: Save hash
       id: hash
@@ -36,5 +39,5 @@ jobs:
     - name: Store build
       uses: actions/upload-artifact@v4
       with: 
-          name: Magpie-dev-${{ steps.hash.outputs.sha_short }}
-          path: ./publish
+          name: Magpie-dev-${{ steps.hash.outputs.sha_short }}-${{ matrix.platform }}
+          path: ./publish/${{ matrix.platform }}

.github/workflows/release.yml

@@ -24,9 +24,13 @@ on:
         required: true
         type: boolean
 jobs:
-  release:
+  build:
     runs-on: windows-latest
-
+    outputs:
+      tag: ${{ steps.tag.outputs.tag }}
+    strategy:
+      matrix:
+        platform: ["x64", "ARM64"]
     steps:
     - uses: actions/checkout@v4
 
@@ -42,13 +46,50 @@ jobs:
       with:
         path: ~/.conan2/p
         key: ${{ runner.os }}-conan-${{ hashFiles('src/**/conanfile.txt') }}
+
+    - name: Generate tag
+      id: tag
+      run: |
+        $tag = "${{ inputs.tag }}" -eq "" ? "v${{ inputs.major }}.${{ inputs.minor }}.${{ inputs.patch }}" : "${{ inputs.tag }}"
+        echo "tag=$tag" >> $env:GITHUB_OUTPUT
 
-    - name: Publish release
-      run: python publish.py
+    - name: Build
+      run: python publish.py ${{ matrix.platform }}
       env:
         MAJOR: ${{ inputs.major }}
         MINOR: ${{ inputs.minor }}
         PATCH: ${{ inputs.patch }}
-        TAG: ${{ inputs.tag }}
-        PRERELEASE: ${{ inputs.prerelease }}
-        ACCESS_TOKEN: ${{ secrets.CONTENTS_ACCESS_TOKEN }}
+        TAG: ${{ steps.tag.outputs.tag }}
+
+    - name: Store artifacts
+      uses: actions/upload-artifact@v4
+      with: 
+          name: Magpie-${{ steps.tag.outputs.tag }}-${{ matrix.platform }}
+          path: publish/${{ matrix.platform }}
+  release:
+    runs-on: windows-latest
+    needs: build
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+
+      - name: Setup Requests
+        run: pip install requests
+
+      - name: Restore artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: publish
+
+      - name: Publish release
+        run: python ci/release.py
+        env:
+          MAJOR: ${{ inputs.major }}
+          MINOR: ${{ inputs.minor }}
+          PATCH: ${{ inputs.patch }}
+          TAG: ${{ needs.build.outputs.tag }}
+          PRERELEASE: ${{ inputs.prerelease }}
+          ACCESS_TOKEN: ${{ secrets.CONTENTS_ACCESS_TOKEN }}

Magpie.sln

@@ -24,7 +24,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		src\Common.Pre.props = src\Common.Pre.props
 		Directory.Build.props = Directory.Build.props
 		src\extract_winui_runtime.py = src\extract_winui_runtime.py
-		src\fix_resfiles.py = src\fix_resfiles.py
 		src\HybridCRT.props = src\HybridCRT.props
 		src\WinUI.props = src\WinUI.props
 	EndProjectSection

ci/release.py

@@ -0,0 +1,158 @@
+import sys
+import os
+import subprocess
+import shutil
+import requests
+import hashlib
+import json
+
+try:
+    # https://docs.github.com/en/actions/learn-github-actions/variables
+    if os.environ["GITHUB_ACTIONS"].lower() == "true":
+        # 不知为何在 Github Actions 中运行时默认编码为 ANSI，并且 print 需刷新流才能正常显示
+        for stream in [sys.stdout, sys.stderr]:
+            stream.reconfigure(encoding="utf-8")
+except:
+    pass
+
+majorVersion = os.environ["MAJOR"]
+minorVersion = os.environ["MINOR"]
+patchVersion = os.environ["PATCH"]
+tag = os.environ["TAG"]
+isPrerelease = os.environ["PRERELEASE"].lower() == "true"
+githubAccessToken = os.environ["ACCESS_TOKEN"]
+repo = os.environ["GITHUB_REPOSITORY"]
+actor = os.environ["GITHUB_ACTOR"]
+
+subprocess.run("git config user.name " + actor)
+subprocess.run(f"git config user.email {actor}@users.noreply.github.com")
+
+subprocess.run(
+    f"git remote set-url origin https://{githubAccessToken}@github.com/{repo}.git"
+)
+
+# 打标签
+if subprocess.run(f"git tag -a {tag} -m {tag}").returncode != 0:
+    raise Exception("打标签失败")
+
+if subprocess.run("git push origin " + tag).returncode != 0:
+    raise Exception("推送标签失败")
+
+print("已创建标签 " + tag, flush=True)
+
+headers = {
+    "Accept": "application/vnd.github+json",
+    "Authorization": "Bearer " + githubAccessToken,
+    "X-GitHub-Api-Version": "2022-11-28",
+}
+
+# 获取前一个发布版本来生成默认发行说明
+prevReleaseTag = None
+try:
+    if isPrerelease:
+        # 发布预发行版与最新的版本（无论是正式版还是预发行版）对比
+        response = requests.get(
+            f"https://api.github.com/repos/{repo}/releases",
+            json={"per_page": 1},
+            headers=headers,
+        )
+        if response.ok:
+            prevReleaseTag = response.json()[0]["tag_name"]
+    else:
+        # 发布正式版则与最新的正式版对比
+        # 由于可以自己选择最新版本，此接口可能不会返回时间上最新发布的版本，不是大问题
+        response = requests.get(
+            f"https://api.github.com/repos/{repo}/releases/latest", headers=headers
+        )
+        if response.ok:
+            prevReleaseTag = response.json()["tag_name"]
+except:
+    # 忽略错误
+    pass
+
+# 发布 release
+if prevReleaseTag == None:
+    body = ""
+else:
+    # 默认发行说明为比较两个 tag
+    body = f"https://github.com/{repo}/compare/{prevReleaseTag}...{tag}"
+
+response = requests.post(
+    f"https://api.github.com/repos/{repo}/releases",
+    json={
+        "tag_name": tag,
+        "name": tag,
+        "prerelease": isPrerelease,
+        "body": body,
+        "discussion_category_name": "Announcements",
+    },
+    headers=headers,
+)
+if not response.ok:
+    raise Exception("发布失败")
+
+uploadUrl = response.json()["upload_url"]
+uploadUrl = uploadUrl[: uploadUrl.find("{")] + "?name="
+
+os.chdir(os.path.dirname(__file__) + "\\..\\publish")
+
+pkgInfos = {}
+for platform in ["x64", "ARM64"]:
+    # 打包成 zip
+    pkgName = "Magpie-" + tag + "-" + platform
+    shutil.make_archive(pkgName, "zip", pkgName)
+    pkgName += ".zip"
+
+    # 上传资产
+    with open(pkgName, "rb") as f:
+        # 流式上传
+        # https://requests.readthedocs.io/en/latest/user/advanced/#streaming-uploads
+        response = requests.post(
+            uploadUrl + pkgName,
+            data=f,
+            headers={**headers, "Content-Type": "application/zip"},
+        )
+
+        if not response.ok:
+            raise Exception("上传失败")
+
+        # 计算哈希
+        f.seek(0, os.SEEK_SET)
+        md5 = hashlib.file_digest(f, hashlib.md5).hexdigest()
+
+    pkgInfos[platform] = (pkgName, md5)
+
+print("已发布 " + tag, flush=True)
+
+# 更新 version.json
+# 此步应在发布版本之后，因为程序使用 version.json 检查更新
+os.chdir("..")
+with open("version.json", "w", encoding="utf-8") as f:
+    json.dump(
+        {
+            "version": f"{majorVersion}.{minorVersion}.{patchVersion}",
+            "tag": tag,
+            "binary": {
+                "x64": {
+                    "url": f"https://github.com/{repo}/releases/download/{tag}/{pkgInfos['x64'][0]}",
+                    "hash": pkgInfos["x64"][1],
+                },
+                "ARM64": {
+                    "url": f"https://github.com/{repo}/releases/download/{tag}/{pkgInfos['ARM64'][0]}",
+                    "hash": pkgInfos["ARM64"][1],
+                },
+            },
+        },
+        f,
+        indent=4,
+    )
+
+# 提交对 version.json 的更改
+if subprocess.run("git add version.json").returncode != 0:
+    raise Exception("git add 失败")
+
+if subprocess.run('git commit -m "Update version.json"').returncode != 0:
+    raise Exception("git commit 失败")
+
+if subprocess.run("git push").returncode != 0:
+    raise Exception("git push 失败")

docs/Built-in effects.md

@@ -18,7 +18,7 @@ Magpie ships with a handful of effects that can be used in combinations. Most of
   * Parameter:
     * Strength: Denoise magnitude
 
-* Anime4K_Restore_S, Anime4K_Restore_M, Anime4K_Restore_L, Anime4K_Restore_VL, Anime4K_Restore_UL, Anime4K_Restore_Soft_S, Anime4K_Restore_Soft_M, Anime4K_Restore_Soft_L, Anime4K_Restore_Soft_VL, Anime4K_Restore_Soft_UL: Algorithms to restore the lines in animations. In increasing order of demand for computing power. The Soft variants are more conservative in sharpening.
+* Anime4K_Restore family: Algorithms to restore the lines in animations. In increasing order of demand for computing power. The Soft variants are more conservative in sharpening.
   * Output size: the same as the input
 
 * Anime4K_Thin_HQ: Algorithm to clarify lines in animations provided by Anime4K.
@@ -27,7 +27,7 @@ Magpie ships with a handful of effects that can be used in combinations. Most of
     * Strength: The strength in each iteration.
     * Iterations: The number of iterations. Decreasing strength and increasing iterations improves the quality of the images, but will lower the processing speed.
 
-* Anime4K_Upscale_S, Anime4K_Upscale_L, Anime4K_Upscale_Denoise_S, Anime4K_Upscale_Denoise_L, and Anime4K_Upscale_GAN_x2_S: Anime-style scaling algorithms provided by Anime4K. The denoise variant includes denoise functionality. The GAN variant, which keeps more details, is still under experiment.
+* Anime4K_Upscale family: Anime-style scaling algorithms provided by Anime4K. The denoise variant includes denoise functionality. The GAN variant, which keeps more details, is still under experiment.
   * Output size: twice that of the input
 
 * Bicubic: Interpolation algorithms. The lite variant is fast, but at the cost of quality degradation, Suitable for users will weak graphics cards.
@@ -124,6 +124,9 @@ Magpie ships with a handful of effects that can be used in combinations. Most of
     * Bloom Amount
     * Filter Kernel Shape
 
+* CuNNy family：Suitable for visual novel-style images. The DS variants offer a subtle denoise effect. Provided by [CuNNy](https://github.com/cunnyplapper/CuNNy)
+  * Output size: twice that of the input
+
 * Deband
   * Output size: the same as the input
   * Parameters
@@ -221,7 +224,7 @@ Magpie ships with a handful of effects that can be used in combinations. Most of
     * Sharpness
   * Note: Only supports upscaling.
 
-* NNEDI3_nns16_win8x4 and NNEDI3_nns64_win8x6：These shaders originally designed for deinterlacing and are also high-quality interpolation algorithms. NNEDI3_nns64_win8x6 produces higher quality results, but slower.
+* NNEDI3 family：These shaders originally designed for deinterlacing and are also high-quality interpolation algorithms. NNEDI3_nns64_win8x6 produces higher quality results, but slower.
   * Output size: twice that of the input
 
 * NVSharpen: Port of NVSharpen that was published along with NIS.
@@ -232,10 +235,10 @@ Magpie ships with a handful of effects that can be used in combinations. Most of
 * Pixellate: Scale with the Pixellate algorithm. Suitable for upscaling pixel arts.
   * Output size: determined by scale configuration
 
-* RAVU_Lite_R3: Port of ravu-lite-r3
+* RAVU family: Ported from https://github.com/bjin/mpv-prescalers
   * Output size: twice that of the input
 
-* RAVU_Zoom_R3: Port of ravu-zoom-r3
+* RAVU_Zoom family: Ported from https://github.com/bjin/mpv-prescalers
   * Output size: determined by scale configuration
   * Note: Only supports upscaling.
 

docs/Comparison of capture methods.md

@@ -1,16 +1,14 @@
-Magpie provides several capture methods. They have their pros and cons in different scenarios.
+Magpie provides several capture methods. They have their pros and cons in different scenarios. For general purposes, it's recommended to use Graphics Capture, as it provides the best compatibility and smoothness.
 
 | | Graphics Capture | Desktop Duplication | GDI | DwmSharedSurface |
 | :---: | :---: | :---: | :---: |:---: |
 | Supports DirectComposition (e.g. UWP) | Yes | Yes | No | No |
 | Supports recording/streaming | No under extreme conditions<sup>[1]</sup> | No | Yes | Yes |
 | Support the source window to span multiple screens | No under extreme conditions<sup>[1]</sup> | No | Yes | Yes |
 | Ignores DPI virtualization<sup>[2]</sup> | No | No | Yes| Yes |
-| Notes | The most recommended capture method | Requires Win10 v2004, suitable for games with more static frames<sup>[3]</sup>, could capture pop-ups | | Low VRAM usage |
+| Notes | The most recommended capture method | Requires Win10 v2004 | | Low VRAM usage |
 
 
 [1]: (1) The source window does not support regular window capture. (2) The operating system is Windows 11.
 
 [2]: The system will perform bicubic interpolation upscaling to windows that do not support DPI scaling. The capture methods supporting this options captures the images before such scaling.
-
-[3]: The Desktop Duplication mode effectively reduces the power consumption if there are many static frames.