frame tag is now dynamic in size

jasonm-unity · jasonm-unity · commit 404064135442 · 2017-08-11T16:01:37.000-04:00
diff --git a/source/FrameRecorder/Core/Editor/FileNameDrawer.cs b/source/FrameRecorder/Core/Editor/FileNameDrawer.cs
@@ -1,6 +1,6 @@
 ﻿using System.Linq;
-using Assets.FrameRecorder.Core.Engine;
 using UnityEngine;
+using UnityEngine.FrameRecorder;
 
 namespace UnityEditor.FrameRecorder
 {
diff --git a/source/FrameRecorder/Core/Editor/RecorderEditor.cs b/source/FrameRecorder/Core/Editor/RecorderEditor.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Linq;
-using Assets.FrameRecorder.Core.Engine;
 using UnityEngine;
 using UnityEngine.FrameRecorder;
 
diff --git a/source/FrameRecorder/Core/Engine/FileNameGenerator.cs b/source/FrameRecorder/Core/Engine/FileNameGenerator.cs
@@ -1,22 +1,22 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using UnityEngine;
+using System.Text.RegularExpressions;
+using UnityEngine.SceneManagement;
 
-namespace Assets.FrameRecorder.Core.Engine
+namespace UnityEngine.FrameRecorder
 {
     [Serializable]
     public struct FileNameGenerator
     {
         public static string[] tagLabels { get; private set; }
         public static string[] tags { get; private set; }
+        static string m_projectName;
 
         public enum ETags
         {
             Time,
             Date,
             Project,
+            Product,
             Scene,
             Resolution,
             Frame,
@@ -26,6 +26,9 @@ public enum ETags
         [SerializeField]
         string m_Pattern;
 
+        string m_FramePattern;
+        string m_FramePatternDst;
+
         public string pattern {
             get { return m_Pattern;}
             set { m_Pattern = value;  }
@@ -38,6 +41,7 @@ static FileNameGenerator()
                 "<ts>",  
                 "<dt>",
                 "<prj>",
+                "<prd>",
                 "<scn>",
                 "<res>",
                 "<00000>",
@@ -49,9 +53,10 @@ static FileNameGenerator()
                 "<ts>  - Time",  
                 "<dt>  - Date",
                 "<prj> - Project name",
+                "<prd> - Product name (editor only)",
                 "<scn> - Scene name",
                 "<res> - Resolution",
-                "<00000> - Frame number",
+                "<000> - Frame number",
                 "<ext> - Default extension"
             };
         }
@@ -81,16 +86,45 @@ public static string AddTag(string pattern, ETags t)
             return pattern;
         }
 
-        public string BuildFileName( int frame, int width, int height, string ext )
+        public string BuildFileName( RecordingSession session, int frame, int width, int height, string ext )
         {
+            if (string.IsNullOrEmpty(m_projectName))
+            {
+#if UNITY_EDITOR
+                var parts = Application.dataPath.Split('/');
+                m_projectName = parts[parts.Length - 2];                  
+#else
+                m_projectName = "N/A";
+#endif
+            }
+
+            var regEx = new Regex("(<0*>)");
+            var match = regEx.Match(pattern);
+            if (match.Success)
+            {
+                m_FramePattern = match.Value;
+                m_FramePatternDst = m_FramePattern.Substring(1,m_FramePattern.Length-2 );
+            }
+            else
+            {
+                m_FramePattern = "<0>";
+                m_FramePatternDst = "0";
+            }             
+
             var fileName  = pattern.Replace(tags[(int)ETags.Extension], ext)
                 .Replace(tags[(int)ETags.Resolution], string.Format("{0}x{1}", width, height))
-                .Replace(tags[(int)ETags.Frame], frame.ToString("00000"))
-                .Replace(tags[(int)ETags.Scene], "(scene-NA)")
-                .Replace(tags[(int)ETags.Project], "(prj-NA)")
-                .Replace(tags[(int)ETags.Time], "(time-NA)")
-                .Replace(tags[(int)ETags.Date], "(date-NA)");
-
+                .Replace(m_FramePattern, frame.ToString(m_FramePatternDst))
+                .Replace(tags[(int)ETags.Scene], SceneManager.GetActiveScene().name)
+                .Replace(tags[(int)ETags.Project], m_projectName)
+#if UNITY_EDITOR
+                .Replace(tags[(int)ETags.Product], UnityEditor.PlayerSettings.productName )
+#else
+                .Replace(tags[(int)ETags.Product], "(prd-NA)")
+#endif
+                .Replace(tags[(int)ETags.Time], string.Format( "{0}h{1}m",session.m_SessionStartTS.ToString("hh"),session.m_SessionStartTS.ToString("mm") ))
+                .Replace(tags[(int)ETags.Date], session.m_SessionStartTS.ToShortDateString().Replace('/','-'))
+                ;
+            
             return fileName;
         }
 
diff --git a/source/FrameRecorder/Core/Engine/FrameRateHelper.cs b/source/FrameRecorder/Core/Engine/FrameRateHelper.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Text;
 
-namespace Assets.FrameRecorder.Core.Engine
+namespace UnityEngine.FrameRecorder
 {
   [Flags]
   public enum EFrameRate
diff --git a/source/FrameRecorder/Core/Engine/Recorder.cs b/source/FrameRecorder/Core/Engine/Recorder.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using Assets.FrameRecorder.Core.Engine;
 
 namespace UnityEngine.FrameRecorder
 {
diff --git a/source/FrameRecorder/Core/Engine/RecorderSettings.cs b/source/FrameRecorder/Core/Engine/RecorderSettings.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Assets.FrameRecorder.Core.Engine;
 
 namespace UnityEngine.FrameRecorder
 {
diff --git a/source/FrameRecorder/Core/Engine/RecordingSession.cs b/source/FrameRecorder/Core/Engine/RecordingSession.cs
@@ -22,6 +22,8 @@ public class RecordingSession : IDisposable
         float   m_FPSNextTimeStart;
         int     m_FPSNextFrameCount;
 
+        public DateTime m_SessionStartTS;
+
         public RecorderSettings settings { get { return m_Recorder.settings; } }
         public bool recording { get { return m_Recorder.recording; } }
         public int frameIndex {get { return m_FrameIndex; }}
@@ -39,7 +41,7 @@ public float RecorderTime
         public bool SessionCreated()
         {
             m_RecordingStartTS = (Time.time / Time.timeScale);
-
+            m_SessionStartTS = DateTime.Now;
             m_Recorder.SessionCreated(this);
             return true;
         }
diff --git a/source/FrameRecorder/Integrations/FrameCapturer/Recorders/EXR/EXRRecorder.cs b/source/FrameRecorder/Integrations/FrameCapturer/Recorders/EXR/EXRRecorder.cs
@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using Assets.FrameRecorder.Core.Engine;
 using UnityEngine.FrameRecorder;
 
 namespace UTJ.FrameCapturer.Recorders
@@ -34,7 +33,7 @@ public override void RecordFrame(RecordingSession session)
 
             var input = (BaseRenderTextureInput)m_Inputs[0];
             var frame = input.outputRT;
-            var fileName = m_Settings.m_BaseFileName.BuildFileName( recordedFramesCount, frame.width, frame.height, "exr");
+            var fileName = m_Settings.m_BaseFileName.BuildFileName( session, recordedFramesCount, frame.width, frame.height, "exr");
             var path = Path.Combine( settings.m_DestinationPath.GetFullPath(), fileName);
 
             fcAPI.fcLock(frame, (data, fmt) =>
diff --git a/source/FrameRecorder/Integrations/FrameCapturer/Recorders/GIF/GIFRecorder.cs b/source/FrameRecorder/Integrations/FrameCapturer/Recorders/GIF/GIFRecorder.cs
@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using Assets.FrameRecorder.Core.Engine;
 using UnityEngine;
 using UnityEngine.FrameRecorder;
 
@@ -41,7 +40,7 @@ public override void RecordFrame(RecordingSession session)
                 settings.width = frame.width;
                 settings.height = frame.height;
                 m_ctx = fcAPI.fcGifCreateContext(ref settings);
-                var fileName = m_Settings.m_BaseFileName.BuildFileName( recordedFramesCount, frame.width, frame.height, "gif");
+                var fileName = m_Settings.m_BaseFileName.BuildFileName( session, recordedFramesCount, frame.width, frame.height, "gif");
                 var path = Path.Combine( m_Settings.m_DestinationPath.GetFullPath(), fileName);
                 m_stream = fcAPI.fcCreateFileStream(path);
                 fcAPI.fcGifAddOutputStream(m_ctx, m_stream);
diff --git a/source/FrameRecorder/Integrations/FrameCapturer/Recorders/MP4/MP4Recorder.cs b/source/FrameRecorder/Integrations/FrameCapturer/Recorders/MP4/MP4Recorder.cs
@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using Assets.FrameRecorder.Core.Engine;
 using UnityEngine;
 using UnityEngine.FrameRecorder;
 
@@ -41,8 +40,8 @@ public override void RecordFrame(RecordingSession session)
                 settings.audio = false;
                 settings.videoWidth = frame.width;
                 settings.videoHeight = frame.height;
-                settings.videoTargetFramerate = 60; // ?
-                var fileName = m_Settings.m_BaseFileName.BuildFileName( recordedFramesCount, frame.width, frame.height, "mp4");
+                settings.videoTargetFramerate = (int)Math.Ceiling(m_Settings.m_FrameRate);
+                var fileName = m_Settings.m_BaseFileName.BuildFileName( session, recordedFramesCount, frame.width, frame.height, "mp4");
                 var path = Path.Combine( m_Settings.m_DestinationPath.GetFullPath(), fileName);
                 m_ctx = fcAPI.fcMP4OSCreateContext(ref settings, path);
             }
diff --git a/source/FrameRecorder/Integrations/FrameCapturer/Recorders/PNG/PNGRecorder.cs b/source/FrameRecorder/Integrations/FrameCapturer/Recorders/PNG/PNGRecorder.cs
@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using Assets.FrameRecorder.Core.Engine;
 using UnityEngine;
 using UnityEngine.FrameRecorder;
 
@@ -34,7 +33,7 @@ public override void RecordFrame(RecordingSession session)
 
             var input = (BaseRenderTextureInput)m_Inputs[0];
             var frame = input.outputRT;
-            var fileName = m_Settings.m_BaseFileName.BuildFileName( recordedFramesCount, frame.width, frame.height, "mp4");
+            var fileName = m_Settings.m_BaseFileName.BuildFileName( session, recordedFramesCount, frame.width, frame.height, "mp4");
             var path = Path.Combine(m_Settings.m_DestinationPath.GetFullPath(), fileName);
 
             fcAPI.fcLock(frame, (data, fmt) =>
diff --git a/source/FrameRecorder/Integrations/FrameCapturer/Recorders/WEBM/WEBMRecorder.cs b/source/FrameRecorder/Integrations/FrameCapturer/Recorders/WEBM/WEBMRecorder.cs
@@ -1,6 +1,4 @@
 using System;
-using System.IO;
-using Assets.FrameRecorder.Core.Engine;
 using UnityEngine;
 using UnityEngine.FrameRecorder;
 
@@ -43,9 +41,9 @@ public override void RecordFrame(RecordingSession session)
                 settings.audio = false;
                 settings.videoWidth = frame.width;
                 settings.videoHeight = frame.height;
-                settings.videoTargetFramerate = 60; // ?
+                settings.videoTargetFramerate = (int)Math.Ceiling(m_Settings.m_FrameRate);
                 m_ctx = fcAPI.fcWebMCreateContext(ref settings);
-                var fileName = m_Settings.m_BaseFileName.BuildFileName( recordedFramesCount, settings.videoWidth, settings.videoHeight, "webm");
+                var fileName = m_Settings.m_BaseFileName.BuildFileName( session, recordedFramesCount, settings.videoWidth, settings.videoHeight, "webm");
                 m_stream = fcAPI.fcCreateFileStream(fileName);
                 fcAPI.fcWebMAddOutputStream(m_ctx, m_stream);
             }
diff --git a/source/FrameRecorder/Recorders/ImageRecorder/Engine/ImageRecorder.cs b/source/FrameRecorder/Recorders/ImageRecorder/Engine/ImageRecorder.cs
@@ -1,8 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using Assets.FrameRecorder.Core.Engine;
-using UnityEngine.FrameRecorder.Input;
 
 namespace UnityEngine.FrameRecorder
 {
@@ -58,7 +55,7 @@ public override void RecordFrame(RecordingSession session)
 
             UnityHelpers.Destroy(tex);
 
-            var fileName = m_Settings.m_BaseFileName.BuildFileName( recordedFramesCount, width, height, ext);
+            var fileName = m_Settings.m_BaseFileName.BuildFileName( session, recordedFramesCount, width, height, ext);
             var path = Path.Combine( m_Settings.m_DestinationPath.GetFullPath(), fileName);
 
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using System.Linq;`
`2`		`-using Assets.FrameRecorder.Core.Engine;`
`3`	`2`	`using UnityEngine;`
	`3`	`+using UnityEngine.FrameRecorder;`
`4`	`4`
`5`	`5`	`namespace UnityEditor.FrameRecorder`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using System.Linq;`
`4`	`4`	`using System.Text;`
`5`	`5`
`6`		`-namespace Assets.FrameRecorder.Core.Engine`
	`6`	`+namespace UnityEngine.FrameRecorder`
`7`	`7`	`{`
`8`	`8`	`[Flags]`
`9`	`9`	`public enum EFrameRate`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`		`-using Assets.FrameRecorder.Core.Engine;`
`4`	`3`
`5`	`4`	`namespace UnityEngine.FrameRecorder`
`6`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Linq;`
`4`		`-using Assets.FrameRecorder.Core.Engine;`
`5`	`4`
`6`	`5`	`namespace UnityEngine.FrameRecorder`
`7`	`6`	`{`