Added FFmpeg resources

lextrack · Mar 7, 2023 · 7646c47 · 7646c47
1 parent 76841c2
commit 7646c47
Show file tree

Hide file tree

Showing 23 changed files with 80 additions and 23 deletions.
diff --git a/FFmpegResources/avcodec-59.dll b/FFmpegResources/avcodec-59.dll
diff --git a/FFmpegResources/avdevice-59.dll b/FFmpegResources/avdevice-59.dll
diff --git a/FFmpegResources/avfilter-8.dll b/FFmpegResources/avfilter-8.dll
diff --git a/FFmpegResources/avformat-59.dll b/FFmpegResources/avformat-59.dll
diff --git a/FFmpegResources/avutil-57.dll b/FFmpegResources/avutil-57.dll
diff --git a/FFmpegResources/ffmpeg.exe b/FFmpegResources/ffmpeg.exe
diff --git a/FFmpegResources/ffplay.exe b/FFmpegResources/ffplay.exe
diff --git a/FFmpegResources/ffprobe.exe b/FFmpegResources/ffprobe.exe
diff --git a/FFmpegResources/postproc-56.dll b/FFmpegResources/postproc-56.dll
diff --git a/FFmpegResources/swresample-4.dll b/FFmpegResources/swresample-4.dll
diff --git a/FFmpegResources/swscale-6.dll b/FFmpegResources/swscale-6.dll
diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
diff --git a/Properties/Resources.resx b/Properties/Resources.resx
@@ -157,4 +157,7 @@
   <data name="back" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\back.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Background" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Background.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
 </root>
diff --git a/README.md b/README.md
@@ -51,8 +51,8 @@ Select the Audio Recording option in the main window and you can record audio fr
 
 <h2 align="center">Install</h2>
 <p align="center">
-  Windows 7, 8.1, 10, 11 (64 bits) | v1.2.3 | <a href="https://github.com/lextrack/Simple-Screen-Recorder/releases/download/1.2.3/Simple-Screen-Recorder-Release-Portable.7z">Download directly from GitHub</a><br><br>
-  Uses <a href="https://dotnet.microsoft.com/en-us/download/dotnet/7.0">.Net 7.0</a> and <a href="https://www.gyan.dev/ffmpeg/builds/s">FFmpeg (ffmpeg-5.1.2-full_build-shared)</a> <br><br>
+  Windows 7, 8.1, 10, 11 (64 bits) | v1.2.4 | <a href="https://github.com/lextrack/Simple-Screen-Recorder/releases/download/1.2.4/Simple-Screen-Recorder-Release-Portable.7z">Download directly from GitHub</a><br><br>
+  Uses <a href="https://dotnet.microsoft.com/en-us/download/dotnet/7.0">.Net 7.0</a> and <a href="https://www.gyan.dev/ffmpeg/builds/">FFmpeg (ffmpeg-5.1.2-full_build-shared)</a> <br><br>
   <a href="https://postimg.cc/"><img src="https://i.postimg.cc/qvvZm4PT/screenrecorder1-2-3.png"></a>
 </p>
 

diff --git a/Resources/Background.wav b/Resources/Background.wav
diff --git a/Simple-Screen-Recorder.csproj b/Simple-Screen-Recorder.csproj
@@ -9,11 +9,11 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <StartupObject>Simple_Screen_Recorder.Program</StartupObject>
     <UseWPF>True</UseWPF>
-    <Version>1.2.3</Version>
+    <Version>1.2.4</Version>
     <Authors>Lextrack</Authors>
     <Copyright>Lextrack</Copyright>
-    <AssemblyVersion>1.2.3</AssemblyVersion>
-    <FileVersion>1.2.3</FileVersion>
+    <AssemblyVersion>1.2.4</AssemblyVersion>
+    <FileVersion>1.2.4</FileVersion>
     <PackageIcon>screen recorder.png</PackageIcon>
     <ApplicationIcon>Resources\screen recorder.ico</ApplicationIcon>
     <PlatformTarget>x64</PlatformTarget>
@@ -22,6 +22,10 @@
     <SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Remove="Resources\Background.wav" />
+  </ItemGroup>
+
   <ItemGroup>
     <Content Include="Resources\screen recorder.ico" />
   </ItemGroup>
@@ -124,6 +128,39 @@
   </ItemGroup>
 
   <ItemGroup>
+    <None Update="FFmpegResources\avcodec-59.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="FFmpegResources\avdevice-59.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="FFmpegResources\avfilter-8.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="FFmpegResources\avformat-59.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="FFmpegResources\avutil-57.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="FFmpegResources\ffmpeg.exe">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="FFmpegResources\ffplay.exe">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="FFmpegResources\ffprobe.exe">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="FFmpegResources\postproc-56.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="FFmpegResources\swresample-4.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="FFmpegResources\swscale-6.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Update="Properties\Settings.settings">
       <Generator>PublicSettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -134,4 +171,12 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="FFmpegResources\" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Resource Include="Resources\Background.wav" />
+  </ItemGroup>
+
 </Project>
diff --git a/UI/AboutForm.Designer.cs b/UI/AboutForm.Designer.cs
diff --git a/UI/AudioRecorderMainWindow.cs b/UI/AudioRecorderMainWindow.cs
@@ -50,7 +50,7 @@ private void btnStartRecording_Click(object sender, EventArgs e)
                 RecMic();
             }
 
-            ProcessStartInfo ProcessId = new("cmd.exe", "/c ffmpeg -f gdigrab AudioRecordings/" + AudioName + "");
+            ProcessStartInfo ProcessId = new("cmd.exe", $"/c {RecorderScreenMainWindow.ResourcePath} -f gdigrab AudioRecordings/" + AudioName + "");
             ProcessId.WindowStyle = ProcessWindowStyle.Hidden;
             ProcessId.CreateNoWindow = true;
             ProcessId.RedirectStandardOutput = true;
@@ -147,8 +147,7 @@ private static void RecSpeaker()
             AudioRecorderDesktop.Cleanup();
             AudioRecorderDesktop.CreateWaveInDevice();
 
-            var soundPlayer = new System.Media.SoundPlayer("Background.wav");
-
+            var soundPlayer = new System.Media.SoundPlayer(Properties.Resources.Background);
             soundPlayer.PlayLooping();
 
             AudioRecorderDesktop.outputFilename = "SystemAudio." + Strings.Format(DateTime.Now, "MM-dd-yyyy.HH.mm.ss") + ".wav";

diff --git a/UI/MergeAllMediaForm.cs b/UI/MergeAllMediaForm.cs
@@ -30,7 +30,7 @@ private void BtnMergeAll_Click(object sender, EventArgs e)
         {
             Process conversionProcess = new Process();
             conversionProcess.StartInfo.FileName = "cmd.exe";
-            conversionProcess.StartInfo.Arguments = "/k ffmpeg -i " + txtVideoPath.Text + " -i " + txtAudioDesk.Text + " -i " + txtAudioMic.Text + " -filter_complex amerge -shortest -c:v copy -c:a aac -b:a 320k OutputFiles/" + outputFileName + " & exit /b";
+            conversionProcess.StartInfo.Arguments = $"/c {RecorderScreenMainWindow.ResourcePath} -i " + txtVideoPath.Text + " -i " + txtAudioDesk.Text + " -i " + txtAudioMic.Text + " -filter_complex amerge -shortest -c:v copy -c:a aac -b:a 320k OutputFiles/" + outputFileName + " & exit /b";
             conversionProcess.Start();
 
             conversionProcess.EnableRaisingEvents = true;

diff --git a/UI/MergeVideoAudioForm.cs b/UI/MergeVideoAudioForm.cs
@@ -30,7 +30,7 @@ public void BtnMergeAll_Click(object sender, EventArgs e)
         {
             Process conversionProcess = new Process();
             conversionProcess.StartInfo.FileName = "cmd.exe";
-            conversionProcess.StartInfo.Arguments = "/k ffmpeg -i " + txtVideoPath.Text + " -i " + txtAudioDesk.Text + " -shortest -c:v copy -c:a aac -b:a 320k OutputFiles/" + outputFileName + " & exit /b";
+            conversionProcess.StartInfo.Arguments = $"/c {RecorderScreenMainWindow.ResourcePath} -i " + txtVideoPath.Text + " -i " + txtAudioDesk.Text + " -shortest -c:v copy -c:a aac -b:a 320k OutputFiles/" + outputFileName + " & exit /b";
             conversionProcess.Start();
 
             conversionProcess.EnableRaisingEvents = true;

diff --git a/UI/RecorderScreenMainWindow.Designer.cs b/UI/RecorderScreenMainWindow.Designer.cs
diff --git a/UI/RecorderScreenMainWindow.cs b/UI/RecorderScreenMainWindow.cs
@@ -17,6 +17,7 @@ public partial class RecorderScreenMainWindow
         private DateTime TimeRec = DateTime.MinValue;
         private string VideoName = "";
         public int ProcessId { get; private set; }
+        public static string ResourcePath = Path.Combine(Directory.GetCurrentDirectory(), @"FFmpegResources\ffmpeg");
 
         public RecorderScreenMainWindow()
         {
@@ -29,8 +30,6 @@ private void Form1_Load(object sender, EventArgs e)
 
             GetTextsMain();
 
-            CheckMonitors();
-
             ScreenAudioMic.OpenComp();
             ComboBoxMicrophone.DataSource = ScreenAudioMic.cboDIspositivos.DataSource;
             ScreenAudioDesktop.OpenComp();
@@ -44,6 +43,8 @@ private void Form1_Load(object sender, EventArgs e)
 
             ComboBoxFormat.Items.AddRange(new[] { ".avi", ".mkv" });
             ComboBoxFormat.SelectedIndex = 0;
+
+            CheckMonitors();
         }
 
         private void btnStartRecording_Click(object sender, EventArgs e)
@@ -97,7 +98,7 @@ private void VideoCodecs()
                     case "MPEG-4":
                         {
                             int fps = int.Parse((string)comboBoxFps.SelectedItem);
-                            ProcessStartInfo ProcessId = new("cmd.exe", "/c ffmpeg -f gdigrab -framerate " + fps + " -show_region 1 -i desktop -c:v mpeg4 -b:v 10000k Recordings/" + VideoName + "");
+                            ProcessStartInfo ProcessId = new("cmd.exe", $"/c {ResourcePath} -f gdigrab -framerate " + fps + " -show_region 1 -i desktop -c:v mpeg4 -b:v 10000k Recordings/" + VideoName + "");
                             ProcessId.WindowStyle = ProcessWindowStyle.Hidden;
                             ProcessId.CreateNoWindow = true;
                             ProcessId.RedirectStandardOutput = true;
@@ -110,7 +111,7 @@ private void VideoCodecs()
                     case "H264 NVENC (Nvidia Graphics Cards)":
                         {
                             int fps = int.Parse((string)comboBoxFps.SelectedItem);
-                            ProcessStartInfo ProcessId = new("cmd.exe", "/c ffmpeg -f gdigrab -framerate " + fps + " -show_region 1 -i desktop -c:v h264_nvenc -qp 0 Recordings/" + VideoName + "");
+                            ProcessStartInfo ProcessId = new("cmd.exe", $"/c {ResourcePath} -f gdigrab -framerate " + fps + " -show_region 1 -i desktop -c:v h264_nvenc -qp 0 Recordings/" + VideoName + "");
                             ProcessId.WindowStyle = ProcessWindowStyle.Hidden;
                             ProcessId.CreateNoWindow = true;
                             ProcessId.RedirectStandardOutput = true;
@@ -123,7 +124,7 @@ private void VideoCodecs()
                     case "H264 AMF (AMD Graphics Cards)":
                         {
                             int fps = int.Parse((string)comboBoxFps.SelectedItem);
-                            ProcessStartInfo ProcessId = new("cmd.exe", "/c ffmpeg -f gdigrab -framerate " + fps + " -show_region 1 -i desktop -c:v h264_amf -qp 0 Recordings/" + VideoName + "");
+                            ProcessStartInfo ProcessId = new("cmd.exe", $"/c {ResourcePath} -f gdigrab -framerate " + fps + " -show_region 1 -i desktop -c:v h264_amf -qp 0 Recordings/" + VideoName + "");
                             ProcessId.WindowStyle = ProcessWindowStyle.Hidden;
                             ProcessId.CreateNoWindow = true;
                             ProcessId.RedirectStandardOutput = true;
@@ -144,7 +145,7 @@ private void VideoCodecs()
                             Screen selectedScreen = Screen.AllScreens[comboBoxMonitors.SelectedIndex];
                             Rectangle bounds = selectedScreen.Bounds;
                             string getScreen = string.Format("-f gdigrab -framerate {0} -offset_x {1} -offset_y {2} -video_size {3}x{4} -show_region 1 -i desktop -c:v mpeg4 -b:v 10000k Recordings/{5}", comboBoxFps.SelectedItem, bounds.Left, bounds.Top, bounds.Width, bounds.Height, VideoName);
-                            ProcessStartInfo ProcessId = new("cmd.exe", "/c ffmpeg " + getScreen);
+                            ProcessStartInfo ProcessId = new("cmd.exe", $"/c {ResourcePath} " + getScreen);
                             ProcessId.WindowStyle = ProcessWindowStyle.Hidden;
                             ProcessId.CreateNoWindow = true;
                             ProcessId.RedirectStandardOutput = true;
@@ -159,7 +160,7 @@ private void VideoCodecs()
                             Screen selectedScreen = Screen.AllScreens[comboBoxMonitors.SelectedIndex];
                             Rectangle bounds = selectedScreen.Bounds;
                             string getScreen = string.Format("-f gdigrab -framerate {0} -offset_x {1} -offset_y {2} -video_size {3}x{4} -show_region 1 -i desktop -c:v h264_nvenc -qp 0 Recordings/{5}", comboBoxFps.SelectedItem, bounds.Left, bounds.Top, bounds.Width, bounds.Height, VideoName);
-                            ProcessStartInfo ProcessId = new("cmd.exe", "/c ffmpeg " + getScreen);
+                            ProcessStartInfo ProcessId = new("cmd.exe", $"/c {ResourcePath} " + getScreen);
                             ProcessId.WindowStyle = ProcessWindowStyle.Hidden;
                             ProcessId.CreateNoWindow = true;
                             ProcessId.RedirectStandardOutput = true;
@@ -174,7 +175,7 @@ private void VideoCodecs()
                             Screen selectedScreen = Screen.AllScreens[comboBoxMonitors.SelectedIndex];
                             Rectangle bounds = selectedScreen.Bounds;
                             string getScreen = string.Format("-f gdigrab -framerate {0} -offset_x {1} -offset_y {2} -video_size {3}x{4} -show_region 1 -i desktop -c:v h264_amf -qp 0 Recordings/{5}", comboBoxFps.SelectedItem, bounds.Left, bounds.Top, bounds.Width, bounds.Height, VideoName);
-                            ProcessStartInfo ProcessId = new("cmd.exe", "/c ffmpeg " + getScreen);
+                            ProcessStartInfo ProcessId = new("cmd.exe", $"/c {ResourcePath} " + getScreen);
                             ProcessId.WindowStyle = ProcessWindowStyle.Hidden;
                             ProcessId.CreateNoWindow = true;
                             ProcessId.RedirectStandardOutput = true;
@@ -271,7 +272,7 @@ private static void RecSpeaker()
             ScreenAudioDesktop.Cleanup();
             ScreenAudioDesktop.CreateWaveInDevice();
 
-            var soundPlayer = new System.Media.SoundPlayer("Background.wav");
+            var soundPlayer = new System.Media.SoundPlayer(Properties.Resources.Background);
             soundPlayer.PlayLooping();
 
             ScreenAudioDesktop.outputFilename = "SystemAudio." + Strings.Format(DateTime.Now, "MM-dd-yyyy.HH.mm.ss") + ".wav";

diff --git a/UI/RecorderScreenMainWindow.resx b/UI/RecorderScreenMainWindow.resx
@@ -64,7 +64,7 @@
     <value>106, 17</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>47</value>
+    <value>51</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">