livekit · cloudwebrtc · Feb 5, 2025 · Dec 19, 2024
diff --git a/Runtime/Scripts/AudioStream.cs b/Runtime/Scripts/AudioStream.cs
@@ -10,16 +10,17 @@ namespace LiveKit
     public class AudioStream
     {
         internal readonly FfiHandle Handle;
-        private AudioSource _audioSource;
-        private AudioFilter _audioFilter;
+        public RtcAudioSource AudioSource { get; private set; }
         private RingBuffer _buffer;
         private short[] _tempBuffer;
         private uint _numChannels;
         private uint _sampleRate;
         private AudioResampler _resampler = new AudioResampler();
         private object _lock = new object();
 
-        public AudioStream(IAudioTrack audioTrack, AudioSource source)
+        public AudioStream(IAudioTrack audioTrack, AudioSource source) : this(audioTrack, new BasicAudioSource(source)) { }
+
+        public AudioStream(IAudioTrack audioTrack, RtcAudioSource source)
         {
             if (!audioTrack.Room.TryGetTarget(out var room))
                 throw new InvalidOperationException("audiotrack's room is invalid");
@@ -40,12 +41,10 @@ public AudioStream(IAudioTrack audioTrack, AudioSource source)
             UpdateSource(source);
         }
 
-        private void UpdateSource(AudioSource source)
+        private void UpdateSource(RtcAudioSource source)
         {
-            _audioSource = source;
-            _audioFilter = source.gameObject.AddComponent<AudioFilter>();
-            //_audioFilter.hideFlags = HideFlags.HideInInspector;
-            _audioFilter.AudioRead += OnAudioRead;
+            AudioSource = source;
+            AudioSource.AudioRead += OnAudioRead;
             source.Play();
         }
 

diff --git a/Runtime/Scripts/BasicAudioSource.cs b/Runtime/Scripts/BasicAudioSource.cs
@@ -0,0 +1,36 @@
+using System;
+using UnityEngine;
+
+namespace LiveKit
+{
+    public class BasicAudioSource : RtcAudioSource
+    {
+        protected readonly AudioSource Source;
+        private readonly AudioFilter _audioFilter;
+
+        public override event Action<float[], int, int> AudioRead;
+
+        public BasicAudioSource(AudioSource source, int channels = 2, RtcAudioSourceType sourceType = RtcAudioSourceType.AudioSourceCustom) : base(channels, sourceType)
+        {
+            Source = source;
+            _audioFilter = Source.gameObject.AddComponent<AudioFilter>();
+        }
+
+        private void OnAudioRead(float[] data, int channels, int sampleRate)
+        {
+            AudioRead?.Invoke(data, channels, sampleRate);
+        }
+
+        public override void Play()
+        {
+            _audioFilter.AudioRead += OnAudioRead;
+            Source.Play();
+        }
+
+        public override void Stop()
+        {
+            _audioFilter.AudioRead -= OnAudioRead;
+            Source.Stop();
+        }
+    }
+}
diff --git a/Runtime/Scripts/BasicAudioSource.cs.meta b/Runtime/Scripts/BasicAudioSource.cs.meta
diff --git a/Runtime/Scripts/MicrophoneSource.cs b/Runtime/Scripts/MicrophoneSource.cs
@@ -0,0 +1,27 @@
+using System.Collections;
+using UnityEngine;
+
+namespace LiveKit
+{
+    public class MicrophoneSource : BasicAudioSource
+    {
+        private string _deviceName;
+
+        public MicrophoneSource(AudioSource source) : base(source, 2, RtcAudioSourceType.AudioSourceMicrophone)
+        {
+        }
+
+        public void Configure(string device, bool loop, int lenghtSec, int frequency)
+        {
+            _deviceName = device;
+            Source.clip = Microphone.Start(device, loop, lenghtSec, frequency);
+            Source.loop = true;
+        }
+
+        public override IEnumerator Prepare(float timeout = 0)
+        {
+            return new WaitUntil(() => Microphone.GetPosition(_deviceName) > 0);
+        }
+
+    }
+}
diff --git a/Runtime/Scripts/MicrophoneSource.cs.meta b/Runtime/Scripts/MicrophoneSource.cs.meta
diff --git a/Runtime/Scripts/AudioSource.cs → Runtime/Scripts/RtcAudioSource.cs b/Runtime/Scripts/AudioSource.cs → Runtime/Scripts/RtcAudioSource.cs
@@ -1,10 +1,9 @@
 using System;
-using UnityEngine;
+using System.Collections;
 using LiveKit.Proto;
 using LiveKit.Internal;
 using System.Threading;
 using LiveKit.Internal.FFIClients.Requests;
-using System.Collections.Generic;
 
 namespace LiveKit
 {
@@ -16,8 +15,12 @@ public enum RtcAudioSourceType
         AudioSourceMicrophone = 1,
     }
 
-    public class RtcAudioSource : IRtcSource
+    public abstract class RtcAudioSource : IRtcSource
     {
+        public abstract event Action<float[], int, int> AudioRead;
+        public virtual IEnumerator Prepare(float timeout = 0) { yield break;  }
+        public abstract void Play();
+
 #if UNITY_IOS
         // iOS microphone sample rate is 24k,
         // please make sure when you using 
@@ -35,28 +38,24 @@ public class RtcAudioSource : IRtcSource
 
         public RtcAudioSourceType SourceType => _sourceType;
 
-        private AudioSource _audioSource;
-        private AudioFilter _audioFilter;
-
         internal readonly FfiHandle Handle;
         protected AudioSourceInfo _info;
 
-        // Used on the AudioThread
+        // Possibly used on the AudioThread
         private Thread _readAudioThread;
         private ThreadSafeQueue<AudioFrame> _frameQueue = new ThreadSafeQueue<AudioFrame>();
 
         private bool _muted = false;
-
         public override bool Muted => _muted;
 
-        public RtcAudioSource(AudioSource source, RtcAudioSourceType audioSourceType = RtcAudioSourceType.AudioSourceCustom)
+        protected RtcAudioSource(int channels = 2, RtcAudioSourceType audioSourceType = RtcAudioSourceType.AudioSourceCustom)
         {
             _sourceType = audioSourceType;
 
             using var request = FFIBridge.Instance.NewRequest<NewAudioSourceRequest>();
             var newAudioSource = request.request;
             newAudioSource.Type = AudioSourceType.AudioSourceNative;
-            newAudioSource.NumChannels = DefaultChannels;
+            newAudioSource.NumChannels = (uint)channels;
             if(_sourceType == RtcAudioSourceType.AudioSourceMicrophone)
             {
                 newAudioSource.SampleRate = DefaultMirophoneSampleRate;
@@ -73,7 +72,12 @@ public RtcAudioSource(AudioSource source, RtcAudioSourceType audioSourceType = R
             FfiResponse res = response;
             _info = res.NewAudioSource.Source.Info;
             Handle = FfiHandle.FromOwnedHandle(res.NewAudioSource.Source.Handle);
-            UpdateSource(source);
+        }
+
+        public IEnumerator PrepareAndStart()
+        {
+            yield return Prepare();
+            Start();
         }
 
         public void Start()
@@ -82,16 +86,14 @@ public void Start()
             _readAudioThread = new Thread(Update);
             _readAudioThread.Start();
 
-            _audioFilter.AudioRead += OnAudioRead;
-            while (!(Microphone.GetPosition(null) > 0)) { }
-            _audioSource.Play();
+            AudioRead += OnAudioRead;
+            Play();
         }
 
-        public void Stop()
+        public virtual void Stop()
         {
             _readAudioThread?.Abort();
-            if(_audioFilter) _audioFilter.AudioRead -= OnAudioRead;
-            if(_audioSource && _audioSource.isPlaying) _audioSource.Stop();
+            AudioRead -= OnAudioRead;
         }
 
         private void Update()
@@ -115,7 +117,6 @@ static short FloatToS16(float v)
                 v = Math.Max(v, -32768f);
                 return (short)(v + Math.Sign(v) * 0.5f);
             }
-
             unsafe
             {
                 var frameData = new Span<short>(frame.Data.ToPointer(), frame.Length / sizeof(short));
@@ -132,7 +133,6 @@ static short FloatToS16(float v)
             _frameQueue.Enqueue(frame);
         }
 
-
         private void ReadAudio()
         {
             while (_frameQueue.Count > 0)
@@ -169,15 +169,10 @@ private void ReadAudio()
             }
         }
 
-        private void UpdateSource(AudioSource source)
-        {
-            _audioSource = source;
-            _audioFilter = source.gameObject.AddComponent<AudioFilter>();
-        }
-
         public override void SetMute(bool muted)
         {
             _muted = muted;
         }
+
     }
 }
diff --git a/Runtime/Scripts/AudioSource.cs.meta → Runtime/Scripts/RtcAudioSource.cs.meta b/Runtime/Scripts/AudioSource.cs.meta → Runtime/Scripts/RtcAudioSource.cs.meta