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

Added TryReadFrame and AvailableFrames to AudioInStream

Browse Source
This commit is contained in:
RogueException
2017-04-03 17:38:28 -03:00
parent cba07cbf2b
commit f3b8937686
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Discord.Net.Core/Audio/AudioInStream.cs
View File

@@ -10,8 +10,10 @@ namespace Discord.Audio
public override bool CanRead => true; public override bool CanRead => true;
public override bool CanSeek => false; public override bool CanSeek => false;
public override bool CanWrite => true; public override bool CanWrite => true;
public abstract int AvailableFrames { get; }
public abstract Task<RTPFrame> ReadFrameAsync(CancellationToken cancelToken); public abstract Task<RTPFrame> ReadFrameAsync(CancellationToken cancelToken);
public abstract bool TryReadFrame(CancellationToken cancelToken, out RTPFrame frame);
public RTPFrame ReadFrame() public RTPFrame ReadFrame()
{ {

25
src/Discord.Net.WebSocket/Audio/Streams/InputStream.cs
View File

@@ -8,7 +8,7 @@ namespace Discord.Audio.Streams
///<summary> Reads the payload from an RTP frame </summary> ///<summary> Reads the payload from an RTP frame </summary>
public class InputStream : AudioInStream public class InputStream : AudioInStream
{ {
private const int MaxFrames = 100; private const int MaxFrames = 100; //1-2 Seconds
private ConcurrentQueue<RTPFrame> _frames; private ConcurrentQueue<RTPFrame> _frames;
private SemaphoreSlim _signal; private SemaphoreSlim _signal;
@@ -20,6 +20,7 @@ namespace Discord.Audio.Streams
public override bool CanRead => !_isDisposed; public override bool CanRead => !_isDisposed;
public override bool CanSeek => false; public override bool CanSeek => false;
public override bool CanWrite => false; public override bool CanWrite => false;
public override int AvailableFrames => _signal.CurrentCount;
public InputStream() public InputStream()
{ {
@@ -27,14 +28,17 @@ namespace Discord.Audio.Streams
_signal = new SemaphoreSlim(0, MaxFrames); _signal = new SemaphoreSlim(0, MaxFrames);
} }
public override async Task<RTPFrame> ReadFrameAsync(CancellationToken cancelToken) public override bool TryReadFrame(CancellationToken cancelToken, out RTPFrame frame)
{ {
cancelToken.ThrowIfCancellationRequested(); cancelToken.ThrowIfCancellationRequested();
RTPFrame frame; if (_signal.Wait(0))
await _signal.WaitAsync(cancelToken).ConfigureAwait(false); {
_frames.TryDequeue(out frame); _frames.TryDequeue(out frame);
return frame; return true;
}
frame = default(RTPFrame);
return false;
} }
public override async Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancelToken) public override async Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancelToken)
{ {
@@ -46,6 +50,15 @@ namespace Discord.Audio.Streams
Buffer.BlockCopy(frame.Payload, 0, buffer, offset, frame.Payload.Length); Buffer.BlockCopy(frame.Payload, 0, buffer, offset, frame.Payload.Length);
return frame.Payload.Length; return frame.Payload.Length;
} }
public override async Task<RTPFrame> ReadFrameAsync(CancellationToken cancelToken)
{
cancelToken.ThrowIfCancellationRequested();
RTPFrame frame;
await _signal.WaitAsync(cancelToken).ConfigureAwait(false);
_frames.TryDequeue(out frame);
return frame;
}
public void WriteHeader(ushort seq, uint timestamp) public void WriteHeader(ushort seq, uint timestamp)
{ {
@@ -59,7 +72,7 @@ namespace Discord.Audio.Streams
{ {
cancelToken.ThrowIfCancellationRequested(); cancelToken.ThrowIfCancellationRequested();
if (_frames.Count > MaxFrames) //1-2 seconds if (_signal.CurrentCount >= MaxFrames) //1-2 seconds
{ {
_hasHeader = false; _hasHeader = false;
return Task.Delay(0); //Buffer overloaded return Task.Delay(0); //Buffer overloaded