Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable the Opus music encoder #2542

Merged
merged 1 commit into from Sep 4, 2016

Conversation

@SuperNascher
Copy link
Contributor

commented Sep 2, 2016

This commit adds the ability to use the AUDIO encoder
instead of the VOIP encoder, that can be used for
bots or broadcaster, who wants to stream in a higher quality.

To enable this feature add this to the Mumble config:
[codec]
opus/encoder/music=true

Fixes #1630

@@ -878,6 +881,7 @@ void Settings::save() {
SAVELOAD(vsVAD, "audio/vadsource");
SAVELOAD(fVADmin, "audio/vadmin");
SAVELOAD(fVADmax, "audio/vadmax");
SAVELOAD(bUseOpusMusicEncoding, "audio/useopusmusicencoding");

This comment has been minimized.

Copy link
@bendem

bendem Sep 3, 2016

Contributor

spaces

@SuperNascher SuperNascher force-pushed the SuperNascher:opusmusic branch from b6db99f to 1ff30d4 Sep 3, 2016

opusState = opus_encoder_create(SAMPLE_RATE, 1, OPUS_APPLICATION_VOIP, NULL);
if (!g.s.bUseOpusMusicEncoding) {
opusState = opus_encoder_create(SAMPLE_RATE, 1, OPUS_APPLICATION_VOIP, NULL);
qWarning("Opus encoder set for VOIP");

This comment has been minimized.

Copy link
@mkrautz

mkrautz Sep 4, 2016

Member

please prefix the log entries with "AudioInput: "

qWarning("Opus encoder set for VOIP");
} else {
opusState = opus_encoder_create(SAMPLE_RATE, 1, OPUS_APPLICATION_AUDIO, NULL);
qWarning("Opus encoder set for Music");

This comment has been minimized.

Copy link
@mkrautz

mkrautz Sep 4, 2016

Member

Ditto.

@@ -567,6 +569,7 @@ void Settings::load(QSettings* settings_ptr) {
LOADENUM(vsVAD, "audio/vadsource");
SAVELOAD(fVADmin, "audio/vadmin");
SAVELOAD(fVADmax, "audio/vadmax");
SAVELOAD(bUseOpusMusicEncoding, "audio/useopusmusicencoding");

This comment has been minimized.

Copy link
@mkrautz

mkrautz Sep 4, 2016

Member

I'd still prefer "codec/opus/encoder/music" as I mentioned on IRC. Thoughts?

@mkrautz

This comment has been minimized.

Copy link
Member

commented Sep 4, 2016

LGTM beside my comments.

@SuperNascher SuperNascher force-pushed the SuperNascher:opusmusic branch from 1ff30d4 to c8beeb3 Sep 4, 2016

@SuperNascher

This comment has been minimized.

Copy link
Contributor Author

commented Sep 4, 2016

Done

@@ -901,6 +905,8 @@ void Settings::save() {
SAVELOAD(bWhisperFriends, "audio/whisperfriends");
SAVELOAD(bTransmitPosition, "audio/postransmit");

SAVELOAD(bUseOpusMusicEncoding, "codec/opus/encoder/music");

This comment has been minimized.

Copy link
@mkrautz

mkrautz Sep 4, 2016

Member

Spaces (should be tabs)

@@ -590,6 +592,8 @@ void Settings::load(QSettings* settings_ptr) {
SAVELOAD(bWhisperFriends, "audio/whisperfriends");
SAVELOAD(bTransmitPosition, "audio/postransmit");

SAVELOAD(bUseOpusMusicEncoding, "codec/opus/encoder/music");

This comment has been minimized.

Copy link
@mkrautz

mkrautz Sep 4, 2016

Member

Spaces (should be tabs)

Enable the Opus music encoder
This commit adds the ability to use the AUDIO encoder
instead of the VOIP encoder, that can be used for
bots or broadcaster, who wants to stream in a higher quality.

To enable this feature add a new section [codec] and use
“opus/encoder/music=true” in your Mumble client config file.

Fixes #1630

@SuperNascher SuperNascher force-pushed the SuperNascher:opusmusic branch from c8beeb3 to 498e558 Sep 4, 2016

@mkrautz mkrautz merged commit 2eaed7e into mumble-voip:master Sep 4, 2016

@SuperNascher SuperNascher deleted the SuperNascher:opusmusic branch Sep 4, 2016

@TFMvdBroek

This comment has been minimized.

Copy link

commented Sep 29, 2016

Music quality does not seem to improve when i add "opus\encoder\music=true" under [codec] in my bots mumble.ini. Running version 1.2.17.
Any clue?

@SuperNascher

This comment has been minimized.

Copy link
Contributor Author

commented Sep 29, 2016

@TFMvdBroek It will be available, when Mumble 1.3 is released. If you want to use the encoder now, you must use the Snapshot or the Git version of Mumble.

@TFMvdBroek

This comment has been minimized.

Copy link

commented Sep 29, 2016

Running latest snapshot also does not seem to improve quality. Any way to check if the setting is actually enabled?

@Geraner

This comment has been minimized.

Copy link

commented Sep 29, 2016

The latest snapshot version 1533 (static linux server) does not support this change yet. New snapshot 1634 needs to be created.

@Natenom

This comment has been minimized.

Copy link
Contributor

commented Sep 30, 2016

@Geraner This is a client only change. Server does not need to support it.

@TFMvdBroek

This comment has been minimized.

Copy link

commented Sep 30, 2016

I am running the latest Windows snapshot, which should work... But no difference in music quality tho

@Oatwalker

This comment has been minimized.

Copy link

commented Sep 16, 2017

I've been trying to get stutter free music playing in mumble for ages. It's been really frustrating. I'll have to try the newest snapshot and see if it helps.

edit:
I still have stutter :(

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
8 participants
You can’t perform that action at this time.