Merge pull request #702 from b-editor/fix-media-reader

MediaReaderの修正
b-editor · Sep 12, 2023 · 78d10a1 · 78d10a1
2 parents 7e321ae + d257556
commit 78d10a1
Show file tree

Hide file tree

Showing 9 changed files with 106 additions and 495 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -33,6 +33,7 @@
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="7.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
     <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="7.0.10" />
+    <PackageVersion Include="NAudio.Core" Version="2.2.1" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageVersion Include="Nito.AsyncEx" Version="5.1.2" />
     <PackageVersion Include="NuGet.ProjectModel" Version="6.7.0" />

diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md
@@ -2265,4 +2265,15 @@ freely, subject to the following restrictions:
    be misrepresented as being the original software.
 
 3. This notice may not be removed or altered from any source
-   distribution.
+   distribution.
+
+## NAudio
+https://github.com/naudio/NAudio
+
+Copyright 2020 Mark Heath
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/src/Beutl.Engine/Beutl.Engine.csproj b/src/Beutl.Engine/Beutl.Engine.csproj
@@ -17,6 +17,7 @@
   <ItemGroup>
     <PackageReference Include="ILGPU" />
     <PackageReference Include="Microsoft.Extensions.ObjectPool" />
+    <PackageReference Include="NAudio.Core" />
     <PackageReference Include="OpenCvSharp4" />
     <PackageReference Include="OpenCvSharp4.runtime.centos7-x64" />
     <PackageReference Include="OpenCvSharp4.runtime.osx.10.15-x64" />

diff --git a/src/Beutl.Engine/Media/Wave/WaveAnalysis.cs b/src/Beutl.Engine/Media/Wave/WaveAnalysis.cs
diff --git a/src/Beutl.Engine/Media/Wave/WaveBitConverter.cs b/src/Beutl.Engine/Media/Wave/WaveBitConverter.cs
diff --git a/src/Beutl.Engine/Media/Wave/WaveFormat.cs b/src/Beutl.Engine/Media/Wave/WaveFormat.cs
diff --git a/src/Beutl.Engine/Media/Wave/WaveFormatTag.cs b/src/Beutl.Engine/Media/Wave/WaveFormatTag.cs