diff --git a/VoIPController.h b/VoIPController.h index ee6de0c..b07121e 100755 --- a/VoIPController.h +++ b/VoIPController.h @@ -77,6 +77,7 @@ enum enum { + STATE_CREATED = 0, STATE_WAIT_INIT = 1, STATE_WAIT_INIT_ACK, STATE_ESTABLISHED, diff --git a/aclocal.m4 b/aclocal.m4 index 5015cc9..3731753 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -8963,11 +8963,11 @@ m4_define([lt_dict_filter], # serial 4221 ltversion.m4 # 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]) 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' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) diff --git a/configure b/configure index 5398586..421c1c9 100755 --- a/configure +++ b/configure @@ -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' diff --git a/controller/audio/OpusEncoder.cpp b/controller/audio/OpusEncoder.cpp index d5712d4..a7497fb 100755 --- a/controller/audio/OpusEncoder.cpp +++ b/controller/audio/OpusEncoder.cpp @@ -40,11 +40,11 @@ tgvoip::OpusEncoder::OpusEncoder(const std::shared_ptr &source, { this->source = source; 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_PACKET_LOSS_PERC(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)); requestedBitrate = 20000; currentBitrate = 0; @@ -61,9 +61,9 @@ tgvoip::OpusEncoder::OpusEncoder(const std::shared_ptr &source, 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_SIGNAL(OPUS_SIGNAL_VOICE)); + opus_encoder_ctl(secondaryEncoder, OPUS_SET_SIGNAL(OPUS_SIGNAL_MUSIC)); opus_encoder_ctl(secondaryEncoder, OPUS_SET_BITRATE(8000)); } else diff --git a/ltmain.sh b/ltmain.sh index d3ab94d..48cea9b 100644 --- a/ltmain.sh +++ b/ltmain.sh @@ -2,7 +2,7 @@ ## DO NOT EDIT - This file generated from ./build-aux/ltmain.in ## 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. # Written by Gordon Matzigkeit , 1996 @@ -31,7 +31,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION=2.4.6.42-b88ce +VERSION=2.4.6.42-b88ce-dirty package_revision=2.4.6.42 @@ -2176,7 +2176,7 @@ func_version () # End: # Set a version string. -scriptversion='(GNU libtool) 2.4.6.42-b88ce' +scriptversion='(GNU libtool) 2.4.6.42-b88ce-dirty' # func_echo ARG... @@ -2267,7 +2267,7 @@ include the following information: compiler: $LTCC compiler flags: $LTCFLAGS 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` autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`