diff --git a/ISCamRecorder/ISCamera.cs b/ISCamRecorder/ISCamera.cs index 5a55c6d..50c5e6c 100644 --- a/ISCamRecorder/ISCamera.cs +++ b/ISCamRecorder/ISCamera.cs @@ -120,15 +120,16 @@ /// ファイル保存 /// /// - public void SaveToFile(string outDir, float frrate, int movieRate, string imageType) { - Debug.WriteLine($"{_CamID} starts saving with {frrate}fps."); + public void SaveToFile(string outDir, float frameRate, int movieRate, + string imageType, string recTime) { + Debug.WriteLine($"{_CamID} starts saving with {frameRate}fps."); // 保存先確保 var outDir2 = Path.Combine(outDir, _CamID); Directory.CreateDirectory(outDir2); // 動画保存準備 - var movieFile = Path.Combine(outDir, $"{_CamID}.mp4"); + var movieFile = Path.Combine(outDir, $"{_CamID}_{recTime}.mp4"); var writer = new H264Writer(movieFile, - _RecSink.OutputFrameType, (int)frrate, movieRate * 1000); + _RecSink.OutputFrameType, (int)frameRate, movieRate * 1000); writer.Begin(); // ファイル保存 var firstDriverTime = _bufferlist[0].FrameMetadata.DriverFrameFirstPacketTime; diff --git a/ISCamRecorder/MainForm.cs b/ISCamRecorder/MainForm.cs index 4e0c463..0798db6 100644 --- a/ISCamRecorder/MainForm.cs +++ b/ISCamRecorder/MainForm.cs @@ -238,14 +238,13 @@ var framesToCapture = (int)(float.Parse(TxtRecodingDulation.Text) * frameRate + 1.0F); var movieRate = int.Parse(TxtMovieRate.Text); - var outputDir = Path.Combine(TxtOutputDir.Text, - "rec" + DateTime.Now.ToString("yyyyMMdd_HHmmss")); + var recTime = DateTime.Now.ToString("yyyyMMdd_HHmmss"); + var outputDir = Path.Combine(TxtOutputDir.Text, $"rec{recTime}"); Directory.CreateDirectory(outputDir); var imageType = CboImageType.Text; - var sensorFile = Path.Combine(outputDir, @"sensor.csv"); + var sensorFile = Path.Combine(outputDir, $"Sensor_{recTime}.csv"); _Sensor.StartRecoding(sensorFile); // 録画 - //DateTime recordStartTime = DateTime.Now; Task[] tasks = new Task[4]; for (var i = 0; i < _Cameras.Count; i++) { var cam = _Cameras[i]; @@ -259,7 +258,7 @@ for (var i = 0; i < _Cameras.Count; i++) { var cam = _Cameras[i]; tasks[i] = Task.Run(() => cam.SaveToFile( - outputDir, frameRate, movieRate, imageType)); + outputDir, frameRate, movieRate, imageType, recTime)); } Task.WaitAll(tasks);