forks
/
tg2sip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: forks:alpine
Branches Tags
forks:master
forks:alpine
forks:v1.3.1
..
compare: forks:master
Branches Tags
forks:alpine
forks:master
forks:v1.3.1

No commits in common. "alpine" and "master" have entirely different histories.
alpine ... master

4 changed files with 6 additions and 14 deletions
Show Stats Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -8,7 +8,7 @@ add_subdirectory(libtgvoip)
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
find_package(Td 1.8.0 REQUIRED) find_package(Td 1.8.0 REQUIRED)
find_package(spdlog 1.9.2 REQUIRED) find_package(spdlog 1.11.0 REQUIRED)
pkg_check_modules(PJSIP libpjproject>=2.8 REQUIRED) pkg_check_modules(PJSIP libpjproject>=2.8 REQUIRED)
pkg_check_modules(OPUS opus REQUIRED) pkg_check_modules(OPUS opus REQUIRED)

10
libtgvoip/CMakeLists.txt
View File

@ -4,9 +4,7 @@ find_package(PkgConfig REQUIRED)
pkg_check_modules(OPUS opus REQUIRED) pkg_check_modules(OPUS opus REQUIRED)
pkg_check_modules(OPENSSL openssl REQUIRED) pkg_check_modules(OPENSSL openssl REQUIRED)
pkg_check_modules(PJSIP libpjproject>=2.8 REQUIRED) pkg_check_modules(PJSIP libpjproject>=2.8 REQUIRED)
pkg_check_modules(FMT fmt REQUIRED) find_package(spdlog 1.11.0)
pkg_check_modules(WEBRTC webrtc-audio-processing REQUIRED)
find_package(spdlog 1.9.2)
add_library(libtgvoip STATIC add_library(libtgvoip STATIC
BlockingQueue.cpp BlockingQueue.cpp
@ -678,9 +676,3 @@ if (${spdlog_FOUND})
else () else ()
message(STATUS "Could NOT find spdlog") message(STATUS "Could NOT find spdlog")
endif () endif ()
target_link_libraries(libtgvoip PRIVATE
${PJSIP_LIBRARIES}
${OPUS_LIBRARIES}
${FMT_LIBRARIES}
${WEBRTC_LIBRARIES})

2
libtgvoip/os/posix/NetworkSocketPosix.cpp
View File

@ -29,7 +29,7 @@ extern jclass jniUtilitiesClass;
// fix of undef in pjsip // fix of undef in pjsip
#if defined(TGVOIP_USE_SOFTWARE_AUDIO) #if defined(TGVOIP_USE_SOFTWARE_AUDIO)
// #define s6_addr __in6_u.__u6_addr8 #define s6_addr __in6_u.__u6_addr8
#endif #endif
using namespace tgvoip; using namespace tgvoip;

4
tg2sip/sip.cpp
View File

@ -185,10 +185,10 @@ void Client::init_pj_endpoint(Settings &settings, LogWriter *sip_log_writer) {
// and TG audio port clock rate so we MUST force // and TG audio port clock rate so we MUST force
// using 48kHz codecs for all SIP calls // using 48kHz codecs for all SIP calls
std::string codecId = settings.raw_pcm() ? "L16/48000/1" : "opus/48000/2"; std::string codecId = settings.raw_pcm() ? "L16/48000/1" : "opus/48000/2";
CodecInfoVector2 codecVector = ep.codecEnum2(); CodecInfoVector codecVector = ep.codecEnum();
for (auto const &value : codecVector) { for (auto const &value : codecVector) {
ep.codecSetPriority(value.codecId, (pj_uint8_t) (value.codecId == codecId ? 255 : 0)); ep.codecSetPriority(value->codecId, (pj_uint8_t) (value->codecId == codecId ? 255 : 0));
} }
TransportConfig t_cfg; TransportConfig t_cfg;