github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More audio cleanup, finished receive streams

Browse Source
This commit is contained in:
RogueException
2017-02-26 13:43:11 -04:00
parent 8e0c65498b
commit 4c2221dacb
11 changed files with 174 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Discord.Net.WebSocket/Audio/Opus/OpusDecoder.cs
View File

@@ -11,6 +11,8 @@ namespace Discord.Audio
private static extern void DestroyDecoder(IntPtr decoder);
[DllImport("opus", EntryPoint = "opus_decode", CallingConvention = CallingConvention.Cdecl)]
private static extern int Decode(IntPtr st, byte* data, int len, byte* pcm, int max_frame_size, int decode_fec);
[DllImport("opus", EntryPoint = "opus_decoder_ctl", CallingConvention = CallingConvention.Cdecl)]
private static extern int DecoderCtl(IntPtr st, OpusCtl request, int value);
public OpusDecoder(int samplingRate, int channels)
: base(samplingRate, channels)

6
src/Discord.Net.WebSocket/Audio/Streams/BufferedWriteStream.cs
View File

@@ -34,6 +34,8 @@ namespace Discord.Audio.Streams
private readonly int _ticksPerFrame, _queueLength;
private bool _isPreloaded;
public BufferedWriteStream(AudioOutStream next, int samplesPerFrame, int bufferMillis, CancellationToken cancelToken, int maxFrameSize = 1500)
: this(next, samplesPerFrame, bufferMillis, cancelToken, null, maxFrameSize) { }
internal BufferedWriteStream(AudioOutStream next, int samplesPerFrame, int bufferMillis, CancellationToken cancelToken, Logger logger, int maxFrameSize = 1500)
{
//maxFrameSize = 1275 was too limiting at 128*1024
@@ -55,7 +57,9 @@ namespace Discord.Audio.Streams
private Task Run()
{
#if DEBUG
uint num = 0;
#endif
return Task.Run(async () =>
{
try
@@ -92,7 +96,7 @@ namespace Discord.Audio.Streams
}
}
else
await Task.Delay((int)(dist - (limit - 1))).ConfigureAwait(false);
await Task.Delay((int)(dist - (limit - 1))/*, _cancelToken*/).ConfigureAwait(false);
}
}
catch (OperationCanceledException) { }

73
src/Discord.Net.WebSocket/Audio/Streams/InputStream.cs Normal file
View File

@@ -0,0 +1,73 @@
using System;
using System.Collections.Concurrent;
using System.Threading;
using System.Threading.Tasks;
namespace Discord.Audio.Streams
{
///<summary> Reads the payload from an RTP frame </summary>
public class InputStream : AudioInStream
{
private ConcurrentQueue<RTPFrame> _frames;
private ushort _nextSeq;
private uint _nextTimestamp;
private bool _hasHeader;
public override bool CanRead => true;
public override bool CanSeek => false;
public override bool CanWrite => true;
public InputStream(byte[] secretKey)
{
_frames = new ConcurrentQueue<RTPFrame>();
}
public override Task<RTPFrame?> ReadFrameAsync(CancellationToken cancelToken)
{
if (_frames.TryDequeue(out var frame))
return Task.FromResult<RTPFrame?>(frame);
return Task.FromResult<RTPFrame?>(null);
}
public override Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancelToken)
{
cancelToken.ThrowIfCancellationRequested();
if (_frames.TryDequeue(out var frame))
{
if (count < frame.Payload.Length)
throw new InvalidOperationException("Buffer is too small.");
Buffer.BlockCopy(frame.Payload, 0, buffer, offset, frame.Payload.Length);
return Task.FromResult(frame.Payload.Length);
}
return Task.FromResult(0);
}
public void WriteHeader(ushort seq, uint timestamp)
{
if (_hasHeader)
throw new InvalidOperationException("Header received with no payload");
_hasHeader = true;
_nextSeq = seq;
_nextTimestamp = timestamp;
}
public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancelToken)
{
cancelToken.ThrowIfCancellationRequested();
if (_frames.Count > 1000)
return Task.Delay(0); //Buffer overloaded
if (_hasHeader)
throw new InvalidOperationException("Received payload with an RTP header");
byte[] payload = new byte[count];
Buffer.BlockCopy(buffer, offset, payload, 0, count);
_frames.Enqueue(new RTPFrame(
sequence: _nextSeq,
timestamp: _nextTimestamp,
payload: payload
));
_hasHeader = false;
return Task.Delay(0);
}
}
}

33
src/Discord.Net.WebSocket/Audio/Streams/OpusDecodeStream.cs
View File

@@ -1,34 +1,35 @@
using System;
using System.Collections.Concurrent;
using System.Threading;
using System.Threading.Tasks;
namespace Discord.Audio.Streams
{
///<summary> Converts Opus to PCM </summary>
public class OpusDecodeStream : AudioInStream
public class OpusDecodeStream : AudioOutStream
{
private readonly BlockingCollection<byte[]> _queuedData; //TODO: Replace with max-length ring buffer
private readonly AudioOutStream _next;
private readonly byte[] _buffer;
private readonly OpusDecoder _decoder;
internal OpusDecodeStream(AudioClient audioClient, int samplingRate, int channels = OpusConverter.MaxChannels, int bufferSize = 4000)
public OpusDecodeStream(AudioOutStream next, int samplingRate, int channels = OpusConverter.MaxChannels, int bufferSize = 4000)
{
_next = next;
_buffer = new byte[bufferSize];
_decoder = new OpusDecoder(samplingRate, channels);
_queuedData = new BlockingCollection<byte[]>(100);
}
public override int Read(byte[] buffer, int offset, int count)
{
var queuedData = _queuedData.Take();
Buffer.BlockCopy(queuedData, 0, buffer, offset, Math.Min(queuedData.Length, count));
return queuedData.Length;
}
public override void Write(byte[] buffer, int offset, int count)
public override async Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
{
count = _decoder.DecodeFrame(buffer, offset, count, _buffer, 0);
var newBuffer = new byte[count];
Buffer.BlockCopy(_buffer, 0, newBuffer, 0, count);
_queuedData.Add(newBuffer);
await _next.WriteAsync(_buffer, 0, count, cancellationToken).ConfigureAwait(false);
}
public override async Task FlushAsync(CancellationToken cancelToken)
{
await _next.FlushAsync(cancelToken).ConfigureAwait(false);
}
public override async Task ClearAsync(CancellationToken cancelToken)
{
await _next.ClearAsync(cancelToken).ConfigureAwait(false);
}
protected override void Dispose(bool disposing)

6
src/Discord.Net.WebSocket/Audio/Streams/OpusEncodeStream.cs
View File

@@ -17,7 +17,7 @@ namespace Discord.Audio.Streams
private byte[] _partialFrameBuffer;
private int _partialFramePos;
internal OpusEncodeStream(AudioOutStream next, int channels, int samplesPerFrame, int bitrate, AudioApplication application, int bufferSize = 4000)
public OpusEncodeStream(AudioOutStream next, int channels, int samplesPerFrame, int bitrate, AudioApplication application, int bufferSize = 4000)
{
_next = next;
_encoder = new OpusEncoder(SampleRate, channels, bitrate, application);
@@ -26,10 +26,6 @@ namespace Discord.Audio.Streams
_partialFrameBuffer = new byte[_frameSize];
}
public override void Write(byte[] buffer, int offset, int count)
{
WriteAsync(buffer, offset, count, CancellationToken.None).GetAwaiter().GetResult();
}
public override async Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
{
//Assume threadsafe

58
src/Discord.Net.WebSocket/Audio/Streams/RTPReadStream.cs
View File

@@ -1,59 +1,49 @@
using System;
using System.Collections.Concurrent;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
namespace Discord.Audio.Streams
{
///<summary> Reads the payload from an RTP frame </summary>
public class RTPReadStream : AudioInStream
public class RTPReadStream : AudioOutStream
{
private readonly BlockingCollection<byte[]> _queuedData; //TODO: Replace with max-length ring buffer
//private readonly BlockingCollection<RTPFrame> _queuedData; //TODO: Replace with max-length ring buffer
private readonly AudioClient _audioClient;
private readonly InputStream _queue;
private readonly AudioOutStream _next;
private readonly byte[] _buffer, _nonce, _secretKey;
public override bool CanRead => true;
public override bool CanSeek => false;
public override bool CanWrite => true;
internal RTPReadStream(AudioClient audioClient, byte[] secretKey, int bufferSize = 4000)
public RTPReadStream(InputStream queue, byte[] secretKey, int bufferSize = 4000)
: this(queue, null, secretKey, bufferSize) { }
public RTPReadStream(InputStream queue, AudioOutStream next, byte[] secretKey, int bufferSize = 4000)
{
_audioClient = audioClient;
_queue = queue;
_next = next;
_secretKey = secretKey;
_buffer = new byte[bufferSize];
_queuedData = new BlockingCollection<byte[]>(100);
_nonce = new byte[24];
}
/*public RTPFrame ReadFrame()
{
var queuedData = _queuedData.Take();
Buffer.BlockCopy(queuedData, 0, buffer, offset, Math.Min(queuedData.Length, count));
return queuedData.Length;
}*/
public override int Read(byte[] buffer, int offset, int count)
public override async Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancelToken)
{
var queuedData = _queuedData.Take();
Buffer.BlockCopy(queuedData, 0, buffer, offset, Math.Min(queuedData.Length, count));
return queuedData.Length;
}
public override void Write(byte[] buffer, int offset, int count)
{
var newBuffer = new byte[count];
Buffer.BlockCopy(buffer, 0, newBuffer, 0, count);
_queuedData.Add(newBuffer);
}
cancelToken.ThrowIfCancellationRequested();
public override void Flush() { throw new NotSupportedException(); }
var payload = new byte[count - 12];
Buffer.BlockCopy(buffer, offset + 12, payload, 0, count - 12);
public override long Length { get { throw new NotSupportedException(); } }
public override long Position
{
get { throw new NotSupportedException(); }
set { throw new NotSupportedException(); }
ushort seq = (ushort)((buffer[offset + 3] << 8) |
(buffer[offset + 2] << 0));
uint timestamp = (uint)((buffer[offset + 4] << 24) |
(buffer[offset + 5] << 16) |
(buffer[offset + 6] << 16) |
(buffer[offset + 7] << 0));
_queue.WriteHeader(seq, timestamp);
await (_next ?? _queue as Stream).WriteAsync(buffer, offset, count, cancelToken).ConfigureAwait(false);
}
public override void SetLength(long value) { throw new NotSupportedException(); }
public override long Seek(long offset, SeekOrigin origin) { throw new NotSupportedException(); }
}
}

7
src/Discord.Net.WebSocket/Audio/Streams/RTPWriteStream.cs
View File

@@ -14,7 +14,7 @@ namespace Discord.Audio.Streams
protected readonly byte[] _buffer;
internal RTPWriteStream(AudioOutStream next, int samplesPerFrame, uint ssrc, int bufferSize = 4000)
public RTPWriteStream(AudioOutStream next, int samplesPerFrame, uint ssrc, int bufferSize = 4000)
{
_next = next;
_samplesPerFrame = samplesPerFrame;
@@ -29,13 +29,10 @@ namespace Discord.Audio.Streams
_header[11] = (byte)(_ssrc >> 0);
}
public override void Write(byte[] buffer, int offset, int count)
{
WriteAsync(buffer, offset, count, CancellationToken.None).GetAwaiter().GetResult();
}
public override async Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
{
cancellationToken.ThrowIfCancellationRequested();
unchecked
{
if (_header[3]++ == byte.MaxValue)

34
src/Discord.Net.WebSocket/Audio/Streams/SodiumDecryptStream.cs
View File

@@ -1,42 +1,46 @@
using System;
using System.Collections.Concurrent;
using System.Threading;
using System.Threading.Tasks;
namespace Discord.Audio.Streams
{
///<summary> Decrypts an RTP frame using libsodium </summary>
public class SodiumDecryptStream : AudioInStream
public class SodiumDecryptStream : AudioOutStream
{
private readonly BlockingCollection<byte[]> _queuedData; //TODO: Replace with max-length ring buffer
private readonly AudioClient _audioClient;
private readonly AudioOutStream _next;
private readonly byte[] _buffer, _nonce, _secretKey;
public override bool CanRead => true;
public override bool CanSeek => false;
public override bool CanWrite => true;
internal SodiumDecryptStream(AudioClient audioClient, byte[] secretKey, int bufferSize = 4000)
public SodiumDecryptStream(AudioOutStream next, byte[] secretKey, int bufferSize = 4000)
{
_audioClient = audioClient;
_next = next;
_secretKey = secretKey;
_buffer = new byte[bufferSize];
_queuedData = new BlockingCollection<byte[]>(100);
_nonce = new byte[24];
}
public override int Read(byte[] buffer, int offset, int count)
{
var queuedData = _queuedData.Take();
Buffer.BlockCopy(queuedData, 0, buffer, offset, Math.Min(queuedData.Length, count));
return queuedData.Length;
}
public override void Write(byte[] buffer, int offset, int count)
public override async Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancelToken)
{
cancelToken.ThrowIfCancellationRequested();
Buffer.BlockCopy(buffer, 0, _nonce, 0, 12); //Copy RTP header to nonce
count = SecretBox.Decrypt(buffer, offset, count, _buffer, 0, _nonce, _secretKey);
var newBuffer = new byte[count];
Buffer.BlockCopy(_buffer, 0, newBuffer, 0, count);
_queuedData.Add(newBuffer);
await _next.WriteAsync(buffer, 0, count + 12, cancelToken).ConfigureAwait(false);
}
public override async Task FlushAsync(CancellationToken cancelToken)
{
await _next.FlushAsync(cancelToken).ConfigureAwait(false);
}
public override async Task ClearAsync(CancellationToken cancelToken)
{
await _next.ClearAsync(cancelToken).ConfigureAwait(false);
}
}
}

12
src/Discord.Net.WebSocket/Audio/Streams/SodiumEncryptStream.cs
View File

@@ -12,7 +12,7 @@ namespace Discord.Audio.Streams
//protected readonly byte[] _buffer;
internal SodiumEncryptStream(AudioOutStream next, byte[] secretKey/*, int bufferSize = 4000*/)
public SodiumEncryptStream(AudioOutStream next, byte[] secretKey/*, int bufferSize = 4000*/)
{
_next = next;
_secretKey = secretKey;
@@ -20,17 +20,13 @@ namespace Discord.Audio.Streams
_nonce = new byte[24];
}
public override void Write(byte[] buffer, int offset, int count)
public override async Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancelToken)
{
WriteAsync(buffer, offset, count, CancellationToken.None).GetAwaiter().GetResult();
}
public override async Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
{
cancellationToken.ThrowIfCancellationRequested();
cancelToken.ThrowIfCancellationRequested();
Buffer.BlockCopy(buffer, offset, _nonce, 0, 12); //Copy nonce from RTP header
count = SecretBox.Encrypt(buffer, offset + 12, count - 12, buffer, 12, _nonce, _secretKey);
await _next.WriteAsync(buffer, 0, count + 12, cancellationToken).ConfigureAwait(false);
await _next.WriteAsync(buffer, 0, count + 12, cancelToken).ConfigureAwait(false);
}
public override async Task FlushAsync(CancellationToken cancelToken)