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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
Christopher F
2017-04-03 18:46:11 -04:00
parent 3a60c58697 f3b8937686
commit af7943e62a
4 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Discord.Net.targets
View File

@@ -1,7 +1,7 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<VersionPrefix>1.0.0</VersionPrefix> <VersionPrefix>1.0.0</VersionPrefix>
<VersionSuffix>rc</VersionSuffix> <VersionSuffix>rc2</VersionSuffix>
<Authors>RogueException</Authors> <Authors>RogueException</Authors>
<PackageTags>discord;discordapp</PackageTags> <PackageTags>discord;discordapp</PackageTags>
<PackageProjectUrl>https://github.com/RogueException/Discord.Net</PackageProjectUrl> <PackageProjectUrl>https://github.com/RogueException/Discord.Net</PackageProjectUrl>

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

2
src/Discord.Net/Discord.Net.nuspec
View File

@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata> <metadata>
<id>Discord.Net</id> <id>Discord.Net</id>
<version>1.0.0-rc$suffix$</version> <version>1.0.0-rc2$suffix$</version>
<title>Discord.Net</title> <title>Discord.Net</title>
<authors>RogueException</authors> <authors>RogueException</authors>
<owners>RogueException</owners> <owners>RogueException</owners>