restore color range detection, update velopack

the-database · Feb 26, 2024 · 8ac6be7 · 8ac6be7
1 parent 4cfbd02
commit 8ac6be7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/AnimeJaNaiConverterGui/AnimeJaNaiConverterGui.csproj b/AnimeJaNaiConverterGui/AnimeJaNaiConverterGui.csproj
@@ -6,7 +6,7 @@
     <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
-    <Version>0.0.6</Version>
+    <Version>0.0.7</Version>
     <Title>AnimeJaNaiConverterGui</Title>
     <PackageIcon>logo.png</PackageIcon>
     <ApplicationIcon>Assets\logo.ico</ApplicationIcon>
@@ -44,7 +44,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Salaros.ConfigParser" Version="0.3.8" />
     <PackageReference Include="SharpCompress" Version="0.36.0" />
-    <PackageReference Include="Velopack" Version="0.0.332" />
+    <PackageReference Include="Velopack" Version="0.0.340" />
   </ItemGroup>
 
 
@@ -54,6 +54,9 @@
 
 
   <ItemGroup>
+    <None Update="appstate - Copy.json">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </None>
     <None Update="appstate.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

diff --git a/AnimeJaNaiConverterGui/mpv-upscale-2x_animejanai/animejanai/core/animejanai_core.py b/AnimeJaNaiConverterGui/mpv-upscale-2x_animejanai/animejanai/core/animejanai_core.py
@@ -189,10 +189,10 @@ def run_animejanai(clip, container_fps, chain_conf, backend):
     models = chain_conf.get('models', [])
     colorspace = "709"
     colorlv = 1
-    # try:
-    #     colorlv = clip.get_frame(0).props._ColorRange
-    # except AttributeError:
-    #     pass
+    try:
+        colorlv = clip.get_frame(0).props._ColorRange
+    except AttributeError:
+        pass
     fmt_in = clip.format.id
 
     if len(models) > 0:

diff --git a/AnimeJaNaiConverterGui/mpv-upscale-2x_animejanai/animejanai/core/rife_cuda.py b/AnimeJaNaiConverterGui/mpv-upscale-2x_animejanai/animejanai/core/rife_cuda.py
@@ -110,11 +110,10 @@ def rife(
     w_in, h_in = input.width, input.height
     size_in = w_in * h_in
     colorlv = 1
-    # TODO
-    # try:
-    #     colorlv = getattr(input.get_frame(0).props, "_ColorRange", 0)
-    # except:
-    #     pass
+    try:
+        colorlv = getattr(input.get_frame(0).props, "_ColorRange", 0)
+    except:
+        pass
     fmt_in = input.format.id
     fps_factor = fps_num / fps_den