cleaning

Author: ReferenceType

CMakeLists.txt

@@ -1,15 +1,3 @@
-# CMakeList.txt : Top-level CMake project file, do global configuration
-# and include sub-projects here.
-#
-cmake_minimum_required (VERSION 3.8)
-
-# Enable Hot Reload for MSVC compilers if supported.
-if (POLICY CMP0141)
-  cmake_policy(SET CMP0141 NEW)
-  set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "$<IF:$<AND:$<C_COMPILER_ID:MSVC>,$<CXX_COMPILER_ID:MSVC>>,$<$<CONFIG:Debug,RelWithDebInfo>:EditAndContinue>,$<$<CONFIG:Debug,RelWithDebInfo>:ProgramDatabase>>")
-endif()
-
-project ("OpenH264Wrapper2")
-
-# Include sub-projects.
+
 add_subdirectory ("H264SharpNative")
+

Examples/AVRecord/AVRecord.csproj

@@ -25,9 +25,9 @@
 
   <ItemGroup>
     <None Update="H264SharpNative-win64.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="openh264-2.4.0-win64.dll">
+    <None Update="openh264-2.4.1-win64.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

Examples/AVRecord/H264SharpNative-win64.dll

@@ -12,29 +12,27 @@
             <Grid Grid.Row="0" Margin="10">
                 <StackPanel>
                     <ToggleButton Content="Capture" Click="Capture"
-    Width="150" Height="40"></ToggleButton>
+                                    Width="150" Height="40"></ToggleButton>
                     <ToggleButton Content="Record" Click="BeginRecord"
-    Width="150" Height="40"></ToggleButton>
+                                    Width="150" Height="40"></ToggleButton>
                     <Button Content="Stop" Click="Stop"
-    Width="150" Height="40"></Button>
+                                    Width="150" Height="40"></Button>
                     <Label Content="BitRate"></Label>
-                    <Slider ValueChanged="Slider_ValueChanged" Minimum="10" Maximum="10000" Value="1000"></Slider>
+                    <Slider AutoToolTipPlacement="TopLeft" ValueChanged="Slider_ValueChanged" Minimum="10" Maximum="10000" Value="1000"></Slider>
                     <TextBlock x:Name="DataRate"></TextBlock>
                     <TextBlock x:Name="Fps"></TextBlock>
                     <TextBlock x:Name="AvgEncoderTime"></TextBlock>
                     <CheckBox Content="Enable Parallel Converter" Checked="ParallelConverterChecked" Unchecked="ParallelConverterUnChecked"></CheckBox>
-                    
+
                     <Label Content="Num threads"></Label>
-                    <Slider ValueChanged="Slider_ValueChanged2" Minimum="0" Maximum="32" Value="4" ></Slider>
+                    <Slider AutoToolTipPlacement="TopLeft" ValueChanged="Slider_ValueChanged2" Minimum="0" Maximum="32" Value="4" ></Slider>
 
-                    <CheckBox Content="Enable SSE" Checked="SSEChecked" Unchecked="SSEUnChecked"></CheckBox>
+                    <CheckBox Content="Enable SSE" IsChecked="True" Checked="SSEChecked" Unchecked="SSEUnChecked"></CheckBox>
                     <CheckBox Content="CVConversion" Checked="CVChecked" Unchecked="CVUnChecked"></CheckBox>
                     <CheckBox Content="Enable Loss" Checked="LossChecked" Unchecked="LossUnChecked"></CheckBox>
                     <CheckBox Content="Enable Jitter" Checked="JitterChecked" Unchecked="JitterUnChecked"></CheckBox>
-
                 </StackPanel>
             </Grid>
-
         </Grid>
         <Grid Margin="180,0,0,0">
             <Grid.RowDefinitions>
@@ -46,8 +44,6 @@
                 <ColumnDefinition Width="auto"></ColumnDefinition>
                 <ColumnDefinition Width="*"></ColumnDefinition>
             </Grid.ColumnDefinitions>
-
-
             <Grid Grid.Row="0" Grid.Column="1">
                 <Border BorderBrush="DimGray" BorderThickness="0.1">
                     <Grid>
@@ -60,7 +56,6 @@
             </Grid>
             <GridSplitter Grid.Row="1" Grid.Column="1"  Background="Gray" Height="5" HorizontalAlignment="Stretch"></GridSplitter>
             <!--<GridSplitter Grid.Column="3" Background="Black" Width="5" ></GridSplitter>-->
-
             <Grid Grid.Row="2" Grid.Column="1">
                 <Border BorderBrush="DimGray" BorderThickness="0.1">
                     <Grid>

Examples/AVRecord/MainWindow.xaml

@@ -1,30 +1,14 @@
-using NAudio.Wave.SampleProviders;
-using NAudio.Wave;
+using NAudio.Wave;
 using OpenCvSharp;
-using System.Numerics;
-using System.Text;
-using System.Text.RegularExpressions;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-
-
 using OpenH264Sample;
 using System.IO;
-using System.Drawing.Imaging;
-using System.Drawing;
 using System.Diagnostics;
-using System.Windows.Media.Animation;
 using H264Sharp;
 using System.Collections.Concurrent;
-using System;
-using OpenCvSharp.ML;
-
-
 
 namespace AVRecord
 {
@@ -111,7 +95,6 @@ public MainWindow()
             decoder = new H264Decoder();
             TagSVCDecodingParam decParam = new TagSVCDecodingParam();
             decParam.uiTargetDqLayer = 0xff;
-            decParam.eEcActiveIdc = ERROR_CON_IDC.ERROR_CON_SLICE_MV_COPY_CROSS_IDR;
             decParam.eEcActiveIdc = ERROR_CON_IDC.ERROR_CON_FRAME_COPY_CROSS_IDR;
             decParam.sVideoProperty.eVideoBsType = VIDEO_BITSTREAM_TYPE.VIDEO_BITSTREAM_SVC;
             decoder.Initialize(decParam);

Examples/AVRecord/MainWindow.xaml.cs

@@ -9,14 +9,22 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="H264Sharp-linux" Version="1.3.0" />
+    <Reference Include="H264Sharp">
+      <HintPath>H264Sharp.dll</HintPath>
+    </Reference>
   </ItemGroup>
 
   <ItemGroup>
+    <None Update="H264Sharp.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="H264SharpNative-linux64.so">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Update="H264SharpNative-win64.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="openh264-2.4.1-win64.dll">
+    <None Update="libopenh264-2.4.1-linux64.7.so">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="RawBgr.bin">