Merge remote-tracking branch 'origin/zyy' into zhangxueyang

Common/system/FFMpeg.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Text;
 using System.Threading;
 
 using VisioForge.Shared.NAudio.CoreAudioApi;
@@ -99,7 +100,7 @@ namespace Common.system
             }
             if (IsRecordMicrophone)
             {
-                MicrophoneName = GetMicrophone();
+                MicrophoneName = GetInDeviceFull();
                 if (!string.IsNullOrWhiteSpace(MicrophoneName))
                 {
                     MicrophoneStr = "-f dshow -i audio=\"" + MicrophoneName + "\" -filter_complex amix=inputs=2:duration=first:dropout_transition=2 ";
@@ -108,7 +109,7 @@ namespace Common.system
             switch (Extension.ToUpper())
             {
                 case ".MP4":
-                    myProcess.StartInfo.Arguments = SpeakerStr + MicrophoneStr + " -f gdigrab -i desktop -pix_fmt yuv420p -vcodec libx264 -preset:v ultrafast -tune:v zerolatency -acodec aac " + PathName;
+                    myProcess.StartInfo.Arguments = SpeakerStr + MicrophoneStr + " -f gdigrab -i desktop -vcodec libx264 -preset:v ultrafast -tune:v zerolatency -acodec aac " + PathName;
                     //myProcess.StartInfo.Arguments = SpeakerStr + MicrophoneStr + " -f dshow -i video=\"screen-capture-recorder\" -pix_fmt yuv420p -vcodec libx264 -preset:v ultrafast -tune:v zerolatency -acodec aac " + PathName;
                     //if (string.IsNullOrWhiteSpace(MicrophoneName))
                     //{
@@ -122,7 +123,7 @@ namespace Common.system
                     break;
                 case ".AVI":
                 case ".FLV":
-                    myProcess.StartInfo.Arguments = SpeakerStr + MicrophoneStr + " -f gdigrab -i desktop -pix_fmt yuv420p -vcodec libx264 -preset:v ultrafast -tune:v zerolatency -acodec aac -f " + Extension.ToLower().Replace(".", "") + " " + PathName;
+                    myProcess.StartInfo.Arguments = SpeakerStr + MicrophoneStr + " -f gdigrab -i desktop -vcodec libx264 -preset:v ultrafast -tune:v zerolatency -acodec aac -f " + Extension.ToLower().Replace(".", "") + " " + PathName;
                     //if (string.IsNullOrWhiteSpace(MicrophoneName))
                     //{
                     //    myProcess.StartInfo.Arguments = "-f dshow -i video=\"screen-capture-recorder\" -f dshow -i audio=\"virtual-audio-capturer\" -vcodec libx264 -acodec libmp3lame -r 15 -crf 22 -f " + Extension.ToLower() + " " + PathName;  //ffmpeg的参数
@@ -134,9 +135,10 @@ namespace Common.system
                     //}
                     break;
                 default:
-                    myProcess.StartInfo.Arguments = SpeakerStr + MicrophoneStr + " -f gdigrab -i desktop -pix_fmt yuv420p -vcodec libx264 -preset:v ultrafast -tune:v zerolatency -acodec aac " + PathName;
+                    myProcess.StartInfo.Arguments = SpeakerStr + MicrophoneStr + " -f gdigrab -i desktop -vcodec libx264 -preset:v ultrafast -tune:v zerolatency -acodec aac " + PathName;
                     break;
             }
+            LogHelper.WriteInfoLog("【录屏】："+myProcess.StartInfo.Arguments);
             myProcess.StartInfo.UseShellExecute = false;           //不使用操作系统外壳程序启动
             myProcess.StartInfo.RedirectStandardError = true;      //重定向标准错误输出
             myProcess.StartInfo.CreateNoWindow = true;             //不显示程序窗口
@@ -192,7 +194,7 @@ namespace Common.system
             if (StartRecordAudio(audioMicrophonePath))
             {
                 IsRecordMicrophone = true;
-                MicrophoneName = GetMicrophone();
+                MicrophoneName = GetInDeviceFull();
             }
             else
             {
@@ -226,6 +228,7 @@ namespace Common.system
                         MicrophoneName + "\" -filter_complex amix=inputs=2:duration=first:dropout_transition=2 " + PathName;
                 }
             }
+            LogHelper.WriteInfoLog("【录音】：" + myProcess.StartInfo.Arguments);
             myProcess.StartInfo.UseShellExecute = false;           //不使用操作系统外壳程序启动
             myProcess.StartInfo.RedirectStandardError = true;      //重定向标准错误输出
             myProcess.StartInfo.CreateNoWindow = true;             //不显示程序窗口
@@ -788,14 +791,14 @@ namespace Common.system
         }
 
         /// <summary>
-        /// 获取麦克风列表
+        /// 获取声音输入设备完整名称
         /// </summary>
-        public List<string> GetMicrophoneList()
+        /// <returns></returns>
+        public static string GetInDeviceFull()
         {
-            List<string> devs = new List<string>();
-
-            MMDeviceEnumerator enumberator = new MMDeviceEnumerator();
-            MMDeviceCollection deviceCollection = enumberator.EnumerateAudioEndPoints(DataFlow.Capture, DeviceState.All);
+            List<string> devices = new List<string>();
+            var enumberator = new MMDeviceEnumerator();
+            var deviceCollection = enumberator.EnumerateAudioEndPoints(DataFlow.Capture, DeviceState.All);
             for (int waveInDevice = 0; waveInDevice < WaveIn.DeviceCount; waveInDevice++)
             {
                 WaveInCapabilities deviceInfo = WaveIn.GetCapabilities(waveInDevice);
@@ -803,20 +806,58 @@ namespace Common.system
                 {
                     try
                     {
-
                         if (device.FriendlyName.StartsWith(deviceInfo.ProductName))
                         {
-                            devs.Add(device.FriendlyName);
+                            devices.Add(device.FriendlyName);
                             break;
                         }
                     }
-                    catch (Exception)
+                    catch (Exception ex)
                     {
-
+                        continue;
+                    }
+                }
+            }
+            if (devices.Count > 0)
+            {
+                byte[] buffer = Encoding.UTF8.GetBytes(devices[0]);
+                string MicrophoneName = Encoding.UTF8.GetString(buffer); // 统一使用UTF-8
+                return MicrophoneName;
+            }
+            else
+            {
+                return "";
+            }
+        }
+        /// <summary>
+        /// 获取声音输入设备完整名称
+        /// </summary>
+        /// <returns></returns>
+        public List<string> GetInDeviceListFull()
+        {
+            List<string> devices = new List<string>();
+            var enumberator = new MMDeviceEnumerator();
+            var deviceCollection = enumberator.EnumerateAudioEndPoints(DataFlow.Capture, DeviceState.All);
+            for (int waveInDevice = 0; waveInDevice < WaveIn.DeviceCount; waveInDevice++)
+            {
+                WaveInCapabilities deviceInfo = WaveIn.GetCapabilities(waveInDevice);
+                foreach (MMDevice device in deviceCollection)
+                {
+                    try
+                    {
+                        if (device.FriendlyName.StartsWith(deviceInfo.ProductName))
+                        {
+                            devices.Add(device.FriendlyName);
+                            break;
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        continue;
                     }
                 }
             }
-            return devs;
+            return devices;
         }
 
         /// <summary>

Common/system/ImageHelper.cs

@@ -421,14 +421,21 @@ namespace Common.system
                         encoder.Save(memoryStream);
                         //System.Drawing.Image img = System.Drawing.Image.FromStream(memoryStream);
                         Bitmap bit = new Bitmap(memoryStream);
-                        try
+                        if ((int)ImgWidth-2 < (int)bit.Width)
                         {
-                            Graphics g = Graphics.FromImage(Img);
-                            //g.InterpolationMode = InterpolationMode.HighQualityBicubic;
-                            g.DrawImage(bit, new Rectangle(0, 0, ImgWidth, ImgHeight), new Rectangle(0, 0, (int)bit.Width, (int)bit.Height), GraphicsUnit.Pixel);
-                            g.Dispose();
+                            try
+                            {
+                                Graphics g = Graphics.FromImage(Img);
+                                //g.InterpolationMode = InterpolationMode.HighQualityBicubic;
+                                g.DrawImage(bit, new Rectangle(0, 0, ImgWidth, ImgHeight), new Rectangle(0, 0, (int)bit.Width, (int)bit.Height), GraphicsUnit.Pixel);
+                                g.Dispose();
+                            }
+                            catch
+                            {
+                                Img = bit;
+                            }
                         }
-                        catch
+                        else
                         {
                             Img = bit;
                         }
@@ -439,6 +446,7 @@ namespace Common.system
                             //FileToolsCommon.DeleteFile(filePathName);
                             //bitmap.Save(filePathName);
                             //bitmap.Dispose();
+                            memoryStream.Dispose();
                             Img.Dispose();
                             bit.Dispose();
                         }))).Start();

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -351,7 +351,6 @@ namespace XHWK.WKTool
                         WkType = Enum_WKVidetype.RecordingScreen
                     };
                     SetUpVideoPathName();
-                    IsFirstRS = false;
                     k_hook.Start();//安装键盘钩子
 
                     if (APP.W_CountdownWindow == null)
@@ -417,7 +416,10 @@ namespace XHWK.WKTool
                     #endregion
                     new Thread(new ThreadStart(new Action(() =>
                     {
-                        Thread.Sleep(800);
+                        if (IsFirstRS)
+                        {
+                            Thread.Sleep(800);
+                        }
                         if(APP.FFmpeg.myProcess!=null)
                         {
                             Thread.Sleep(100);
@@ -435,6 +437,7 @@ namespace XHWK.WKTool
                 {
                     MessageWindow.Show(ex.Message);
                 }
+                IsFirstRS = false;
             }
             else
             {