这是indexloc提供的服务，不要输入任何密码
Skip to content

Add Type for RtcAudioSource. #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 3, 2024
Merged

Add Type for RtcAudioSource. #41

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7910538
Set a special sample rate for the iOS microphone.
cloudwebrtc Jul 2, 2024
4411636
fix.
cloudwebrtc Jul 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 35 additions & 5 deletions Runtime/Scripts/AudioSource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,33 @@

namespace LiveKit
{
public enum RtcAudioSourceType
{
AudioSourceCustom = 0,
// if the source is a microphone,
// we don't want to play the audio locally
AudioSourceMicrophone = 1,
}

public class RtcAudioSource
{
#if UNITY_IOS
public static uint DefaultSampleRate = 24000;
// iOS microphone sample rate is 24k,
// please make sure when you using
// sourceType is AudioSourceMicrophone
public static uint DefaultMirophoneSampleRate = 24000;

public static uint DefaultSampleRate = 48000;
#else
public static uint DefaultSampleRate = 48000;
public static uint DefaultMirophoneSampleRate = DefaultSampleRate;
#endif
public static uint DefaultChannels = 2;

private RtcAudioSourceType _sourceType;

public RtcAudioSourceType SourceType => _sourceType;

private AudioSource _audioSource;
private AudioFilter _audioFilter;

Expand All @@ -27,13 +45,22 @@ public class RtcAudioSource
private Thread _readAudioThread;
private ThreadSafeQueue<AudioFrame> _frameQueue = new ThreadSafeQueue<AudioFrame>();

public RtcAudioSource(AudioSource source)
public RtcAudioSource(AudioSource source, 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.SampleRate = DefaultSampleRate;
if(_sourceType == RtcAudioSourceType.AudioSourceMicrophone)
{
newAudioSource.SampleRate = DefaultMirophoneSampleRate;
}
else
{
newAudioSource.SampleRate = DefaultSampleRate;
}
newAudioSource.Options = request.TempResource<AudioSourceOptions>();
newAudioSource.Options.EchoCancellation = true;
newAudioSource.Options.AutoGainControl = true;
Expand Down Expand Up @@ -93,8 +120,11 @@ static short FloatToS16(float v)
{
frameData[i] = FloatToS16(data[i]);
}
// Don't play the audio locally
Array.Clear(data, 0, data.Length);
if (_sourceType == RtcAudioSourceType.AudioSourceMicrophone)
{
// Don't play the audio locally, to avoid echo.
Array.Clear(data, 0, data.Length);
}
}
_frameQueue.Enqueue(frame);
}
Expand Down