Disable FEC (#2670)

* Remove incorrect usage of FEC * Return instead of await
discord-net · Apr 18, 2023 · 2be9b00 · 2be9b00
1 parent d5ba7d2
commit 2be9b00
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 18 deletions.
diff --git a/src/Discord.Net.WebSocket/Audio/Opus/OpusCtl.cs b/src/Discord.Net.WebSocket/Audio/Opus/OpusCtl.cs
@@ -5,7 +5,6 @@ internal enum OpusCtl : int
     {
         SetBitrate = 4002,
         SetBandwidth = 4008,
-        SetInbandFEC = 4012,
         SetPacketLossPercent = 4014,
         SetSignal = 4024
     }

diff --git a/src/Discord.Net.WebSocket/Audio/Opus/OpusEncoder.cs b/src/Discord.Net.WebSocket/Audio/Opus/OpusEncoder.cs
@@ -49,7 +49,6 @@ public OpusEncoder(int bitrate, AudioApplication application, int packetLoss)
             CheckError(error);
             CheckError(EncoderCtl(_ptr, OpusCtl.SetSignal, (int)opusSignal));
             CheckError(EncoderCtl(_ptr, OpusCtl.SetPacketLossPercent, packetLoss)); //%
-            CheckError(EncoderCtl(_ptr, OpusCtl.SetInbandFEC, 1)); //True
             CheckError(EncoderCtl(_ptr, OpusCtl.SetBitrate, bitrate));
         }
 

diff --git a/src/Discord.Net.WebSocket/Audio/Streams/OpusDecodeStream.cs b/src/Discord.Net.WebSocket/Audio/Streams/OpusDecodeStream.cs
@@ -34,27 +34,17 @@ public override void WriteHeader(ushort seq, uint timestamp, bool missed)
         }
 
         /// <exception cref="InvalidOperationException">Received payload without an RTP header.</exception>
-        public override async Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancelToken)
+        public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancelToken)
         {
             if (!_hasHeader)
                 throw new InvalidOperationException("Received payload without an RTP header.");
             _hasHeader = false;
 
-            if (!_nextMissed)
-            {
-                count = _decoder.DecodeFrame(buffer, offset, count, _buffer, 0, false);
-                await _next.WriteAsync(_buffer, 0, count, cancelToken).ConfigureAwait(false);
-            }
-            else if (count > 0)
-            {
-                count = _decoder.DecodeFrame(buffer, offset, count, _buffer, 0, true);
-                await _next.WriteAsync(_buffer, 0, count, cancelToken).ConfigureAwait(false);
-            }
-            else
-            {
-                count = _decoder.DecodeFrame(null, 0, 0, _buffer, 0, true);
-                await _next.WriteAsync(_buffer, 0, count, cancelToken).ConfigureAwait(false);
-            }
+            count = !_nextMissed || count > 0
+                ? _decoder.DecodeFrame(buffer, offset, count, _buffer, 0, false)
+                : _decoder.DecodeFrame(null, 0, 0, _buffer, 0, false);
+
+            return _next.WriteAsync(_buffer, 0, count, cancelToken);
         }
 
         public override async Task FlushAsync(CancellationToken cancelToken)