mattburchett/NadekoBot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Trying to pinpoint song skipping

Browse Source
This commit is contained in:
Master Kwoth 2017-07-02 10:33:47 +02:00
parent e792e7b39e
commit f2d1b821d0
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/NadekoBot/Services/Music/SongBuffer.cs
View File

@ -24,7 +24,7 @@ namespace NadekoBot.Services.Music
this.p = Process.Start(new ProcessStartInfo this.p = Process.Start(new ProcessStartInfo
{ {
FileName = "ffmpeg", FileName = "ffmpeg",
Arguments = $"-i {songUri} -f s16le -ar 48000 -vn -ac 2 pipe:1 -loglevel quiet", Arguments = $"-i {songUri} -f s16le -ar 48000 -vn -ac 2 pipe:1 -loglevel quiet -nostdin",
UseShellExecute = false, UseShellExecute = false,
RedirectStandardOutput = true, RedirectStandardOutput = true,
RedirectStandardError = false, RedirectStandardError = false,
@ -40,7 +40,7 @@ namespace NadekoBot.Services.Music
try try
{ {
byte[] buffer = new byte[3840]; byte[] buffer = new byte[3840];
while (!this.p.HasExited || cancelToken.IsCancellationRequested) while (cancelToken.IsCancellationRequested)
{ {
var toRead = buffer.Length; var toRead = buffer.Length;
var remCap = _outStream.RemainingCapacity; var remCap = _outStream.RemainingCapacity;
@ -54,13 +54,20 @@ namespace NadekoBot.Services.Music
} }
toRead = remCap; toRead = remCap;
} }
int bytesRead = await p.StandardOutput.BaseStream.ReadAsync(buffer, 0, toRead, cancelToken).ConfigureAwait(false); do
if (bytesRead == 0)
{ {
Console.WriteLine("I'm not reading anything from ffmpeg"); if(p.HasExited)
await Task.Delay(50); Console.WriteLine("FFMPEG has exited, I'm in the read/write loop");
}
await _outStream.WriteAsync(buffer, 0, bytesRead, cancelToken); int bytesRead = await p.StandardOutput.BaseStream.ReadAsync(buffer, 0, toRead, cancelToken).ConfigureAwait(false);
if (bytesRead == 0)
{
Console.WriteLine("I'm not reading anything from ffmpeg");
await Task.Delay(20);
}
await _outStream.WriteAsync(buffer, 0, bytesRead, cancelToken);
} while (p.HasExited && !cancelToken.IsCancellationRequested);
if (_outStream.RemainingCapacity < _outStream.Capacity * 0.9f) if (_outStream.RemainingCapacity < _outStream.Capacity * 0.9f)
if(toReturn.TrySetResult(true)) if(toReturn.TrySetResult(true))