[UI] User can now force the audio encoding to be used

This commit is contained in:
emeric
2015-03-22 20:45:39 +01:00
parent 21c858562e
commit 0378c242b6
17 changed files with 223 additions and 58 deletions
+22 -3
View File
@@ -23,7 +23,7 @@ namespace Database {
// must be ordered
const std::vector<std::size_t>
User::audioBitrates =
User::audioBitrates =
{
64000,
96000,
@@ -38,7 +38,7 @@ const std::vector<std::size_t>
const std::vector<std::size_t>
User::videoBitrates =
User::videoBitrates =
{
256000,
512000,
@@ -47,12 +47,31 @@ const std::vector<std::size_t>
4096000,
8192000
};
const std::vector<AudioEncoding>
User::audioEncodings =
{
AudioEncoding::AUTO,
AudioEncoding::MP3,
AudioEncoding::OGA,
AudioEncoding::WEBMA,
AudioEncoding::FLA,
};
const std::vector<VideoEncoding>
User::videoEncodings =
{
VideoEncoding::AUTO,
};
User::User()
: _maxAudioBitrate(maxAudioBitrate),
_maxVideoBitrate(maxVideoBitrate),
_isAdmin(false),
_audioBitrate(defaultAudioBitrate),
_videoBitrate(defaultVideoBitrate)
_audioEncoding(AudioEncoding::AUTO),
_videoBitrate(defaultVideoBitrate),
_videoEncoding(VideoEncoding::AUTO)
{
}