Skip to content

Commit cb943f0

Browse files
committed
Implemented full fledged wrapper. Added wpf application example. Performance updates.
1 parent 477e052 commit cb943f0

File tree

102 files changed

+5367
-1241
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+5367
-1241
lines changed
File renamed without changes.
File renamed without changes.

Converter/Converter.vcxproj renamed to C++CLI/Converter/Converter.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4343
<ConfigurationType>StaticLibrary</ConfigurationType>
4444
<UseDebugLibraries>true</UseDebugLibraries>
45-
<PlatformToolset>v143</PlatformToolset>
45+
<PlatformToolset>ClangCL</PlatformToolset>
4646
<CharacterSet>Unicode</CharacterSet>
4747
</PropertyGroup>
4848
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

Examples/H264SharpCLIdotNET/H264SharpCLIdotNET.csproj renamed to C++CLI/Examples/H264SharpCLIdotNET/H264SharpCLI.NET-Test.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<Reference Include="H264SharpNetCore64">
16-
<HintPath>..\..\x64\Release\H264SharpNetCore64.dll</HintPath>
17-
</Reference>
15+
<ProjectReference Include="..\..\H264SharpCLI\H264SharpCore.vcxproj" />
1816
</ItemGroup>
1917

2018
<ItemGroup>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

H264Sharp/H264Sharp.vcxproj renamed to C++CLI/H264SharpCLI/H264Sharp.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<RootNamespace>H264Sharp</RootNamespace>
2727
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
2828
<EnableManagedPackageReferenceSupport>true</EnableManagedPackageReferenceSupport>
29-
<ProjectName>H264Sharp</ProjectName>
29+
<ProjectName>H264SharpCLI</ProjectName>
3030
</PropertyGroup>
3131
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3232
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

H264Sharp/H264SharpCore.vcxproj renamed to C++CLI/H264SharpCLI/H264SharpCore.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<RootNamespace>H264Sharp</RootNamespace>
2727
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
2828
<EnableManagedPackageReferenceSupport>true</EnableManagedPackageReferenceSupport>
29-
<ProjectName>H264SharpNetCore</ProjectName>
29+
<ProjectName>H264SharpCLINetCore</ProjectName>
3030
</PropertyGroup>
3131
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3232
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

Examples/AVRecord/AVRecord.csproj

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net6.0-windows7.0</TargetFramework>
6+
<Nullable>enable</Nullable>
7+
<ImplicitUsings>enable</ImplicitUsings>
8+
<UseWPF>true</UseWPF>
9+
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
10+
</PropertyGroup>
11+
12+
<ItemGroup>
13+
<PackageReference Include="NAudio" Version="2.2.1" />
14+
<PackageReference Include="OpenCvSharp4" Version="4.9.0.20240103" />
15+
<PackageReference Include="OpenCvSharp4.Extensions" Version="4.9.0.20240103" />
16+
<PackageReference Include="OpenCvSharp4.runtime.win" Version="4.9.0.20240103" />
17+
<PackageReference Include="OpenCvSharp4.Windows" Version="4.9.0.20240103" />
18+
<PackageReference Include="OpenCvSharp4.WpfExtensions" Version="4.9.0.20240103" />
19+
</ItemGroup>
20+
21+
<ItemGroup>
22+
<ProjectReference Include="..\..\H264SharpBitmapExtentions\H264SharpBitmapExtentions.csproj" />
23+
<ProjectReference Include="..\..\H264Sharp\H264Sharp.csproj" />
24+
</ItemGroup>
25+
26+
<ItemGroup>
27+
<None Update="H264SharpNative-win64.dll">
28+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
29+
</None>
30+
<None Update="openh264-2.4.0-win64.dll">
31+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
32+
</None>
33+
</ItemGroup>
34+
35+
</Project>

Examples/AVRecord/App.xaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<Application x:Class="AVRecord.App"
2+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:local="clr-namespace:AVRecord"
5+
StartupUri="MainWindow.xaml">
6+
<Application.Resources>
7+
8+
</Application.Resources>
9+
</Application>

Examples/AVRecord/App.xaml.cs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
using System.Configuration;
2+
using System.Data;
3+
using System.Windows;
4+
5+
namespace AVRecord
6+
{
7+
/// <summary>
8+
/// Interaction logic for App.xaml
9+
/// </summary>
10+
public partial class App : Application
11+
{
12+
}
13+
14+
}

Examples/AVRecord/AssemblyInfo.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
using System.Windows;
2+
3+
[assembly: ThemeInfo(
4+
ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
5+
//(used if a resource is not found in the page,
6+
// or application resource dictionaries)
7+
ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
8+
//(used if a resource is not found in the page,
9+
// app, or any theme specific resource dictionaries)
10+
)]

0 commit comments

Comments
 (0)