Ver código fonte

WebM: Disable SIMD optimization with YASM on Windows

It triggers a crash when playing V9 videos.

Could likely be fixed if anyone wants to work on it, but so far nobody seems to
want to and WebM support is dropped in 4.0, so this workaround should help for
now.

Fixes #50862.
Rémi Verschelde 3 anos atrás
pai
commit
89076410de
1 arquivos alterados com 2 adições e 2 exclusões
  1. 2 2
      modules/webm/libvpx/SCsub

+ 2 - 2
modules/webm/libvpx/SCsub

@@ -224,7 +224,7 @@ if env["platform"] == "uwp":
         webm_cpu_arm = True
         webm_cpu_arm = True
     else:
     else:
         webm_cpu_x86 = True
         webm_cpu_x86 = True
-else:
+elif env["platform"] != "windows":  # Disable for Windows, yasm SIMD optimizations trigger crash (GH-50862).
     import platform
     import platform
 
 
     is_x11_or_server_arm = (env["platform"] == "x11" or env["platform"] == "server") and (
     is_x11_or_server_arm = (env["platform"] == "x11" or env["platform"] == "server") and (
@@ -322,7 +322,7 @@ if webm_cpu_arm:
 
 
     webm_simd_optimizations = True
     webm_simd_optimizations = True
 
 
-if webm_simd_optimizations == False:
+if webm_simd_optimizations == False and env["platform"] != "windows":
     print("WebM SIMD optimizations are disabled. Check if your CPU architecture, CPU bits or platform are supported!")
     print("WebM SIMD optimizations are disabled. Check if your CPU architecture, CPU bits or platform are supported!")
 
 
 env_libvpx.add_source_files(env.modules_sources, libvpx_sources)
 env_libvpx.add_source_files(env.modules_sources, libvpx_sources)