Started adding audio receive

This commit is contained in:
RogueException
2017-03-14 03:14:57 -03:00
parent 1d5b7a2b01
commit 254c83ecff
12 changed files with 216 additions and 76 deletions

View File

@@ -59,9 +59,6 @@ namespace Discord.Audio.Streams
{
return Task.Run(async () =>
{
#if DEBUG
uint num = 0;
#endif
try
{
while (!_isPreloaded && !_cancelToken.IsCancellationRequested)
@@ -82,7 +79,7 @@ namespace Discord.Audio.Streams
_queueLock.Release();
nextTick += _ticksPerFrame;
#if DEBUG
var _ = _logger.DebugAsync($"{num++}: Sent {frame.Bytes} bytes ({_queuedFrames.Count} frames buffered)");
var _ = _logger.DebugAsync($"Sent {frame.Bytes} bytes ({_queuedFrames.Count} frames buffered)");
#endif
}
else
@@ -93,7 +90,7 @@ namespace Discord.Audio.Streams
nextTick += _ticksPerFrame;
}
#if DEBUG
var _ = _logger.DebugAsync($"{num++}: Buffer underrun");
var _ = _logger.DebugAsync($"Buffer underrun");
#endif
}
}

View File

@@ -12,12 +12,13 @@ namespace Discord.Audio.Streams
private ushort _nextSeq;
private uint _nextTimestamp;
private bool _hasHeader;
private bool _isDisposed;
public override bool CanRead => true;
public override bool CanRead => !_isDisposed;
public override bool CanSeek => false;
public override bool CanWrite => true;
public override bool CanWrite => false;
public InputStream(byte[] secretKey)
public InputStream()
{
_frames = new ConcurrentQueue<RTPFrame>();
}
@@ -54,10 +55,13 @@ namespace Discord.Audio.Streams
{
cancelToken.ThrowIfCancellationRequested();
if (_frames.Count > 1000)
if (_frames.Count > 100) //1-2 seconds
{
_hasHeader = false;
return Task.Delay(0); //Buffer overloaded
if (_hasHeader)
throw new InvalidOperationException("Received payload with an RTP header");
}
if (!_hasHeader)
throw new InvalidOperationException("Received payload without an RTP header");
byte[] payload = new byte[count];
Buffer.BlockCopy(buffer, offset, payload, 0, count);
@@ -69,5 +73,10 @@ namespace Discord.Audio.Streams
_hasHeader = false;
return Task.Delay(0);
}
protected override void Dispose(bool isDisposing)
{
_isDisposed = true;
}
}
}

View File

@@ -6,15 +6,17 @@ namespace Discord.Audio.Streams
///<summary> Converts Opus to PCM </summary>
public class OpusDecodeStream : AudioOutStream
{
public const int SampleRate = OpusEncodeStream.SampleRate;
private readonly AudioOutStream _next;
private readonly byte[] _buffer;
private readonly OpusDecoder _decoder;
public OpusDecodeStream(AudioOutStream next, int samplingRate, int channels = OpusConverter.MaxChannels, int bufferSize = 4000)
public OpusDecodeStream(AudioOutStream next, int channels = OpusConverter.MaxChannels, int bufferSize = 4000)
{
_next = next;
_buffer = new byte[bufferSize];
_decoder = new OpusDecoder(samplingRate, channels);
_decoder = new OpusDecoder(SampleRate, channels);
}
public override async Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)

View File

@@ -31,11 +31,14 @@ namespace Discord.Audio.Streams
{
cancelToken.ThrowIfCancellationRequested();
if (buffer[offset + 0] != 0x80 || buffer[offset + 1] != 0x78)
return;
var payload = new byte[count - 12];
Buffer.BlockCopy(buffer, offset + 12, payload, 0, count - 12);
ushort seq = (ushort)((buffer[offset + 3] << 8) |
(buffer[offset + 2] << 0));
ushort seq = (ushort)((buffer[offset + 2] << 8) |
(buffer[offset + 3] << 0));
uint timestamp = (uint)((buffer[offset + 4] << 24) |
(buffer[offset + 5] << 16) |
@@ -45,5 +48,20 @@ namespace Discord.Audio.Streams
_queue.WriteHeader(seq, timestamp);
await (_next ?? _queue as Stream).WriteAsync(buffer, offset, count, cancelToken).ConfigureAwait(false);
}
public static bool TryReadSsrc(byte[] buffer, int offset, out uint ssrc)
{
if (buffer.Length - offset < 12)
{
ssrc = 0;
return false;
}
ssrc = (uint)((buffer[offset + 8] << 24) |
(buffer[offset + 9] << 16) |
(buffer[offset + 10] << 16) |
(buffer[offset + 11] << 0));
return true;
}
}
}