From 39b0a998c8b0e0c9fd04d7e6699604ed333c6140 Mon Sep 17 00:00:00 2001 From: RogueException Date: Sat, 8 Apr 2017 18:35:57 -0300 Subject: [PATCH] Fixed a few audio constants --- src/Discord.Net.WebSocket/Audio/Opus/OpusConverter.cs | 2 +- src/Discord.Net.WebSocket/Audio/Opus/OpusDecoder.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Discord.Net.WebSocket/Audio/Opus/OpusConverter.cs b/src/Discord.Net.WebSocket/Audio/Opus/OpusConverter.cs index f802d65ad..28581ea4e 100644 --- a/src/Discord.Net.WebSocket/Audio/Opus/OpusConverter.cs +++ b/src/Discord.Net.WebSocket/Audio/Opus/OpusConverter.cs @@ -12,8 +12,8 @@ namespace Discord.Audio public const int SampleBytes = sizeof(short) * Channels; - public const int FrameSamples = SamplingRate / 1000 * FrameMillis; public const int FrameSamplesPerChannel = SamplingRate / 1000 * FrameMillis; + public const int FrameSamples = FrameSamplesPerChannel * Channels; public const int FrameBytes = FrameSamples * SampleBytes; protected bool _isDisposed = false; diff --git a/src/Discord.Net.WebSocket/Audio/Opus/OpusDecoder.cs b/src/Discord.Net.WebSocket/Audio/Opus/OpusDecoder.cs index c5c16dff6..2c8d8036d 100644 --- a/src/Discord.Net.WebSocket/Audio/Opus/OpusDecoder.cs +++ b/src/Discord.Net.WebSocket/Audio/Opus/OpusDecoder.cs @@ -25,9 +25,9 @@ namespace Discord.Audio int result = 0; fixed (byte* inPtr = input) fixed (byte* outPtr = output) - result = Decode(_ptr, inPtr + inputOffset, inputCount, outPtr + outputOffset, FrameBytes / SampleBytes, 1); + result = Decode(_ptr, inPtr + inputOffset, inputCount, outPtr + outputOffset, FrameSamplesPerChannel, 1); CheckError(result); - return FrameBytes; + return result * SampleBytes; } protected override void Dispose(bool disposing)