Skip to content

Commit 8aebf95

Browse files
committed
Added new VAD, + code refactoring
via https://raw.githubusercontent.com/Macoron/whisper.unity/275406258aca21fe7753cf0724a65f06fd464eea/Packages/com.whisper.unity/Runtime/Utils/AudioUtils.cs thanks for the suggestion, yosun also split AudioController into smaller separate classes for easier maintenance
1 parent 37459a1 commit 8aebf95

15 files changed

+871
-476
lines changed

Assets/Prefabs/DemoIntegration.prefab

+139-1
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,140 @@ MonoBehaviour:
134134
m_hasFontAssetChanged: 0
135135
m_baseMaterial: {fileID: 0}
136136
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
137+
--- !u!1 &348816848496444118
138+
GameObject:
139+
m_ObjectHideFlags: 0
140+
m_CorrespondingSourceObject: {fileID: 0}
141+
m_PrefabInstance: {fileID: 0}
142+
m_PrefabAsset: {fileID: 0}
143+
serializedVersion: 6
144+
m_Component:
145+
- component: {fileID: 4243238183943022742}
146+
- component: {fileID: 3953792458671070900}
147+
- component: {fileID: 2621590784734090863}
148+
m_Layer: 5
149+
m_Name: VADEnergyText
150+
m_TagString: Untagged
151+
m_Icon: {fileID: 0}
152+
m_NavMeshLayer: 0
153+
m_StaticEditorFlags: 0
154+
m_IsActive: 1
155+
--- !u!224 &4243238183943022742
156+
RectTransform:
157+
m_ObjectHideFlags: 0
158+
m_CorrespondingSourceObject: {fileID: 0}
159+
m_PrefabInstance: {fileID: 0}
160+
m_PrefabAsset: {fileID: 0}
161+
m_GameObject: {fileID: 348816848496444118}
162+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
163+
m_LocalPosition: {x: 0, y: 0, z: 0}
164+
m_LocalScale: {x: 1, y: 1, z: 1}
165+
m_ConstrainProportionsScale: 0
166+
m_Children: []
167+
m_Father: {fileID: 5337751238952555557}
168+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
169+
m_AnchorMin: {x: 0, y: 1}
170+
m_AnchorMax: {x: 0, y: 1}
171+
m_AnchoredPosition: {x: 868, y: -209.6}
172+
m_SizeDelta: {x: 60, y: 32}
173+
m_Pivot: {x: 0.5, y: 0.5}
174+
--- !u!222 &3953792458671070900
175+
CanvasRenderer:
176+
m_ObjectHideFlags: 0
177+
m_CorrespondingSourceObject: {fileID: 0}
178+
m_PrefabInstance: {fileID: 0}
179+
m_PrefabAsset: {fileID: 0}
180+
m_GameObject: {fileID: 348816848496444118}
181+
m_CullTransparentMesh: 1
182+
--- !u!114 &2621590784734090863
183+
MonoBehaviour:
184+
m_ObjectHideFlags: 0
185+
m_CorrespondingSourceObject: {fileID: 0}
186+
m_PrefabInstance: {fileID: 0}
187+
m_PrefabAsset: {fileID: 0}
188+
m_GameObject: {fileID: 348816848496444118}
189+
m_Enabled: 1
190+
m_EditorHideFlags: 0
191+
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
192+
m_Name:
193+
m_EditorClassIdentifier:
194+
m_Material: {fileID: 0}
195+
m_Color: {r: 1, g: 1, b: 1, a: 1}
196+
m_RaycastTarget: 1
197+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
198+
m_Maskable: 1
199+
m_OnCullStateChanged:
200+
m_PersistentCalls:
201+
m_Calls: []
202+
m_text:
203+
m_isRightToLeft: 0
204+
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
205+
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
206+
m_fontSharedMaterials: []
207+
m_fontMaterial: {fileID: 0}
208+
m_fontMaterials: []
209+
m_fontColor32:
210+
serializedVersion: 2
211+
rgba: 4294925056
212+
m_fontColor: {r: 0, g: 0.35566974, b: 1, a: 1}
213+
m_enableVertexGradient: 0
214+
m_colorMode: 3
215+
m_fontColorGradient:
216+
topLeft: {r: 1, g: 1, b: 1, a: 1}
217+
topRight: {r: 1, g: 1, b: 1, a: 1}
218+
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
219+
bottomRight: {r: 1, g: 1, b: 1, a: 1}
220+
m_fontColorGradientPreset: {fileID: 0}
221+
m_spriteAsset: {fileID: 0}
222+
m_tintAllSprites: 0
223+
m_StyleSheet: {fileID: 0}
224+
m_TextStyleHashCode: -1183493901
225+
m_overrideHtmlColors: 0
226+
m_faceColor:
227+
serializedVersion: 2
228+
rgba: 4294967295
229+
m_fontSize: 12
230+
m_fontSizeBase: 12
231+
m_fontWeight: 400
232+
m_enableAutoSizing: 0
233+
m_fontSizeMin: 0
234+
m_fontSizeMax: 0
235+
m_fontStyle: 0
236+
m_HorizontalAlignment: 1
237+
m_VerticalAlignment: 512
238+
m_textAlignment: 65535
239+
m_characterSpacing: 0
240+
m_wordSpacing: 0
241+
m_lineSpacing: 0
242+
m_lineSpacingMax: 0
243+
m_paragraphSpacing: 0
244+
m_charWidthMaxAdj: 0
245+
m_enableWordWrapping: 0
246+
m_wordWrappingRatios: 0.4
247+
m_overflowMode: 0
248+
m_linkedTextComponent: {fileID: 0}
249+
parentLinkedComponent: {fileID: 0}
250+
m_enableKerning: 0
251+
m_enableExtraPadding: 0
252+
checkPaddingRequired: 0
253+
m_isRichText: 1
254+
m_parseCtrlCharacters: 1
255+
m_isOrthographic: 1
256+
m_isCullingEnabled: 0
257+
m_horizontalMapping: 0
258+
m_verticalMapping: 0
259+
m_uvLineOffset: 0
260+
m_geometrySortingOrder: 0
261+
m_IsTextObjectScaleStatic: 0
262+
m_VertexBufferAutoSizeReduction: 0
263+
m_useMaxVisibleDescender: 1
264+
m_pageToDisplay: 1
265+
m_margin: {x: 0, y: 0, z: 0, w: 0}
266+
m_isUsingLegacyAnimationComponent: 0
267+
m_isVolumetricText: 0
268+
m_hasFontAssetChanged: 0
269+
m_baseMaterial: {fileID: 0}
270+
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
137271
--- !u!1 &725768174149704672
138272
GameObject:
139273
m_ObjectHideFlags: 0
@@ -2619,6 +2753,7 @@ RectTransform:
26192753
- {fileID: 9136329686101699382}
26202754
- {fileID: 3417785804709643581}
26212755
- {fileID: 9059768842823625612}
2756+
- {fileID: 4243238183943022742}
26222757
- {fileID: 5444497812387959711}
26232758
- {fileID: 2959617767447010246}
26242759
- {fileID: 5320398551607356139}
@@ -2647,9 +2782,12 @@ MonoBehaviour:
26472782
m_Script: {fileID: 11500000, guid: d24f73bbca3ae4c68b6ff8dde98d452c, type: 3}
26482783
m_Name:
26492784
m_EditorClassIdentifier:
2650-
audioController: {fileID: 0}
2785+
pushToTalkKey: 32
2786+
audioRecorder: {fileID: 0}
2787+
audioPlayer: {fileID: 0}
26512788
eventsText: {fileID: 4026597692773154623}
26522789
conversationText: {fileID: 2825327695736519003}
2790+
vadEnergyText: {fileID: 2621590784734090863}
26532791
pushToTalkButton: {fileID: 2178975479906841517}
26542792
connectButton: {fileID: 8428551282407799376}
26552793
pushToTalkButtonText: {fileID: 751159222626287672}

Assets/Prefabs/RealtimeAPI.prefab

+25-9
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ GameObject:
1010
m_Component:
1111
- component: {fileID: 6875561144310920953}
1212
- component: {fileID: 7521549165741144525}
13-
- component: {fileID: 68441443065667448}
13+
- component: {fileID: 5778159951835551788}
14+
- component: {fileID: 4277790966370773839}
1415
m_Layer: 0
15-
m_Name: AudioController
16+
m_Name: Audio
1617
m_TagString: Untagged
1718
m_Icon: {fileID: 0}
1819
m_NavMeshLayer: 0
@@ -129,7 +130,7 @@ AudioSource:
129130
m_PreInfinity: 2
130131
m_PostInfinity: 2
131132
m_RotationOrder: 4
132-
--- !u!114 &68441443065667448
133+
--- !u!114 &5778159951835551788
133134
MonoBehaviour:
134135
m_ObjectHideFlags: 0
135136
m_CorrespondingSourceObject: {fileID: 0}
@@ -138,15 +139,29 @@ MonoBehaviour:
138139
m_GameObject: {fileID: 5144007666192891506}
139140
m_Enabled: 1
140141
m_EditorHideFlags: 0
141-
m_Script: {fileID: 11500000, guid: 9799235ff1b5f46148fca9921bdef04f, type: 3}
142+
m_Script: {fileID: 11500000, guid: 158779b4cfa684eadbc49287121f2c45, type: 3}
142143
m_Name:
143144
m_EditorClassIdentifier:
144145
listeningMode: 0
145146
sampleRate: 24000
146-
interruptResponseOnNewRecording: 1
147-
vadThreshold: 0.1
148-
vadSilenceDuration: 2
149-
currentVolumeLevel: 0
147+
interruptResponseOnNewRecording: 0
148+
vadEnergyThreshold: 2
149+
vadSilenceDuration: 1.5
150+
vadFreqThreshold: 1
151+
fftSampleSize: 1024
152+
--- !u!114 &4277790966370773839
153+
MonoBehaviour:
154+
m_ObjectHideFlags: 0
155+
m_CorrespondingSourceObject: {fileID: 0}
156+
m_PrefabInstance: {fileID: 0}
157+
m_PrefabAsset: {fileID: 0}
158+
m_GameObject: {fileID: 5144007666192891506}
159+
m_Enabled: 1
160+
m_EditorHideFlags: 0
161+
m_Script: {fileID: 11500000, guid: 10dcd261ab0cf4839a08d9c49ec28b50, type: 3}
162+
m_Name:
163+
m_EditorClassIdentifier:
164+
sampleRate: 24000
150165
fftSampleSize: 1024
151166
--- !u!1 &8086852912749008722
152167
GameObject:
@@ -194,4 +209,5 @@ MonoBehaviour:
194209
m_Name:
195210
m_EditorClassIdentifier:
196211
apiKey:
197-
audioController: {fileID: 68441443065667448}
212+
audioPlayer: {fileID: 4277790966370773839}
213+
audioRecorder: {fileID: 5778159951835551788}

Assets/Scenes/DemoScene.unity

+28-13
Original file line numberDiff line numberDiff line change
@@ -392,17 +392,6 @@ RectTransform:
392392
m_CorrespondingSourceObject: {fileID: 5337751238952555557, guid: fc531736d51444c8280c8d93c32c7c33, type: 3}
393393
m_PrefabInstance: {fileID: 6491429648409679553}
394394
m_PrefabAsset: {fileID: 0}
395-
--- !u!114 &1157521912 stripped
396-
MonoBehaviour:
397-
m_CorrespondingSourceObject: {fileID: 68441443065667448, guid: 5ca84f8d7b82048e4ba92610cbf110e9, type: 3}
398-
m_PrefabInstance: {fileID: 909518194653723852}
399-
m_PrefabAsset: {fileID: 0}
400-
m_GameObject: {fileID: 0}
401-
m_Enabled: 1
402-
m_EditorHideFlags: 0
403-
m_Script: {fileID: 11500000, guid: 9799235ff1b5f46148fca9921bdef04f, type: 3}
404-
m_Name:
405-
m_EditorClassIdentifier:
406395
--- !u!1 &1990000876
407396
GameObject:
408397
m_ObjectHideFlags: 0
@@ -562,6 +551,28 @@ PrefabInstance:
562551
m_AddedGameObjects: []
563552
m_AddedComponents: []
564553
m_SourcePrefab: {fileID: 100100000, guid: 5ca84f8d7b82048e4ba92610cbf110e9, type: 3}
554+
--- !u!114 &909518194653723853 stripped
555+
MonoBehaviour:
556+
m_CorrespondingSourceObject: {fileID: 5778159951835551788, guid: 5ca84f8d7b82048e4ba92610cbf110e9, type: 3}
557+
m_PrefabInstance: {fileID: 909518194653723852}
558+
m_PrefabAsset: {fileID: 0}
559+
m_GameObject: {fileID: 0}
560+
m_Enabled: 1
561+
m_EditorHideFlags: 0
562+
m_Script: {fileID: 11500000, guid: 158779b4cfa684eadbc49287121f2c45, type: 3}
563+
m_Name:
564+
m_EditorClassIdentifier:
565+
--- !u!114 &909518194653723854 stripped
566+
MonoBehaviour:
567+
m_CorrespondingSourceObject: {fileID: 4277790966370773839, guid: 5ca84f8d7b82048e4ba92610cbf110e9, type: 3}
568+
m_PrefabInstance: {fileID: 909518194653723852}
569+
m_PrefabAsset: {fileID: 0}
570+
m_GameObject: {fileID: 0}
571+
m_Enabled: 1
572+
m_EditorHideFlags: 0
573+
m_Script: {fileID: 11500000, guid: 10dcd261ab0cf4839a08d9c49ec28b50, type: 3}
574+
m_Name:
575+
m_EditorClassIdentifier:
565576
--- !u!1001 &6491429648409679553
566577
PrefabInstance:
567578
m_ObjectHideFlags: 0
@@ -859,9 +870,13 @@ PrefabInstance:
859870
value: 0
860871
objectReference: {fileID: 0}
861872
- target: {fileID: 5488567229014774107, guid: fc531736d51444c8280c8d93c32c7c33, type: 3}
862-
propertyPath: audioController
873+
propertyPath: audioPlayer
874+
value:
875+
objectReference: {fileID: 909518194653723854}
876+
- target: {fileID: 5488567229014774107, guid: fc531736d51444c8280c8d93c32c7c33, type: 3}
877+
propertyPath: audioRecorder
863878
value:
864-
objectReference: {fileID: 1157521912}
879+
objectReference: {fileID: 909518194653723853}
865880
- target: {fileID: 5539276234762005852, guid: fc531736d51444c8280c8d93c32c7c33, type: 3}
866881
propertyPath: m_AnchorMax.y
867882
value: 0

Assets/Scripts/Audio.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)