Refactor voice receiving

Documentation/guides/basic-concepts/Voice/VoiceModule.cs

@@ -129,7 +129,6 @@ public async Task<string> EchoAsync()
             voiceState.ChannelId.GetValueOrDefault(),
             new VoiceClientConfiguration
             {
-                ReceiveHandler = new VoiceReceiveHandler(), // Required to receive voice
                 Logger = new ConsoleLogger(),
             });
 
@@ -141,14 +140,9 @@ public async Task<string> EchoAsync()
 
         voiceClient.VoiceReceive += args =>
         {
-            // If the timestamp is null, the packet was lost.
-            // We skip it, which mirrors the packet loss to the echo recipients.
-            if (args.Timestamp is not { } timestamp)
-                return default;
-
-            // Pass current user voice directly to SendAsync to create echo
+            // Send the received voice back if the received voice is from the user that invoked the command
             if (voiceClient.Cache.SsrcUsers.TryGetValue(args.Ssrc, out var voiceUserId) && voiceUserId == userId)
-                voiceClient.SendVoice(args.SequenceNumber, timestamp, args.Frame);
+                voiceClient.SendVoice(args.SequenceNumber, args.Timestamp, args.Frame);
 
             return default;
         };

Documentation/guides/basic-concepts/voice.md

@@ -13,4 +13,4 @@ Follow the [installation guide](installing-native-dependencies.md) to install th
 [!code-cs[VoiceModule.cs](Voice/VoiceModule.cs#L13-L110)]
 
 ### Receiving Voice
-[!code-cs[VoiceModule.cs](Voice/VoiceModule.cs#L112-L158)]
+[!code-cs[VoiceModule.cs](Voice/VoiceModule.cs#L112-L152)]

NetCord/Gateway/Voice/EventArgs/VoiceReceiveEventArgs.cs

@@ -1,26 +1,35 @@
+using System.Runtime.InteropServices;
+
 namespace NetCord.Gateway.Voice;
 
-public readonly ref struct VoiceReceiveEventArgs(byte[]? buffer, int frameIndex, int frameLength, uint ssrc, uint? timestamp, ushort sequenceNumber)
+[StructLayout(LayoutKind.Auto)]
+public readonly ref struct VoiceReceiveEventArgs
 {
-    internal readonly byte[]? _buffer = buffer;
+    public VoiceReceiveEventArgs(ReadOnlySpan<byte> frame, uint ssrc, uint timestamp, ushort sequenceNumber)
+    {
+        Frame = frame;
+        Ssrc = ssrc;
+        Timestamp = timestamp;
+        SequenceNumber = sequenceNumber;
+    }
 
     /// <summary>
     /// The voice frame data.
     /// </summary>
-    public ReadOnlySpan<byte> Frame => new(_buffer, frameIndex, frameLength);
+    public readonly ReadOnlySpan<byte> Frame { get; }
 
     /// <summary>
     /// The synchronization source (SSRC) of the sender of the voice frame.
     /// </summary>
-    public uint Ssrc => ssrc;
+    public readonly uint Ssrc { get; }
 
     /// <summary>
-    /// The timestamp of the voice frame. <see langword="null"/> when the frame was lost.
+    /// The timestamp of the voice frame.
     /// </summary>
-    public uint? Timestamp => timestamp;
+    public readonly uint Timestamp { get; }
 
     /// <summary>
     /// The sequence number of the voice frame.
     /// </summary>
-    public ushort SequenceNumber => sequenceNumber;
+    public readonly ushort SequenceNumber { get; }
 }

NetCord/Gateway/Voice/OpusDecoder.cs

@@ -33,12 +33,13 @@ public OpusDecoder(VoiceChannels channels)
     /// <param name="data">Input payload. Use <see langword="null"/> to indicate packet loss.</param>
     /// <param name="pcm">Output signal.</param>
     /// <param name="frameSize">Number of samples per channel in the output signal.</param>
+    /// <param name="decodeFec">Whether to decode using forward error correction data, if available.</param>
     /// <returns>The number of decoded samples per channel.</returns>
-    public int Decode(ReadOnlySpan<byte> data, Span<byte> pcm, int frameSize)
+    public int Decode(ReadOnlySpan<byte> data, Span<byte> pcm, int frameSize, bool decodeFec)
     {
         ValidatePcm(pcm.Length, frameSize, PcmFormat.Short, _channels, nameof(pcm));
 
-        int result = OpusDecode(_decoder, data, data.Length, pcm, frameSize, 0);
+        int result = OpusDecode(_decoder, data, data.Length, pcm, frameSize, decodeFec ? 1 : 0);
 
         ValidateResult(result);
 
@@ -51,10 +52,11 @@ public int Decode(ReadOnlySpan<byte> data, Span<byte> pcm, int frameSize)
     /// <param name="data">Input payload. Use <see langword="null"/> to indicate packet loss.</param>
     /// <param name="pcm">Output signal.</param>
     /// <param name="frameSize">Number of samples per channel in the output signal.</param>
+    /// <param name="decodeFec">Whether to decode using forward error correction data, if available.</param>
     /// <returns>The number of decoded samples per channel.</returns>
-    public int Decode(ReadOnlySpan<byte> data, Span<short> pcm, int frameSize)
+    public int Decode(ReadOnlySpan<byte> data, Span<short> pcm, int frameSize, bool decodeFec)
     {
-        return Decode(data, MemoryMarshal.AsBytes(pcm), frameSize);
+        return Decode(data, MemoryMarshal.AsBytes(pcm), frameSize, decodeFec);
     }
 
     /// <summary>
@@ -63,12 +65,13 @@ public int Decode(ReadOnlySpan<byte> data, Span<short> pcm, int frameSize)
     /// <param name="data">Input payload. Use <see langword="null"/> to indicate packet loss.</param>
     /// <param name="pcm">Output signal.</param>
     /// <param name="frameSize">Number of samples per channel in the output signal.</param>
+    /// <param name="decodeFec">Whether to decode using forward error correction data, if available.</param>
     /// <returns>The number of decoded samples per channel.</returns>
-    public int DecodeFloat(ReadOnlySpan<byte> data, Span<byte> pcm, int frameSize)
+    public int DecodeFloat(ReadOnlySpan<byte> data, Span<byte> pcm, int frameSize, bool decodeFec)
     {
         ValidatePcm(pcm.Length, frameSize, PcmFormat.Float, _channels, nameof(pcm));
 
-        int result = OpusDecodeFloat(_decoder, data, data.Length, pcm, frameSize, 0);
+        int result = OpusDecodeFloat(_decoder, data, data.Length, pcm, frameSize, decodeFec ? 1 : 0);
 
         ValidateResult(result);
 
@@ -81,10 +84,11 @@ public int DecodeFloat(ReadOnlySpan<byte> data, Span<byte> pcm, int frameSize)
     /// <param name="data">Input payload. Use <see langword="null"/> to indicate packet loss.</param>
     /// <param name="pcm">Output signal.</param>
     /// <param name="frameSize">Number of samples per channel in the output signal.</param>
+    /// <param name="decodeFec">Whether to decode using forward error correction data, if available.</param>
     /// <returns>The number of decoded samples per channel.</returns>
-    public int DecodeFloat(ReadOnlySpan<byte> data, Span<float> pcm, int frameSize)
+    public int DecodeFloat(ReadOnlySpan<byte> data, Span<float> pcm, int frameSize, bool decodeFec)
     {
-        return DecodeFloat(data, MemoryMarshal.AsBytes(pcm), frameSize);
+        return DecodeFloat(data, MemoryMarshal.AsBytes(pcm), frameSize, decodeFec);
     }
 
     public void Dispose()

NetCord/Gateway/Voice/Streams/OpusDecodeStream.cs

@@ -36,12 +36,12 @@ public OpusDecodeStream(Stream next, PcmFormat format, VoiceChannels channels, b
 
     private int Decode(ReadOnlySpan<byte> data, Span<byte> pcm)
     {
-        return _decoder.Decode(data, pcm, _frameSize);
+        return _decoder.Decode(data, pcm, _frameSize, false);
     }
 
     private int DecodeFloat(ReadOnlySpan<byte> data, Span<byte> pcm)
     {
-        return _decoder.DecodeFloat(data, pcm, _frameSize);
+        return _decoder.DecodeFloat(data, pcm, _frameSize, false);
     }
 
     public override async ValueTask WriteAsync(ReadOnlyMemory<byte> buffer, CancellationToken cancellationToken = default)