Adapt upstream OBSproject/libdshowcapture. Prepare for version 1.0.2

Author: charlescao460

.github/workflows/msbuild.yml

@@ -24,19 +24,21 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
 
     - name: Add MSBuild to PATH
-      uses: microsoft/setup-msbuild@v1.0.2
+      uses: microsoft/setup-msbuild@v2
 
     - name: Restore NuGet packages
       working-directory: ${{env.GITHUB_WORKSPACE}}
       run: nuget restore ${{env.SOLUTION_FILE_PATH}}
 
     - name: Build
       working-directory: ${{env.GITHUB_WORKSPACE}}
-      # Add additional options to the MSBuild command line here (like platform or verbosity level).
-      # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
       run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}}
+
+    - name: Pack
+      working-directory: ${{env.GITHUB_WORKSPACE}}
+      run: msbuild /m /t:NetLibDirectshowCapture:pack /p:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}}

.github/workflows/nuget-release.yml

@@ -15,12 +15,12 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
 
     - name: Add MSBuild to PATH
-      uses: microsoft/setup-msbuild@v1.0.2
+      uses: microsoft/setup-msbuild@v2
 
     - name: Restore NuGet packages
       working-directory: ${{env.GITHUB_WORKSPACE}}

NetLibDirectshowCapture/AudioConfig.cpp

@@ -128,4 +128,15 @@ namespace NetLibDirectshowCapture
     {
         _native->mode = static_cast<DShow::AudioMode>(value);
     }
+
+    int NetLibDirectshowCapture::AudioConfig::Buffer::get()
+    {
+        return _native->buffer;
+    }
+
+    void AudioConfig::Buffer::set(int value)
+    {
+        _native->buffer = value;
+    }
+
 }

NetLibDirectshowCapture/NetLibDirectshowCapture.h

@@ -532,6 +532,16 @@ namespace NetLibDirectshowCapture
             AudioMode get();
             void set(AudioMode value);
         }
+
+        /// <summary>
+        /// Desired audio buffer size
+        /// </summary>
+        property int Buffer
+        {
+            int get();
+            void set(int value);
+        }
+
     };
 
     public ref class Device : public ManagedObjectBase<DShow::Device>

NetLibDirectshowCapture/NetLibDirectshowCapture.vcxproj

@@ -24,12 +24,12 @@
     <Keyword>NetCoreCProj</Keyword>
     <RootNamespace>NetLibDirectshowCapture</RootNamespace>
     <TargetFramework>net8.0</TargetFramework>
-    <WindowsTargetPlatformMinVersion>7.0</WindowsTargetPlatformMinVersion>
+    <WindowsTargetPlatformMinVersion>10.0.20348.0</WindowsTargetPlatformMinVersion>
     <EnableManagedPackageReferenceSupport>true</EnableManagedPackageReferenceSupport>
     <IsPackable>true</IsPackable>
     <IncludeBuildOutput>true</IncludeBuildOutput>
     <PackageId>NetLibDirectshowCapture</PackageId>
-    <PackageVersion>1.0.1</PackageVersion>
+    <PackageVersion>1.0.2</PackageVersion>
     <Authors>Shirui Cao</Authors>
     <Title>.NET Wrapper of OBSproject/libdshowcapture</Title>
     <Description>

NetLibDirectshowCaptureExample/MainWindow.xaml.cs

@@ -53,6 +53,7 @@ public MainWindow()
         {
             _waveOut = new WaveOutEvent();
             _waveBuffer = new BufferedWaveProvider(new WaveFormat(48000, 16, 2));
+            _waveBuffer.BufferDuration = TimeSpan.FromMilliseconds(320);
             _displayingBitmap = new WriteableBitmap(1920, 1080, 96, 96, PixelFormats.Bgr24, null);
             InitializeComponent();
             DSLogger.CallBack = (t, s) =>
@@ -106,12 +107,10 @@ private void OnDeviceMenuItemClick(object sender, RoutedEventArgs e, VideoDevice
                 InternalFormat = VideoFormat.YUY2,
                 Format = VideoFormat.RGB24,
             };
-            var audioDevices = Device.EnumAudioDevices();
-            var audioDevice = audioDevices.Find(d => d.Name.Contains(videoConfig.Name, StringComparison.InvariantCultureIgnoreCase));
+
+            // TODO: Use WMI to find audio device through device tree
             AudioConfig audioConfig = new AudioConfig()
             {
-                Name = audioDevice?.Name,
-                Path = audioDevice?.Path,
                 Channels = 2,
                 SampleRate = 48000,
                 Format = AudioFormat.Wave16bit,
@@ -120,6 +119,15 @@ private void OnDeviceMenuItemClick(object sender, RoutedEventArgs e, VideoDevice
                 UseDefaultConfig = false
             };
 
+            var audioDevices = Device.EnumAudioDevices();
+            var audioDevice = audioDevices.Find(d => d.Name.Contains(videoConfig.Name, StringComparison.InvariantCultureIgnoreCase))
+                              ?? FindAttachedAudioWithSpecialHandling(device, audioDevices);
+            if (audioDevice != null)
+            {
+                audioConfig.Name = audioDevice.Name;
+                audioConfig.Path = audioDevice.Path;
+            }
+
             // Special handling for Corsair Elgato devices
             if (videoConfig.Name.Contains("Game Capture", StringComparison.InvariantCultureIgnoreCase) ||
                 videoConfig.Name.Contains("Elgato", StringComparison.InvariantCultureIgnoreCase))
@@ -144,7 +152,11 @@ private void OnDeviceMenuItemClick(object sender, RoutedEventArgs e, VideoDevice
             }
 
             _device.VideoConfiguration = videoConfig;
-            _device.AudioConfiguration = audioConfig;
+
+            if (audioConfig.Name != null || audioConfig.Path != null)
+            {
+                _device.AudioConfiguration = audioConfig;
+            }
 
             if (!_device.ConnectFilters())
             {
@@ -159,6 +171,23 @@ private void OnDeviceMenuItemClick(object sender, RoutedEventArgs e, VideoDevice
             CompositionTarget.Rendering += UpdateBitmapFromRawArray;
         }
 
+        private static AudioDevice FindAttachedAudioWithSpecialHandling(VideoDevice videoDevice, List<AudioDevice> audioDevices)
+        {
+            // ACASIS PCI-E Capture Cards, E.g., "HDPro 1" video is paired with "HDPro Audio 1" audio
+            if (videoDevice.Name.Contains("HDPro", StringComparison.InvariantCultureIgnoreCase))
+            {
+                string audioName = videoDevice.Name.Replace("HDPro", "HDPro Audio");
+                return audioDevices.Find(a => a.Name.Contains(audioName, StringComparison.InvariantCultureIgnoreCase));
+            }
+            // ACASIS Thunderbolt Capture Cards, E.g., "UHD Video 1" video is pared with "UHD Audio 1"
+            if (videoDevice.Name.Contains("UHD Video", StringComparison.InvariantCultureIgnoreCase))
+            {
+                string audioName = videoDevice.Name.Replace("UHD Video", "UHD Audio");
+                return audioDevices.Find(a => a.Name.Contains(audioName, StringComparison.InvariantCultureIgnoreCase));
+            }
+            return null;
+        }
+
 
         private void OnRefreshClick(object sender, RoutedEventArgs e)
         {
@@ -174,7 +203,15 @@ private void OnAudioFrame(object sender, AudioCapturedEventArgs e)
                 _rawWaveArray = new byte[e.Length];
             }
             Marshal.Copy(e.Ptr, _rawWaveArray, 0, e.Length);
-            _waveBuffer.AddSamples(_rawWaveArray, 0, e.Length);
+            try
+            {
+                _waveBuffer.AddSamples(_rawWaveArray, 0, e.Length);
+            }
+            catch (InvalidOperationException) // buffer full
+            {
+                _waveBuffer.ClearBuffer();
+            }
+
             if (_waveOut.PlaybackState != PlaybackState.Playing)
             {
                 _waveOut.Init(_waveBuffer);

NetLibDirectshowCaptureExample/NetLibDirectshowCaptureExample.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows7.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.20348.0</TargetFramework>
     <UseWPF>true</UseWPF>
   </PropertyGroup>