Updated Mic Stream Demo.

StephenHodgson · StephenHodgson · commit 7aa56cf1c375 · 2017-03-11T10:44:37.000-05:00
Fixes null reference when starting &amp; NaN errors from MicStreamSelector.dll
diff --git a/Assets/HoloToolkit/Input/Scripts/Microphone/MicStream.cs b/Assets/HoloToolkit/Input/Scripts/Microphone/MicStream.cs
@@ -162,10 +162,10 @@ public static bool CheckForErrorOnCall(int returnCode)
             switch (returnCode)
             {
                 case (int)ErrorCodes.ALREADY_RECORDING:
-                    Debug.LogError("WARNING: Tried to start recording when you were already doing so. You need to stop your previous recording before you can start again.");
+                    Debug.LogWarning("WARNING: Tried to start recording when you were already doing so. You need to stop your previous recording before you can start again.");
                     return false;
                 case (int)ErrorCodes.ALREADY_RUNNING:
-                    Debug.LogError("WARNING: Tried to initialize microphone more than once");
+                    Debug.LogWarning("WARNING: Tried to initialize microphone more than once");
                     return false;
                 case (int)ErrorCodes.GRAPH_NOT_EXIST:
                     Debug.LogError("ERROR: Tried to do microphone things without a properly initialized microphone. \n Do you have a mic plugged into a functional audio system and did you call MicInitialize() before anything else ??");
diff --git a/Assets/HoloToolkit/Input/Tests/Scenes/MicrophoneStream.unity b/Assets/HoloToolkit/Input/Tests/Scenes/MicrophoneStream.unity
@@ -1,15 +1,15 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
 --- !u!29 &1
-SceneSettings:
+OcclusionCullingSettings:
   m_ObjectHideFlags: 0
-  m_PVSData: 
-  m_PVSObjectsArray: []
-  m_PVSPortalsArray: []
+  serializedVersion: 2
   m_OcclusionBakeSettings:
     smallestOccluder: 5
     smallestHole: 0.25
     backfaceThreshold: 100
+  m_SceneGUID: 00000000000000000000000000000000
+  m_OcclusionCullingData: {fileID: 0}
 --- !u!104 &2
 RenderSettings:
   m_ObjectHideFlags: 0
@@ -37,7 +37,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44692558, g: 0.49678743, b: 0.57508624, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
 --- !u!157 &3
 LightmapSettings:
   m_ObjectHideFlags: 0
@@ -79,29 +79,30 @@ NavMeshSettings:
   m_ObjectHideFlags: 0
   m_BuildSettings:
     serializedVersion: 2
+    agentTypeID: 0
     agentRadius: 0.5
     agentHeight: 2
     agentSlope: 45
     agentClimb: 0.4
     ledgeDropHeight: 0
     maxJumpAcrossDistance: 0
-    accuratePlacement: 0
     minRegionArea: 2
-    cellSize: 0.16666667
     manualCellSize: 0
+    cellSize: 0.16666667
+    accuratePlacement: 0
   m_NavMeshData: {fileID: 0}
 --- !u!1 &156915665
 GameObject:
   m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
-  serializedVersion: 4
+  serializedVersion: 5
   m_Component:
-  - 4: {fileID: 156915670}
-  - 20: {fileID: 156915669}
-  - 92: {fileID: 156915668}
-  - 124: {fileID: 156915667}
-  - 81: {fileID: 156915666}
+  - component: {fileID: 156915670}
+  - component: {fileID: 156915669}
+  - component: {fileID: 156915668}
+  - component: {fileID: 156915667}
+  - component: {fileID: 156915666}
   m_Layer: 0
   m_Name: Main Camera
   m_TagString: MainCamera
@@ -173,19 +174,19 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &345633917
 GameObject:
   m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
-  serializedVersion: 4
+  serializedVersion: 5
   m_Component:
-  - 4: {fileID: 345633919}
-  - 108: {fileID: 345633918}
+  - component: {fileID: 345633919}
+  - component: {fileID: 345633918}
   m_Layer: 0
   m_Name: Directional Light
   m_TagString: Untagged
@@ -236,23 +237,23 @@ Transform:
   m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
   m_LocalPosition: {x: 0, y: 3, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
 --- !u!1 &1702215501
 GameObject:
   m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
-  serializedVersion: 4
+  serializedVersion: 5
   m_Component:
-  - 4: {fileID: 1702215505}
-  - 33: {fileID: 1702215504}
-  - 65: {fileID: 1702215503}
-  - 23: {fileID: 1702215502}
-  - 82: {fileID: 1702215507}
-  - 114: {fileID: 1702215506}
+  - component: {fileID: 1702215505}
+  - component: {fileID: 1702215504}
+  - component: {fileID: 1702215503}
+  - component: {fileID: 1702215502}
+  - component: {fileID: 1702215507}
+  - component: {fileID: 1702215506}
   m_Layer: 0
   m_Name: Cube
   m_TagString: Untagged
@@ -274,15 +275,17 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_Materials:
   - {fileID: 2100000, guid: 474f0e0481d4aa14e92a5ada98042f3a, type: 2}
-  m_SubsetIndices: 
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
   m_StaticBatchRoot: {fileID: 0}
   m_ProbeAnchor: {fileID: 0}
   m_LightProbeVolumeOverride: {fileID: 0}
   m_ScaleInLightmap: 1
   m_PreserveUVs: 1
   m_IgnoreNormalsForChartDetection: 0
   m_ImportantGI: 0
-  m_SelectedWireframeHidden: 0
+  m_SelectedEditorRenderState: 3
   m_MinimumChartSize: 4
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
@@ -317,10 +320,10 @@ Transform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 5}
   m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1702215506
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -332,12 +335,13 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 19fe6525d557689439c0225dda308086, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  StreamType: 1
-  InputGain: 1
+  StreamType: 0
+  InputGain: 0.5
   KeepAllData: 0
   AutomaticallyStartStream: 1
   ListenToAudioSource: 1
   SaveFileName: MicrophoneTest.wav
+  minObjectScale: 0.3
 --- !u!82 &1702215507
 AudioSource:
   m_ObjectHideFlags: 0
@@ -354,6 +358,7 @@ AudioSource:
   Loop: 0
   Mute: 0
   Spatialize: 0
+  SpatializePostEffects: 0
   Priority: 128
   DopplerLevel: 1
   MinDistance: 1
@@ -366,12 +371,14 @@ AudioSource:
   rolloffCustomCurve:
     serializedVersion: 2
     m_Curve:
-    - time: 0
+    - serializedVersion: 2
+      time: 0
       value: 1
       inSlope: 0
       outSlope: 0
       tangentMode: 0
-    - time: 1
+    - serializedVersion: 2
+      time: 1
       value: 0
       inSlope: 0
       outSlope: 0
@@ -382,7 +389,8 @@ AudioSource:
   panLevelCustomCurve:
     serializedVersion: 2
     m_Curve:
-    - time: 0
+    - serializedVersion: 2
+      time: 0
       value: 0
       inSlope: 0
       outSlope: 0
@@ -393,7 +401,8 @@ AudioSource:
   spreadCustomCurve:
     serializedVersion: 2
     m_Curve:
-    - time: 0
+    - serializedVersion: 2
+      time: 0
       value: 0
       inSlope: 0
       outSlope: 0
@@ -404,7 +413,8 @@ AudioSource:
   reverbZoneMixCustomCurve:
     serializedVersion: 2
     m_Curve:
-    - time: 0
+    - serializedVersion: 2
+      time: 0
       value: 1
       inSlope: 0
       outSlope: 0
diff --git a/Assets/HoloToolkit/Input/Tests/Scripts/MicStreamDemo.cs b/Assets/HoloToolkit/Input/Tests/Scripts/MicStreamDemo.cs
@@ -9,45 +9,50 @@ namespace HoloToolkit.Unity.InputModule.Tests
     public class MicStreamDemo : MonoBehaviour
     {
         /// <summary>
-        /// Which type of microphone/quality to access
+        /// Which type of microphone/quality to access.
         /// </summary>
         public MicStream.StreamCategory StreamType = MicStream.StreamCategory.HIGH_QUALITY_VOICE;
 
         /// <summary>
-        /// can boost volume here as desired. 1 is default but probably too quiet. can change during operation. 
+        /// Can boost volume here as desired. 1 is default.
+        /// <remarks>Can be updated at runtime.</remarks> 
         /// </summary>
         public float InputGain = 1;
 
         /// <summary>
-        /// if keepAllData==false, you'll always get the newest data no matter how long the program hangs for any reason, but will lose some data if the program does hang 
-        /// can only be set on initialization
+        /// if keepAllData==false, you'll always get the newest data no matter how long the program hangs for any reason,
+        /// but will lose some data if the program does hang.
+        /// <remarks>Can only be set on initialization.</remarks>
         /// </summary>
         public bool KeepAllData;
 
         /// <summary>
-        /// Should the mic stream start automatically when this component is enabled?
+        /// If true, Starts the mic stream automatically when this component is enabled.
         /// </summary>
         public bool AutomaticallyStartStream = true;
 
         /// <summary>
-        /// Do you want to hear what the microphone sounds like by listening to the AudioSource in Unity?
+        /// Plays back the microphone audio source though default audio device.
         /// </summary>
-        public bool ListenToAudioSource = true;
+        public bool PlaybackMicrophoneAudioSource = true;
 
         /// <summary>
-        /// The name of the file to which to save audio (for commands that save to a file)
+        /// The name of the file to which to save audio (for commands that save to a file).
         /// </summary>
         public string SaveFileName = "MicrophoneTest.wav";
 
         /// <summary>
-        /// Records estimation of volume from the microphone to affect other elements of the game object
+        /// Records estimation of volume from the microphone to affect other elements of the game object.
         /// </summary>
         private float averageAmplitude;
 
         /// <summary>
-        /// how small can our object be in this demo?
+        /// Minimum size the demo cube can be during runtime.
         /// </summary>
-        private float minSize = .3f;
+        [SerializeField]
+        private float minObjectScale = .3f;
+
+        private bool isRunning;
 
         private void OnAudioFilterRead(float[] buffer, int numChannels)
         {
@@ -59,17 +64,23 @@ private void OnAudioFilterRead(float[] buffer, int numChannels)
             // figure out the average amplitude from this new data
             for (int i = 0; i < buffer.Length; i++)
             {
-                sumOfValues += Mathf.Abs(buffer[i]);
+                if (float.IsNaN(buffer[i]))
+                {
+                    buffer[i] = 0;
+                }
+
+                buffer[i] = Mathf.Clamp(buffer[i], -1f, 1f);
+                sumOfValues += Mathf.Clamp01(Mathf.Abs(buffer[i]));
             }
             averageAmplitude = sumOfValues / buffer.Length;
         }
 
-        private void Awake()
+        private void Start()
         {
             CheckForErrorOnCall(MicStream.MicInitializeCustomRate((int)StreamType, AudioSettings.outputSampleRate));
             CheckForErrorOnCall(MicStream.MicSetGain(InputGain));
 
-            if (!ListenToAudioSource)
+            if (!PlaybackMicrophoneAudioSource)
             {
                 gameObject.GetComponent<AudioSource>().volume = 0; // can set to zero to mute mic monitoring
             }
@@ -84,6 +95,7 @@ private void Awake()
             print("It will start a recording and save it to a wav file. S will stop that recording.");
             print("Since this all goes through the AudioSource, you can mute the mic while using it there, or do anything else you would do with an AudioSource");
             print("In this demo, we start the stream automatically, and then change the size of the gameobject based on microphone signal amplitude");
+            isRunning = true;
         }
 
         private void OnDestroy()
@@ -114,35 +126,51 @@ private void Update()
                 CheckForErrorOnCall(MicStream.MicStopStream());
             }
 
-            gameObject.transform.localScale = new Vector3(minSize + averageAmplitude, minSize + averageAmplitude, minSize + averageAmplitude);
+            gameObject.transform.localScale = new Vector3(minObjectScale + averageAmplitude, minObjectScale + averageAmplitude, minObjectScale + averageAmplitude);
         }
 
         private static void CheckForErrorOnCall(int returnCode)
         {
             MicStream.CheckForErrorOnCall(returnCode);
         }
 
-#if DOTNET_FX
-        // On device, deal with all the ways that we could suspend our program in as few lines as possible.
-        private void OnApplicationPause(bool pause)
+        private void ToggleMicStream(bool pause)
         {
             CheckForErrorOnCall(pause ? MicStream.MicPause() : MicStream.MicResume());
+            isRunning = pause;
         }
 
-        private void OnApplicationFocus(bool focused)
+        private void OnApplicationPause(bool pause)
         {
-            OnApplicationPause(!focused);
+            if (isRunning)
+            {
+                ToggleMicStream(pause);
+            }
         }
 
+#if !UNITY_EDITOR
+        private void OnApplicationFocus(bool focused)
+        {
+            if (isInitialized)
+            {
+                ToggleMicStream(!focused);
+            }
+        }
+#endif
         private void OnDisable()
         {
-            OnApplicationPause(true);
+            if (isRunning)
+            {
+                ToggleMicStream(true);
+            }
         }
 
         private void OnEnable()
         {
-            OnApplicationPause(false);
+            if (isRunning)
+            {
+                ToggleMicStream(false);
+            }
         }
-#endif
     }
 }
