Add x86 support for ffmpeg

Author: L2N6H5B3

SoftSledWPF/Components/AudioVisual/VideoFpsLab/FfmpegRuntime.cs

@@ -0,0 +1,22 @@
+using System;
+using System.IO;
+using System.Reflection;
+
+namespace SoftSled.Components.AudioVisual.VideoFpsLab {
+
+    /// <summary>
+    /// Resolves the bundled native FFmpeg DLL directory for the CURRENT
+    /// process architecture. The DLLs ship under
+    /// <c>&lt;exeDir&gt;\Tools\ffmpeg\x64</c> and <c>...\x86</c>; a 32-bit
+    /// process must load the x86 set and a 64-bit process the x64 set, or
+    /// FFmpeg.AutoGen fails to load avcodec/avutil with a "module not found".
+    /// Mirrors the arch selection the native RDP loader uses in App.xaml.cs.
+    /// </summary>
+    internal static class FfmpegRuntime {
+        public static string NativeDir() {
+            string baseDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+            string arch = Environment.Is64BitProcess ? "x64" : "x86";
+            return Path.Combine(baseDir, "Tools", "ffmpeg", arch);
+        }
+    }
+}

SoftSledWPF/Components/AudioVisual/VideoFpsLab/LibAvVideoDecoder.cs

@@ -67,9 +67,7 @@ public void Start() {
             // Point FFmpeg.AutoGen at the same native DLLs FFME uses. Safe to
             // set even if FFME already loaded them (AutoGen resolves lazily).
             try {
-                string ffmpegDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)
-                                   + "\\Tools\\ffmpeg\\x64";
-                if (string.IsNullOrEmpty(ffmpeg.RootPath)) ffmpeg.RootPath = ffmpegDir;
+                if (string.IsNullOrEmpty(ffmpeg.RootPath)) ffmpeg.RootPath = FfmpegRuntime.NativeDir();
             } catch (Exception ex) {
                 _log?.LogError($"[libav-video] could not set ffmpeg.RootPath: {ex.Message}");
             }

SoftSledWPF/Components/AudioVisual/VideoFpsLab/LibAvVideoPushDecoder.cs

@@ -65,9 +65,7 @@ public LibAvVideoPushDecoder(AVCodecID codecId, int clockHz, Logger log) {
         public void Start() {
             if (_worker != null) return;
             try {
-                string ffmpegDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)
-                                   + "\\Tools\\ffmpeg\\x64";
-                if (string.IsNullOrEmpty(ffmpeg.RootPath)) ffmpeg.RootPath = ffmpegDir;
+                if (string.IsNullOrEmpty(ffmpeg.RootPath)) ffmpeg.RootPath = FfmpegRuntime.NativeDir();
             } catch (Exception ex) {
                 _log?.LogError($"[libav-vpush] could not set ffmpeg.RootPath: {ex.Message}");
             }

SoftSledWPF/Components/Shell/ExtenderSessionControl.xaml.cs

@@ -759,8 +759,7 @@ private void EnsureFfmeInitialised() {
             // ffmpeg.RootPath, which must be set process-wide before the first
             // ffmpeg call. Safe to set repeatedly.
             try {
-                string ffmpegDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)
-                                   + "\\Tools\\ffmpeg\\x64";
+                string ffmpegDir = SoftSled.Components.AudioVisual.VideoFpsLab.FfmpegRuntime.NativeDir();
                 FFmpeg.AutoGen.ffmpeg.RootPath = ffmpegDir;
                 _avLogger?.LogInfo($"[ffmpeg] RootPath set to {ffmpegDir} " +
                                    $"(exists={System.IO.Directory.Exists(ffmpegDir)})");

SoftSledWPF/SoftSledWPF.csproj

@@ -219,6 +219,7 @@
     <Compile Include="Components\AudioVisual\VideoFpsLab\LiveVideoTap.cs" />
     <Compile Include="Components\AudioVisual\VideoFpsLab\PtsFramePacer.cs" />
     <Compile Include="Components\AudioVisual\VideoFpsLab\D3DImagePresenter.cs" />
+    <Compile Include="Components\AudioVisual\VideoFpsLab\FfmpegRuntime.cs" />
     <Compile Include="Components\AudioVisual\ExternalSync\ExternalAudioFormat.cs" />
     <Compile Include="Components\AudioVisual\ExternalSync\LibAvAudioDecoder.cs" />
     <Compile Include="Components\AudioVisual\ExternalSync\NAudioMasterRenderer.cs" />
@@ -443,37 +444,10 @@
     <Content Include="native\x86\softsled-rdp.dll" />
     <Content Include="native\x86\winpr3.dll" />
     <Content Include="native\x86\z.dll" />
-    <Content Include="Tools\ffmpeg\x64\avcodec-58.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Tools\ffmpeg\x64\avdevice-58.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Tools\ffmpeg\x64\avfilter-7.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Tools\ffmpeg\x64\avformat-58.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Tools\ffmpeg\x64\avutil-56.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Tools\ffmpeg\x64\ffmpeg.exe">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Tools\ffmpeg\x64\ffplay.exe">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Tools\ffmpeg\x64\ffprobe.exe">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Tools\ffmpeg\x64\postproc-55.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Tools\ffmpeg\x64\swresample-3.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Tools\ffmpeg\x64\swscale-5.dll">
+    <!-- Bundle the native FFmpeg DLLs for BOTH architectures, preserving the
+         x64\ / x86\ subfolders in the output. FfmpegRuntime.NativeDir() selects
+         the set matching the current process bitness at runtime. -->
+    <Content Include="Tools\ffmpeg\**\*.*">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Resource Include="wmc.bmp" />