1
0
mirror of https://github.com/danog/libtgvoip.git synced 2024-12-02 09:37:52 +01:00

Webradio fixes

This commit is contained in:
Daniil Gentili 2020-03-01 16:18:09 +01:00
parent f90a178fff
commit 67adf97d15
Signed by: danog
GPG Key ID: 8C1BE3B34B230CA7
5 changed files with 12 additions and 11 deletions

View File

@ -77,6 +77,7 @@ enum
enum enum
{ {
STATE_CREATED = 0,
STATE_WAIT_INIT = 1, STATE_WAIT_INIT = 1,
STATE_WAIT_INIT_ACK, STATE_WAIT_INIT_ACK,
STATE_ESTABLISHED, STATE_ESTABLISHED,

4
aclocal.m4 vendored
View File

@ -8963,11 +8963,11 @@ m4_define([lt_dict_filter],
# serial 4221 ltversion.m4 # serial 4221 ltversion.m4
# This file is part of GNU Libtool # This file is part of GNU Libtool
m4_define([LT_PACKAGE_VERSION], [2.4.6.42-b88ce]) m4_define([LT_PACKAGE_VERSION], [2.4.6.42-b88ce-dirty])
m4_define([LT_PACKAGE_REVISION], [2.4.6.42]) m4_define([LT_PACKAGE_REVISION], [2.4.6.42])
AC_DEFUN([LTVERSION_VERSION], AC_DEFUN([LTVERSION_VERSION],
[macro_version='2.4.6.42-b88ce' [macro_version='2.4.6.42-b88ce-dirty'
macro_revision='2.4.6.42' macro_revision='2.4.6.42'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0) _LT_DECL(, macro_revision, 0)

2
configure vendored
View File

@ -3270,7 +3270,7 @@ esac
macro_version='2.4.6.42-b88ce' macro_version='2.4.6.42-b88ce-dirty'
macro_revision='2.4.6.42' macro_revision='2.4.6.42'

View File

@ -40,11 +40,11 @@ tgvoip::OpusEncoder::OpusEncoder(const std::shared_ptr<MediaStreamItf> &source,
{ {
this->source = source; this->source = source;
source->SetCallback(tgvoip::OpusEncoder::Callback, this); source->SetCallback(tgvoip::OpusEncoder::Callback, this);
enc = opus_encoder_create(48000, 1, OPUS_APPLICATION_VOIP, NULL); enc = opus_encoder_create(48000, 1, OPUS_APPLICATION_AUDIO, NULL);
opus_encoder_ctl(enc, OPUS_SET_COMPLEXITY(10)); opus_encoder_ctl(enc, OPUS_SET_COMPLEXITY(10));
opus_encoder_ctl(enc, OPUS_SET_PACKET_LOSS_PERC(1)); opus_encoder_ctl(enc, OPUS_SET_PACKET_LOSS_PERC(1));
opus_encoder_ctl(enc, OPUS_SET_INBAND_FEC(1)); opus_encoder_ctl(enc, OPUS_SET_INBAND_FEC(1));
opus_encoder_ctl(enc, OPUS_SET_SIGNAL(OPUS_SIGNAL_VOICE)); opus_encoder_ctl(enc, OPUS_SET_SIGNAL(OPUS_SIGNAL_MUSIC));
opus_encoder_ctl(enc, OPUS_SET_BANDWIDTH(OPUS_AUTO)); opus_encoder_ctl(enc, OPUS_SET_BANDWIDTH(OPUS_AUTO));
requestedBitrate = 20000; requestedBitrate = 20000;
currentBitrate = 0; currentBitrate = 0;
@ -61,9 +61,9 @@ tgvoip::OpusEncoder::OpusEncoder(const std::shared_ptr<MediaStreamItf> &source,
if (needSecondary) if (needSecondary)
{ {
secondaryEncoder = opus_encoder_create(48000, 1, OPUS_APPLICATION_VOIP, NULL); secondaryEncoder = opus_encoder_create(48000, 1, OPUS_APPLICATION_AUDIO, NULL);
opus_encoder_ctl(secondaryEncoder, OPUS_SET_COMPLEXITY(10)); opus_encoder_ctl(secondaryEncoder, OPUS_SET_COMPLEXITY(10));
opus_encoder_ctl(secondaryEncoder, OPUS_SET_SIGNAL(OPUS_SIGNAL_VOICE)); opus_encoder_ctl(secondaryEncoder, OPUS_SET_SIGNAL(OPUS_SIGNAL_MUSIC));
opus_encoder_ctl(secondaryEncoder, OPUS_SET_BITRATE(8000)); opus_encoder_ctl(secondaryEncoder, OPUS_SET_BITRATE(8000));
} }
else else

View File

@ -2,7 +2,7 @@
## DO NOT EDIT - This file generated from ./build-aux/ltmain.in ## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
## by inline-source v2018-07-24.06 ## by inline-source v2018-07-24.06
# libtool (GNU libtool) 2.4.6.42-b88ce # libtool (GNU libtool) 2.4.6.42-b88ce-dirty
# Provide generalized library-building support services. # Provide generalized library-building support services.
# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
@ -31,7 +31,7 @@
PROGRAM=libtool PROGRAM=libtool
PACKAGE=libtool PACKAGE=libtool
VERSION=2.4.6.42-b88ce VERSION=2.4.6.42-b88ce-dirty
package_revision=2.4.6.42 package_revision=2.4.6.42
@ -2176,7 +2176,7 @@ func_version ()
# End: # End:
# Set a version string. # Set a version string.
scriptversion='(GNU libtool) 2.4.6.42-b88ce' scriptversion='(GNU libtool) 2.4.6.42-b88ce-dirty'
# func_echo ARG... # func_echo ARG...
@ -2267,7 +2267,7 @@ include the following information:
compiler: $LTCC compiler: $LTCC
compiler flags: $LTCFLAGS compiler flags: $LTCFLAGS
linker: $LD (gnu? $with_gnu_ld) linker: $LD (gnu? $with_gnu_ld)
version: $progname (GNU libtool) 2.4.6.42-b88ce version: $progname (GNU libtool) 2.4.6.42-b88ce-dirty
automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`