fixed flipped image bug and added jpg/exr support to base recorder

Author: jasonm-unity

source/Core/FrameRecorder/Core/Engine/FrameRecorderAttribute.cs

@@ -4,9 +4,8 @@ namespace UnityEngine.FrameRecorder
 {
 
     /// <summary>
-    /// What is this: 
-    /// Motivation  : 
-    /// Notes: 
+    /// What is this: Class attribute that decorates classes that are Recorders and provides the information needed to register it with the RecorderInventory class.
+    /// Motivation  : Provide a way to dynamically discover Recorder classes and provide a classification system and link between the recorder classes and their Settings classes.
     /// </summary>    
     [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]
     public class FrameRecorderAttribute : Attribute

source/Core/FrameRecorder/Inputs/CBRenderTexture/Engine/CBRenderTextureInput.cs

@@ -140,7 +140,7 @@ public override void NewFrameStarting(RecordingSession session)
 
                 // TODO: This should not be here!!!
                 m_mat_copy = new Material(CopyShader);
-                if (m_Camera.targetTexture != null)
+                if (m_Camera.targetTexture != null || cbSettings.m_FlipVertical )
                     m_mat_copy.EnableKeyword("OFFSCREEN");
 
                 var tid = Shader.PropertyToID("_TmpFrameBuffer");

source/Core/FrameRecorder/Inputs/CBRenderTexture/Engine/CBRenderTextureInputSettings.cs

@@ -1,12 +1,11 @@
-
-
-namespace UnityEngine.FrameRecorder.Input
+namespace UnityEngine.FrameRecorder.Input
 {
     public class CBRenderTextureInputSettings : InputSettings<CBRenderTextureInput>
     {
         public EImageSource source = EImageSource.GameDisplay;
         public EImageDimension m_RenderSize = EImageDimension.x720p_HD;
         public string m_CameraTag;
         public RenderTexture m_SourceRTxtr;
+        public bool m_FlipVertical = false;
     }
 }

source/Core/FrameRecorder/Recorders/PNG/Editor/PNGRecorderEditor.cs

@@ -10,6 +10,7 @@ public class PNGRecorderEditor : RecorderEditor
     {
         SerializedProperty m_DestinationPath;
         SerializedProperty m_BaseFileName;
+        SerializedProperty m_OutputFormat;
 
         string[] m_Candidates;
 
@@ -31,6 +32,7 @@ protected void OnEnable()
             m_Inputs = pf.Find(w => w.m_SourceSettings);
             m_DestinationPath = pf.Find(w => w.m_DestinationPath);
             m_BaseFileName = pf.Find(w => w.m_BaseFileName);
+            m_OutputFormat = pf.Find(w => w.m_OutputFormat);
         }
 
         protected override void OnEncodingGroupGui()
@@ -48,7 +50,11 @@ protected override void OnInputGui()
             if (index != newIndex)
             {
                 var newType = newIndex == 0 ? typeof(CBRenderTextureInputSettings) : typeof(AdamBeautyInputSettings);
-                var newSettings = (RecorderInputSetting)Activator.CreateInstance(newType);
+                var newSettings = ScriptableObject.CreateInstance(newType) as RecorderInputSetting;
+                if (newType == typeof(CBRenderTextureInputSettings))
+                {
+                    (newSettings as CBRenderTextureInputSettings).m_FlipVertical = true;
+                }
                 ChangeInputSettings(0, newSettings);
             }
 
@@ -57,6 +63,8 @@ protected override void OnInputGui()
 
         protected override void OnOutputGui()
         {
+            EditorGUILayout.PropertyField(m_OutputFormat, new GUIContent("Output format"));
+
             GUILayout.BeginHorizontal();
             EditorGUILayout.LabelField("Directory");
             m_DestinationPath.stringValue = EditorGUILayout.TextField(m_DestinationPath.stringValue);

source/Core/FrameRecorder/Recorders/PNG/Engine/PNGRecorder.cs

@@ -5,15 +5,15 @@
 
 namespace UnityEngine.FrameRecorder
 {
-    [FrameRecorder(typeof(PNGRecorderSettings),"Video", "PNG" )]
+    [FrameRecorder(typeof(PNGRecorderSettings),"Video", "PNG, Jpeg, OpenEXR" )]
     public class PNGRecorder : GenericRecorder<PNGRecorderSettings>
     {
         string MakeFileName(RecordingSession session)
         {
             var fileName = m_Settings.m_DestinationPath;
             if (fileName.Length > 0 && !fileName.EndsWith("/"))
                 fileName += "/";
-            fileName += m_Settings.m_BaseFileName + recordedFramesCount + ".png";
+            fileName += m_Settings.m_BaseFileName + recordedFramesCount + "." + m_Settings.m_OutputFormat;
             return fileName;
         }
 
@@ -26,14 +26,29 @@ public override void RecordFrame(RecordingSession session)
 
             var width = input.outputRT.width;
             var height = input.outputRT.height;
-            var tex = new Texture2D(width, height, TextureFormat.RGB24, false);
+            var tex = new Texture2D(width, height, m_Settings.m_OutputFormat !=  PNGRecordeOutputFormat.EXR ? TextureFormat.RGBA32 : TextureFormat.RGBAFloat, false);
             var backupActive = RenderTexture.active;
             RenderTexture.active = input.outputRT;
             tex.ReadPixels(new Rect(0, 0, width, height), 0, 0);
             tex.Apply();
             RenderTexture.active = backupActive;
 
-            var bytes = tex.EncodeToPNG();
+            byte[] bytes;
+            switch (m_Settings.m_OutputFormat)
+            {
+                case PNGRecordeOutputFormat.PNG:
+                    bytes = tex.EncodeToPNG();
+                    break;
+                case PNGRecordeOutputFormat.JPEG:
+                    bytes = tex.EncodeToJPG();
+                    break;
+                case PNGRecordeOutputFormat.EXR:
+                    bytes = tex.EncodeToEXR();
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
+
             UnityHelpers.Destroy(tex);
 
             if (!Directory.Exists(m_Settings.m_DestinationPath))

source/Core/FrameRecorder/Recorders/PNG/Engine/PNGRecorderSettings.cs

@@ -3,11 +3,20 @@
 
 namespace UnityEngine.FrameRecorder
 {
+
+    public enum PNGRecordeOutputFormat
+    {
+        PNG,
+        JPEG,
+        EXR
+    }
+
     [ExecuteInEditMode]
     public class PNGRecorderSettings : RecorderSettings
     {
-        public string m_BaseFileName  = "pngFile";
+        public string m_BaseFileName  = "image";
         public string m_DestinationPath = "Recorder";
+        public PNGRecordeOutputFormat m_OutputFormat = PNGRecordeOutputFormat.JPEG;
 
         public override List<RecorderInputSetting> GetDefaultSourcesSettings()
         {