Merge remote-tracking branch 'remotes/origin/dominique/movie-recorder'

# Conflicts:
#	source/FrameRecorder/Core/Editor/RecorderEditor.cs
#	source/FrameRecorder/Inputs/CBRenderTexture/Editor/CBRenderTextureInputSettingsEditor.cs
#	source/FrameRecorder/Recorders/ImageRecorder/Editor/ImageRecorderEditor.cs

Author: jasonm-unity

source/FrameRecorder/Core/Editor/RecorderEditor.cs

@@ -14,6 +14,7 @@ public enum EFieldDisplayState
     public abstract class RecorderEditor : Editor
     {
         protected SerializedProperty m_Inputs;
+        bool[]             m_ShowInputEditor;
         SerializedProperty m_Verbose;
         SerializedProperty m_FrameRateMode;
         SerializedProperty m_FrameRate;
@@ -39,6 +40,9 @@ protected virtual void OnEnable()
 
                 var pf = new PropertyFinder<RecorderSettings>(serializedObject);
                 m_Inputs = pf.Find(x => x.m_SourceSettings);
+                m_ShowInputEditor = new bool[m_Inputs.arraySize];
+                for (int i = 0; i < m_ShowInputEditor.Length; ++i)
+                    m_ShowInputEditor[i] = true;
                 m_Verbose = pf.Find(x => x.m_Verbose);
                 m_FrameRateMode = pf.Find(x => x.m_FrameRateMode);
                 m_FrameRate = pf.Find(x => x.m_FrameRate);
@@ -137,43 +141,29 @@ protected virtual void OnInputGui()
                 if (multiInputs)
                 {
                     EditorGUI.indentLevel++;
-                    EditorGUILayout.Foldout(true, "Input " + (i + 1));
+                    m_ShowInputEditor[i] =
+                        EditorGUILayout.Foldout(m_ShowInputEditor[i], "Input " + (i + 1));
                 }
                 var arrItem = m_Inputs.GetArrayElementAtIndex(i);
-                var editor = Editor.CreateEditor( arrItem.objectReferenceValue );
-                if (editor != null)
+                if (m_ShowInputEditor[i])
                 {
-                    if (editor is InputEditor)
-                        (editor as InputEditor).IsFieldAvailableForHost = GetFieldDisplayState;
-                    editor.OnInspectorGUI();
+                    var editor = Editor.CreateEditor(arrItem.objectReferenceValue);
+                    if (editor != null)
+                    {
+                        if (editor is InputEditor)
+                            (editor as InputEditor).IsFieldAvailableForHost = GetFieldDisplayState;
+                        editor.OnInspectorGUI();
+                    }
                 }
-
                 if (multiInputs)
                     EditorGUI.indentLevel--;
             }
         }
 
         protected virtual void OnOutputGui()
         {
-            AddProperty(m_DestinationPath, () =>
-            {
-                EditorGUILayout.PropertyField(m_DestinationPath, new GUIContent("Output path")); 
-            });
-            AddProperty(m_BaseFileName, () =>
-            {
-                EditorGUILayout.PropertyField(m_BaseFileName, new GUIContent("File name")); 
-                /*
-                EditorGUILayout.BeginHorizontal();
-                EditorGUILayout.PropertyField(m_BaseFileName, new GUIContent("File name")); 
-
-                int value = EditorGUILayout.Popup( 0, m_FileNameTags);
-                if (value != 0)
-                    m_BaseFileName.stringValue = FileNameGenerator.AddTag((FileNameGenerator.ETags)(value - 1), m_BaseFileName.stringValue);
-                
-                EditorGUILayout.EndHorizontal(); 
-                */               
-            });
-
+            AddProperty(m_DestinationPath, () => { EditorGUILayout.PropertyField(m_DestinationPath, new GUIContent("Output path"));  });
+            AddProperty(m_BaseFileName, () => { EditorGUILayout.PropertyField(m_BaseFileName, new GUIContent("File name")); });
             AddProperty( m_CaptureEveryNthFrame, () => EditorGUILayout.PropertyField(m_CaptureEveryNthFrame, new GUIContent("Every n'th frame")));
         }
 

source/FrameRecorder/Core/Editor/RecorderWindow.cs

@@ -235,7 +235,7 @@ void DelayedStartRecording()
         void StartRecording(bool autoExitPlayMode)
         {
             var settings = (RecorderSettings)m_Editor.target;
-            var go = FrameRecorderGOControler.HookupRecorder();
+            var go = FrameRecorderGOControler.HookupRecorder(!settings.m_Verbose);
             var session = new RecordingSession()
             {
                 m_Recorder = RecordersInventory.GenerateNewRecorder(m_recorderSelector.selectedRecorder, settings),
@@ -246,9 +246,13 @@ void StartRecording(bool autoExitPlayMode)
             component.session = session;
             component.autoExitPlayMode = autoExitPlayMode;
 
-            session.SessionCreated();
-            session.BeginRecording();
-            m_State = EState.Recording;
+            if (session.SessionCreated() && session.BeginRecording())
+                m_State = EState.Recording;
+            else
+            {
+                m_State = EState.Idle;
+                StopRecording();
+            }
         }
 
         void StopRecording()

source/FrameRecorder/Core/Engine/FrameRecorderGOControler.cs

@@ -12,21 +12,25 @@ public class FrameRecorderGOControler
     {
         const string k_HostGoName = "UnityEngine-Recorder-FrameRecorder";
 
-        static GameObject GetGameObject(bool createIfAbsent)
+        static GameObject GetGameObject(bool createIfAbsent, bool hide)
         {
             var go = GameObject.Find(k_HostGoName);
             if (go == null && createIfAbsent)
             {
                 go = new GameObject(k_HostGoName);
+                if (hide)
+                    go.hideFlags = HideFlags.HideInHierarchy;
             }
+
             return go;
         }
 
-        static GameObject GetRecordingSessionsRoot( bool createIfAbsent )
+        static GameObject GetRecordingSessionsRoot(bool createIfAbsent, bool hideGameObjects)
         {
-            var root = GetGameObject(createIfAbsent);
+            var root = GetGameObject(createIfAbsent, hideGameObjects);
             if (root == null)
                 return null;
+
             var settingsTr = root.transform.Find("RecordingSessions");
             GameObject settingsGO;
             if (settingsTr == null)
@@ -40,9 +44,9 @@ static GameObject GetRecordingSessionsRoot( bool createIfAbsent )
             return settingsGO;
         }
 
-        public static GameObject HookupRecorder()
+        public static GameObject HookupRecorder(bool hideGameObjects)
         {
-            var ctrl = GetRecordingSessionsRoot(true);
+            var ctrl = GetRecordingSessionsRoot(true, hideGameObjects);
 
             var recorderGO = new GameObject();
 
@@ -53,7 +57,7 @@ public static GameObject HookupRecorder()
 
         public static GameObject FindRecorder(RecorderSettings settings)
         {
-            var ctrl = GetRecordingSessionsRoot(false);
+            var ctrl = GetRecordingSessionsRoot(false, false);
             if (ctrl == null)
                 return null;
 

source/FrameRecorder/Core/Engine/RecordingSession.cs

@@ -50,13 +50,13 @@ public bool SessionCreated()
         public bool BeginRecording()
         {
             m_RecordingStartTS = (Time.time / Time.timeScale);
+            m_Recorder.SignalInputsOfStage(ERecordingSessionStage.BeginRecording, this);
 
             if (!m_Recorder.BeginRecording(this))
                 return false;
             m_InitialFrame = Time.renderedFrameCount;
             m_FPSTimeStart = Time.unscaledTime;
 
-            m_Recorder.SignalInputsOfStage(ERecordingSessionStage.BeginRecording, this);
             return true;
         }
 

source/FrameRecorder/Core/Engine/Timeline/FrameRecorderClip.cs

@@ -34,7 +34,7 @@ public override Playable CreatePlayable(PlayableGraph graph, GameObject owner)
                 behaviour.session = new RecordingSession()
                 {
                     m_Recorder = RecordersInventory.GenerateNewRecorder(recorderType, m_Settings),
-                    m_RecorderGO = FrameRecorderGOControler.HookupRecorder(),
+                    m_RecorderGO = FrameRecorderGOControler.HookupRecorder(!m_Settings.m_Verbose),
                 };
             }
             return playable;

source/FrameRecorder/Inputs/Audio.meta

@@ -0,0 +1,69 @@
+using UnityEditorInternal;
+using UnityEngine;
+using UnityEngine.FrameRecorder;
+using UnityEngine.FrameRecorder.Input;
+
+namespace UnityEditor.FrameRecorder.Input
+{
+    [CustomEditor(typeof(AudioInputSettings))]
+    public class AudioInputSettingsEditor : Editor
+    {
+        SerializedProperty m_PreserveAudio;
+#if RECORD_AUDIO_MIXERS
+        SerializedProperty m_AudioMixerGroups;
+        ReorderableList    m_AudioMixerGroupsList;
+#endif
+
+        protected void OnEnable()
+        {
+            if (target == null)
+                return;
+
+            var pf = new PropertyFinder<AudioInputSettings>(serializedObject);
+            m_PreserveAudio = pf.Find(w => w.m_PreserveAudio);
+
+#if RECORD_AUDIO_MIXERS
+	    m_AudioMixerGroups = serializedObject.FindProperty<AudioInputSettings>(x => x.m_AudioMixerGroups);
+	    m_AudioMixerGroupsList = new ReorderableList(serializedObject, m_AudioMixerGroups, true, true, true, true);
+	    m_AudioMixerGroupsList.drawElementCallback =
+		(Rect rect, int index, bool isActive, bool isFocused) =>
+		{
+		    var element = m_AudioMixerGroupsList.serializedProperty.GetArrayElementAtIndex(index);
+		    rect.y += 2;
+		    EditorGUI.PropertyField(
+			new Rect(rect.x - 25,                   rect.y, rect.width - 90, EditorGUIUtility.singleLineHeight),
+			element.FindPropertyRelative("m_MixerGroup"), GUIContent.none);
+		    EditorGUI.PropertyField(
+			new Rect(rect.x + rect.width - 85, rect.y, 20,              EditorGUIUtility.singleLineHeight),
+			element.FindPropertyRelative("m_Isolate"),    GUIContent.none);
+		    EditorGUI.LabelField(
+			new Rect(rect.x + rect.width - 65, rect.y, 60,              EditorGUIUtility.singleLineHeight),
+			new GUIContent ("Isolate", "Isolate group from mix"));
+		};
+
+	    m_AudioMixerGroupsList.drawHeaderCallback = (Rect rect) =>
+            {
+                EditorGUI.LabelField(rect, "Audio Mixer Groups");
+            };
+#endif
+        }
+
+        public override void OnInspectorGUI()
+        {
+            EditorGUILayout.PropertyField(m_PreserveAudio, new GUIContent("Preserve audio"));
+
+#if RECORD_AUDIO_MIXERS
+            if (m_AudioMixerGroups != null)
+            {
+                serializedObject.Update();
+                m_AudioMixerGroupsList.DoLayoutList();
+            }
+#endif
+ 
+            serializedObject.ApplyModifiedProperties();
+
+            if (!(target as AudioInputSettings).isValid)
+                EditorGUILayout.HelpBox("Incomplete/Invalid settings", MessageType.Warning);
+        }
+    }
+}