From 1ae7c36d312b6f4fe2c87d9c21ebabafcb12040c Mon Sep 17 00:00:00 2001 From: RogueException Date: Sat, 23 Jan 2016 11:31:03 -0400 Subject: [PATCH] Added AudioServiceConfig.MaxBitrate constant --- src/Discord.Net.Audio/AudioServiceConfig.cs | 6 ++++-- src/Discord.Net.Audio/Opus/OpusEncoder.cs | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Discord.Net.Audio/AudioServiceConfig.cs b/src/Discord.Net.Audio/AudioServiceConfig.cs index bab0515df..a9b4a4b33 100644 --- a/src/Discord.Net.Audio/AudioServiceConfig.cs +++ b/src/Discord.Net.Audio/AudioServiceConfig.cs @@ -12,6 +12,8 @@ namespace Discord.Audio public class AudioServiceConfig { + public const int MaxBitrate = 128; + /// Max time in milliseconds to wait for DiscordAudioClient to connect and initialize. public int ConnectionTimeout { get { return _connectionTimeout; } set { SetValue(ref _connectionTimeout, value); } } private int _connectionTimeout = 30000; @@ -33,8 +35,8 @@ namespace Discord.Audio public int BufferLength { get { return _bufferLength; } set { SetValue(ref _bufferLength, value); } } private int _bufferLength = 1000; - /// Gets or sets the bitrate used (in kbit/s, between 1 and 128 inclusively) for outgoing voice packets. A null value will use default Opus settings. - public int? Bitrate { get { return _bitrate; } set { SetValue(ref _bitrate, value); } } + /// Gets or sets the bitrate used (in kbit/s, between 1 and MaxBitrate inclusively) for outgoing voice packets. A null value will use default Opus settings. + public int? Bitrate { get { return _bitrate; } set { SetValue(ref _bitrate, value); } } private int? _bitrate = null; /// Gets or sets the number of channels (1 or 2) used in both input provided to IAudioClient and output send to Discord. Defaults to 2 (stereo). public int Channels { get { return _channels; } set { SetValue(ref _channels, value); } } diff --git a/src/Discord.Net.Audio/Opus/OpusEncoder.cs b/src/Discord.Net.Audio/Opus/OpusEncoder.cs index b41cbb482..be0623c6b 100644 --- a/src/Discord.Net.Audio/Opus/OpusEncoder.cs +++ b/src/Discord.Net.Audio/Opus/OpusEncoder.cs @@ -18,7 +18,7 @@ namespace Discord.Audio.Opus public OpusEncoder(int samplingRate, int channels, int frameLength, int? bitrate, OpusApplication application) : base(samplingRate, channels, frameLength) { - if (bitrate != null && (bitrate < 1 || bitrate > 512)) + if (bitrate != null && (bitrate < 1 || bitrate > AudioServiceConfig.MaxBitrate)) throw new ArgumentOutOfRangeException(nameof(bitrate)); BitRate = bitrate;