Skip to content

Commit 9a3b76f

Browse files
dooly123dooly123
committed
more cleanup
1 parent d624f0b commit 9a3b76f

6 files changed

Lines changed: 36 additions & 155 deletions

File tree

‎Basis/Packages/com.basis.framework/BasisUI/Menus/Main Menu Providers/IndividualPlayerPanelUpdater.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ public class IndividualPlayerPanelUpdater : MonoBehaviour
1919
// Audio debug fields
2020
public PanelElementDescriptor AudioSourceField;
2121
public PanelElementDescriptor VolumeChainField;
22-
public PanelElementDescriptor RingBufferField;
23-
public PanelElementDescriptor JitterBufferField;
22+
public PanelElementDescriptor DecodedBufferField;
23+
public PanelElementDescriptor EncodedBufferField;
2424
public PanelElementDescriptor SilenceField;
2525
public PanelElementDescriptor VisemeField;
2626

@@ -237,7 +237,7 @@ private void UpdateAudioDebugFields()
237237
}
238238

239239
// Voice Buffer (combined jitter + decoded)
240-
if (RingBufferField != null && BasisSettingsDefaults.AudioDebugShowRingBuffer.RawValue)
240+
if (DecodedBufferField != null && BasisSettingsDefaults.AudioDebugShowRingBuffer.RawValue)
241241
{
242242
BasisVoiceBuffer buf = audio.VoiceBuffer;
243243
if (buf != null)
@@ -248,17 +248,17 @@ private void UpdateAudioDebugFields()
248248
float ms = samples * 1000f / RemoteOpusSettings.NetworkSampleRate;
249249
string state = buf.IsEmpty ? "EMPTY" : frames >= cap ? "FULL" : "Streaming";
250250

251-
RingBufferField.SetDescription(
251+
DecodedBufferField.SetDescription(
252252
$"Frames: {frames}/{cap} | {ms:F1}ms buffered\n" +
253253
$"Real Audio: {(buf.HasRealAudio ? "Yes" : "No")} | State: {state}");
254254
}
255255
else
256256
{
257-
RingBufferField.SetDescription("Voice Buffer: NULL");
257+
DecodedBufferField.SetDescription("Voice Buffer: NULL");
258258
}
259259
}
260260

261-
if (JitterBufferField != null && BasisSettingsDefaults.AudioDebugShowJitter.RawValue)
261+
if (EncodedBufferField != null && BasisSettingsDefaults.AudioDebugShowJitter.RawValue)
262262
{
263263
BasisVoiceBuffer buf = audio.VoiceBuffer;
264264
if (buf != null)
@@ -270,14 +270,14 @@ private void UpdateAudioDebugFields()
270270
: received < depth ? $"FILLING ({received}/{depth})"
271271
: "Playing";
272272

273-
JitterBufferField.SetDescription(
273+
EncodedBufferField.SetDescription(
274274
$"Started: {(buf.Started ? "Yes" : "No")} | Buffered: {buffered} | Received: {received}\n" +
275275
$"Init Depth: {depth} | Status: {status}\n" +
276276
$"PLC: {audio.PlcCount} | Silence Skipped: {audio.SilenceInjectedCount}");
277277
}
278278
else
279279
{
280-
JitterBufferField.SetDescription("Voice Buffer: NULL");
280+
EncodedBufferField.SetDescription("Voice Buffer: NULL");
281281
}
282282
}
283283

@@ -307,8 +307,8 @@ private void SetAudioDebugAll(string message)
307307
{
308308
if (AudioSourceField != null) AudioSourceField.SetDescription(message);
309309
if (VolumeChainField != null) VolumeChainField.SetDescription(message);
310-
if (RingBufferField != null) RingBufferField.SetDescription(message);
311-
if (JitterBufferField != null) JitterBufferField.SetDescription(message);
310+
if (DecodedBufferField != null) DecodedBufferField.SetDescription(message);
311+
if (EncodedBufferField != null) EncodedBufferField.SetDescription(message);
312312
if (SilenceField != null) SilenceField.SetDescription(message);
313313
if (VisemeField != null) VisemeField.SetDescription(message);
314314
}

‎Basis/Packages/com.basis.framework/BasisUI/Menus/Main Menu Providers/IndividualPlayerProvider.cs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -772,8 +772,8 @@ void UpdateVolumeNote(float v)
772772
// Create all the audio debug fields
773773
PanelElementDescriptor audioSourceField = null;
774774
PanelElementDescriptor volumeChainField = null;
775-
PanelElementDescriptor ringBufferField = null;
776-
PanelElementDescriptor jitterBufferField = null;
775+
PanelElementDescriptor decodedBufferField = null;
776+
PanelElementDescriptor encodedBufferField = null;
777777
PanelElementDescriptor silenceField = null;
778778
PanelElementDescriptor visemeField = null;
779779

@@ -797,16 +797,16 @@ void CreateAudioDebugFields()
797797

798798
if (BasisSettingsDefaults.AudioDebugShowRingBuffer.RawValue)
799799
{
800-
ringBufferField = PanelElementDescriptor.CreateNew(PanelElementDescriptor.ElementStyles.Group, audioDebugGroup.ContentParent);
801-
ringBufferField.SetTitle("Ring Buffer");
802-
ringBufferField.SetDescription("...");
800+
decodedBufferField = PanelElementDescriptor.CreateNew(PanelElementDescriptor.ElementStyles.Group, audioDebugGroup.ContentParent);
801+
decodedBufferField.SetTitle("Decoded PCM");
802+
decodedBufferField.SetDescription("...");
803803
}
804804

805805
if (BasisSettingsDefaults.AudioDebugShowJitter.RawValue)
806806
{
807-
jitterBufferField = PanelElementDescriptor.CreateNew(PanelElementDescriptor.ElementStyles.Group, audioDebugGroup.ContentParent);
808-
jitterBufferField.SetTitle("Jitter Buffer");
809-
jitterBufferField.SetDescription("...");
807+
encodedBufferField = PanelElementDescriptor.CreateNew(PanelElementDescriptor.ElementStyles.Group, audioDebugGroup.ContentParent);
808+
encodedBufferField.SetTitle("Encoded Packets");
809+
encodedBufferField.SetDescription("...");
810810
}
811811

812812
if (BasisSettingsDefaults.AudioDebugShowSilence.RawValue)
@@ -841,8 +841,8 @@ void CreateAudioDebugFields()
841841
// Wire audio debug fields
842842
updater.AudioSourceField = audioSourceField;
843843
updater.VolumeChainField = volumeChainField;
844-
updater.RingBufferField = ringBufferField;
845-
updater.JitterBufferField = jitterBufferField;
844+
updater.DecodedBufferField = decodedBufferField;
845+
updater.EncodedBufferField = encodedBufferField;
846846
updater.SilenceField = silenceField;
847847
updater.VisemeField = visemeField;
848848

@@ -852,8 +852,8 @@ void CreateAudioDebugFields()
852852
// Destroy existing fields
853853
if (audioSourceField != null) { UnityEngine.Object.Destroy(audioSourceField.gameObject); audioSourceField = null; }
854854
if (volumeChainField != null) { UnityEngine.Object.Destroy(volumeChainField.gameObject); volumeChainField = null; }
855-
if (ringBufferField != null) { UnityEngine.Object.Destroy(ringBufferField.gameObject); ringBufferField = null; }
856-
if (jitterBufferField != null) { UnityEngine.Object.Destroy(jitterBufferField.gameObject); jitterBufferField = null; }
855+
if (decodedBufferField != null) { UnityEngine.Object.Destroy(decodedBufferField.gameObject); decodedBufferField = null; }
856+
if (encodedBufferField != null) { UnityEngine.Object.Destroy(encodedBufferField.gameObject); encodedBufferField = null; }
857857
if (silenceField != null) { UnityEngine.Object.Destroy(silenceField.gameObject); silenceField = null; }
858858
if (visemeField != null) { UnityEngine.Object.Destroy(visemeField.gameObject); visemeField = null; }
859859

@@ -865,8 +865,8 @@ void CreateAudioDebugFields()
865865
// Re-wire updater references
866866
updater.AudioSourceField = audioSourceField;
867867
updater.VolumeChainField = volumeChainField;
868-
updater.RingBufferField = ringBufferField;
869-
updater.JitterBufferField = jitterBufferField;
868+
updater.DecodedBufferField = decodedBufferField;
869+
updater.EncodedBufferField = encodedBufferField;
870870
updater.SilenceField = silenceField;
871871
updater.VisemeField = visemeField;
872872
};

‎Basis/Packages/com.basis.framework/Networking/Compression/BasisOpusSettings.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,5 @@ public static class RemoteOpusSettings
6868
public static int SampleLength => NetworkSampleRate * Channels;
6969
//960 a single frame in opus. in unity it is 1024 for audio playback
7070
public static int FrameSize => Mathf.CeilToInt(SharedOpusSettings.DesiredDurationInSeconds * NetworkSampleRate);
71-
public static int TotalFrameBufferSize => FrameSize * AdditionalStoredBufferData;
72-
73-
public static int AdditionalStoredBufferData = 16;
7471
public static int JitterBufferSize = 5;
7572
}

‎Basis/Packages/com.basis.framework/Networking/Recievers/BasisAudioReceiver.cs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -433,9 +433,13 @@ public void OnAudioFilterRead(float[] data, int channels, int length)
433433
}
434434

435435
if (RemoteOpusSettings.NetworkSampleRate == _cachedOutputRate)
436+
{
436437
ProcessNoResample(data, frames, channels);
438+
}
437439
else
440+
{
438441
ProcessResample(data, frames, channels);
442+
}
439443
}
440444

441445
private void EnsureCapacity(ref float[] buf, int needed)
@@ -455,15 +459,19 @@ private void ProcessNoResample(float[] data, int frames, int channels)
455459

456460
// Zero-fill any shortfall
457461
if (read < frames)
462+
{
458463
Array.Clear(_inputScratch, read, frames - read);
464+
}
459465

460466
float dampen = DirectionalDampeningMultiplier;
461467
int idx = 0;
462468
for (int f = 0; f < frames; f++)
463469
{
464470
float sample = FastClamp(_inputScratch[f] * dampen);
465471
for (int c = 0; c < channels; c++)
472+
{
466473
data[idx++] = sample;
474+
}
467475
}
468476
}
469477

@@ -485,7 +493,9 @@ private void ProcessResample(float[] data, int frames, int channels)
485493

486494
int read = VoiceBuffer.ReadPcm(_inputScratch, neededFrames);
487495
if (read < neededFrames)
496+
{
488497
Array.Clear(_inputScratch, read, neededFrames - read);
498+
}
489499

490500
double phase = 0.0;
491501
double step = ratio;
@@ -511,7 +521,9 @@ private void ProcessResample(float[] data, int frames, int channels)
511521
{
512522
float sample = FastClamp(_resampleScratch[f] * dampen);
513523
for (int c = 0; c < channels; c++)
524+
{
514525
data[idx++] = sample;
526+
}
515527
}
516528
}
517529
}

‎Basis/Packages/com.basis.framework/Networking/Recievers/BasisJitterBuffer.cs‎

Lines changed: 0 additions & 126 deletions
This file was deleted.

‎Basis/Packages/com.basis.framework/Networking/Recievers/BasisJitterBuffer.cs.meta‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)