- optimize audio file reading

.gitmodules

@@ -0,0 +1,12 @@
+[submodule "src/libs/resiprocate"]
+	path = src/libs/resiprocate
+	url = git@git.sevana.biz:public/resiprocate.git
+	branch = sevana
+
+[submodule "src/libs/libsrtp"]
+	path = src/libs/libsrtp
+	url = git@git.sevana.biz:public/libsrtp.git
+	branch = master
+[submodule "src/libs/libraries"]
+	path = src/libs/libraries
+	url = git@git.sevana.biz:public/libraries.git

LICENSE_MPL.txt

@@ -0,0 +1,373 @@
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+    means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in 
+    a separate file or files, that is not Covered Software.
+
+1.8. "License"
+    means this document.
+
+1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. "Modifications"
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.

README.txt

@@ -0,0 +1,141 @@
+# RTPhone Platform
+
+RTPhone is a comprehensive real-time communication (RTC) platform that provides a complete software stack for building VoIP/SIP-based communication applications. Developed by VoIP Objects (Sevana), RTPhone delivers production-ready voice communication capabilities with extensive codec support and cross-platform compatibility.
+
+## Overview
+
+RTPhone serves as a static library (`librtphone.a`) that can be integrated into larger telephony and communication systems. It provides a JSON-based command interface for easy integration and control, making it suitable for building softphones, PBX systems, WebRTC gateways, and carrier-grade voice solutions.
+
+## Key Features
+
+### Audio Codec Support
+RTPhone supports an extensive range of audio codecs:
+
+**Standard Codecs:**
+- G.711 (A-law/¼-law)
+- G.722 (16kHz wideband)
+- G.729
+- GSM (Full Rate, Half Rate, Enhanced Full Rate)
+- iLBC (20ms/30ms)
+- ISAC (16kHz/32kHz)
+
+**Advanced Codecs:**
+- AMR-NB/AMR-WB (Adaptive Multi-Rate Narrowband/Wideband) - please be aware - there is no patents for AMR codecs usage included ! You should acquire them on your own.
+- EVS (Enhanced Voice Services) - 3GPP's latest codec. Again - please be aware - there is no patents for EVS codec usage included ! You should acquire them on your own.
+- Opus - Modern low-latency codec
+- Speex (with acoustic echo cancellation)
+
+**Codec Features:**
+- Bandwidth-efficient and octet-aligned modes
+- IuUP (Iu User Plane) protocol support for 3G networks
+- Dynamic codec switching
+- Packet loss concealment (PLC)
+- Comfort noise generation (CNG)
+
+### Network & Protocol Support
+
+**SIP Features:**
+- Full SIP 2.0 implementation via reSIProcate
+- Multiple transport protocols (UDP, TCP, TLS)
+- Registration, authentication, and session management
+- SIP MESSAGE, presence, and REFER support
+
+**Media Transport:**
+- RTP/RTCP for media streaming
+- SRTP for secure media
+- ICE for NAT traversal with STUN/TURN support
+- WebRTC integration components
+- IPv4 and IPv6 support
+
+### Cross-Platform Audio Support
+- DirectSound/WMME (Windows)
+- Core Audio (macOS/iOS)
+- ALSA/PulseAudio (Linux)
+- Oboe (Android) for low-latency audio
+- PortAudio fallback support
+
+### Audio Quality Features
+- 48kHz sample rate support
+- Acoustic Echo Cancellation (AEC)
+- Audio resampling and format conversion
+- Multi-channel audio mixing
+- Perceptual Voice Quality Assessment (PVQA)
+
+## Architecture
+
+The platform is organized into several core modules:
+
+- **Engine/Agent**: JSON-based command interface
+- **Engine/Endpoint**: SIP user agent implementation
+- **Engine/Media**: Audio codec management and processing
+- **Engine/Audio**: Cross-platform audio I/O handling
+- **Engine/Helper**: Utility functions (networking, logging, threading)
+
+## Supported Platforms
+
+- Linux (x64, ARM/Raspberry Pi)
+- Windows (32/64-bit)
+- macOS
+- Android (with Oboe integration)
+- iOS
+
+## Building
+
+RTPhone uses a CMake-based build system with cross-compilation support:
+
+### Linux
+```bash
+python3 build_linux.py
+```
+
+### Android
+```bash
+python3 build_android.py
+# or
+./build_android.sh
+```
+
+### Dependencies
+- CMake 3.10+
+- OpenSSL 1.1+
+- Boost libraries
+- Platform-specific audio libraries
+
+## Recent Updates
+
+Recent development has focused on:
+- AMR codec parsing and decoding improvements
+- Octet-aligned mode fixes for AMR-WB
+- RTP SSRC handling enhancements
+- Build system optimizations
+- Code modernization to C++20
+
+## Use Cases
+
+RTPhone is good for building:
+- VoIP softphones and mobile applications
+- PBX and telephony server systems
+- RTP proxies
+- Carrier-grade voice communication platforms
+- 3GPP/IMS-compliant systems
+
+## Security
+
+RTPhone includes comprehensive security features:
+- OpenSSL 1.1 integration for encryption
+- TLS transport layer security
+- SRTP media encryption
+- Certificate management support
+
+## Integration
+
+The platform provides a developer-friendly interface with:
+- Event-driven architecture
+- Comprehensive logging system
+- Modern C++20 codebase
+
+For detailed integration instructions and API documentation, please refer to the source code and header files in the `/src/engine/` directory.
+
+## License
+
+Our source code is licensed under the MPL license. Naturally, any third-party components we use are subject to their respective licenses.

build_android.py

@@ -0,0 +1,44 @@
+#!/usr/bin/python3
+from pathlib import Path
+import os
+import multiprocessing
+import shutil
+
+# Temporary build directory
+DIR_BUILD = 'build_android'
+
+# Android NDK home directory 
+NDK_HOME = os.environ['ANDROID_NDK_HOME']
+
+# CMake toolchain file
+TOOLCHAIN_FILE = f'{NDK_HOME}/build/cmake/android.toolchain.cmake'
+
+# This directory
+DIR_THIS = Path(__file__).parent.resolve()
+
+# Path to app
+DIR_SOURCE = (DIR_THIS / '../src').resolve()
+
+def make_build() -> Path:
+    if Path(DIR_BUILD).exists():
+        shutil.rmtree(DIR_BUILD)
+    os.mkdir(DIR_BUILD)
+    os.chdir(DIR_BUILD)  
+    
+    cmd = f'cmake -DCMAKE_TOOLCHAIN_FILE={TOOLCHAIN_FILE} '
+    cmd += f'-DANDROID_NDK=$NDK_HOME '
+    cmd += f'-DANDROID_PLATFORM=24 '
+    cmd += f'-DCMAKE_BUILD=Release '
+    cmd += f'-DANDROID_ABI="arm64-v8a" '
+    cmd += '../src'
+    retcode = os.system(cmd)
+    if retcode != 0:
+        raise RuntimeError('Problem when configuring the project')
+    
+    cmd = f'cmake --build . -j {multiprocessing.cpu_count()}'
+    retcode = os.system(cmd)
+    if retcode != 0:
+        raise RuntimeError('Problem when building the project')
+    
+if __name__ == '__main__':
+    make_build()

build_android.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+rm -rf build_android
+mkdir -p build_android
+cd build_android
+
+cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_HOME/build/cmake/android.toolchain.cmake      \
+      -DANDROID_NDK=$ANDROID_NDK_HOME                                                   \
+      -DANDROID_PLATFORM=24                                                             \
+      -DCMAKE_BUILD_TYPE=Release                                                        \
+      -DANDROID_ABI="arm64-v8a"                                                       \
+      ../src
+
+cmake --build . -j8
+

build_linux.py

@@ -0,0 +1,37 @@
+#!/usr/bin/env python3
+from pathlib import Path
+import os
+import multiprocessing
+import shutil
+
+# Temporary build directory
+DIR_BUILD = 'build_linux'
+
+# This directory
+DIR_THIS = Path(__file__).parent.resolve()
+
+# Path to app
+DIR_SOURCE = (DIR_THIS / '../src').resolve()
+
+def make_build() -> Path:
+    if Path(DIR_BUILD).exists():
+        shutil.rmtree(DIR_BUILD)
+    os.mkdir(DIR_BUILD)
+    os.chdir(DIR_BUILD)  
+    
+    cmd = f'cmake ../src -G Ninja'
+    retcode = os.system(cmd)
+    if retcode != 0:
+        raise RuntimeError('Problem when configuring the project')
+    
+    cmd = f'cmake --build . -j {multiprocessing.cpu_count()}'
+    retcode = os.system(cmd)
+    if retcode != 0:
+        raise RuntimeError('Problem when building the project')
+    
+    os.chdir('..')
+    return Path(DIR_BUILD) / 'librtphone.a'
+
+if __name__ == '__main__':
+    p = make_build()
+    print (f'Built: {p}')

src/CMakeLists.txt

@@ -1,61 +1,12 @@
+cmake_minimum_required(VERSION 3.20)
 project(rtphone)
 
-cmake_minimum_required(VERSION 3.0)
- 
-macro(configure_msvc_runtime)
-    if(MSVC)
-        # Default to statically-linked runtime.
-        if("${MSVC_RUNTIME}" STREQUAL "")
-            set(MSVC_RUNTIME "static")
-        endif()
-        # Set compiler options.
-        set(variables
-            CMAKE_C_FLAGS_DEBUG
-            CMAKE_C_FLAGS_MINSIZEREL
-            CMAKE_C_FLAGS_RELEASE
-            CMAKE_C_FLAGS_RELWITHDEBINFO
-            CMAKE_CXX_FLAGS_DEBUG
-            CMAKE_CXX_FLAGS_MINSIZEREL
-            CMAKE_CXX_FLAGS_RELEASE
-            CMAKE_CXX_FLAGS_RELWITHDEBINFO
-            )
-        if(${MSVC_RUNTIME} STREQUAL "static")
-            message(STATUS
-                "rtphone: MSVC -> forcing use of statically-linked runtime."
-                )
-            foreach(variable ${variables})
-                if(${variable} MATCHES "/MD")
-                    string(REGEX REPLACE "/MD" "/MT" ${variable} "${${variable}}")
-                endif()
-            endforeach()
-        else()
-            message(STATUS
-                "rtphone: MSVC -> forcing use of dynamically-linked runtime."
-                )
-            foreach(variable ${variables})
-                if(${variable} MATCHES "/MT")
-                    string(REGEX REPLACE "/MT" "/MD" ${variable} "${${variable}}")
-                endif()
-            endforeach()
-        endif()
-
-        foreach(variable ${variables})
-            string(REGEX REPLACE "/Z[iI7]" ""
-                ${variable}
-                "${${variable}}")
-
-            set(${variable} "${${variable}} /Zi /Oy-")
-        endforeach()
-    endif()
-endmacro()
-
-
-# Rely on C++ 11
-set (CMAKE_CXX_STANDARD 11)
+# Rely on C++ 20
+set (CMAKE_CXX_STANDARD 20)
 set (CMAKE_CXX_STANDARD_REQUIRED ON)
 
-set (rtphone_libs libs)
-set (rtphone_engine engine)
+set (L libs)
+set (E engine)
 
 option (USE_AMR_CODEC   "Use AMR codec. Requires libraries."    ON)
 option (USE_EVS_CODEC   "Use EVS codec."                        ON)
@@ -64,152 +15,347 @@ option (USE_MUSL        "Build with MUSL library"               OFF)
 
 # PIC code by default
 set (CMAKE_POSITION_INDEPENDENT_CODE ON)
+set (RUNTIME_CPU_CAPABILITY_DETECTION ON)
+
+set (LIB_PLATFORM ${CMAKE_CURRENT_SOURCE_DIR}/libs/libraries)
+include (${LIB_PLATFORM}/platform_libs.cmake)
 
-if (NOT DEFINED LIB_PLATFORM)
-    set (LIB_PLATFORM ${CMAKE_CURRENT_SOURCE_DIR}/../../libraries)
-endif()
 
 message("Libraries: ${LIB_PLATFORM}")
-set (OPENSSL_INCLUDE ${LIB_PLATFORM}/openssl/1.0/include)
+set (OPENSSL_INCLUDE ${LIB_PLATFORM}/openssl/1.1/include)
 message ("Using OpenSSL include files from ${OPENSSL_INCLUDE}")
+message ("Using OpenSSL libs: ${OPENSSL_SSL} and ${OPENSSL_CRYPTO}")
+include_directories(${OPENSSL_INCLUDE})
 
+# Used defines for our project
+set (DEFINES -DUSE_OPENSSL)
+
+# Libraries for our project
+set (LIBS_STATIC "")
+set (LIBS_DYNAMIC "")
+
+# Try to prefer static libraries anyway
+set (CMAKE_FIND_LIBRARY_SUFFIXES .a .so .dylib)
+
+# Windows-specific definitions
 if (CMAKE_SYSTEM MATCHES "Windows*")
-    add_definitions (-DTARGET_WIN -D_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS -D_UNICODE -D_CRT_SECURE_NO_WARNINGS)
+    set (DEFINES ${DEFINES} -DTARGET_WIN -D_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS -D_UNICODE -D_CRT_SECURE_NO_WARNINGS)
+    set (TARGET_WIN ON)
 endif()
 
+# Linux-specific definitions
 if (CMAKE_SYSTEM MATCHES "Linux*")
-    add_definitions (-DTARGET_LINUX)
+    set (DEFINES ${DEFINES} -DTARGET_LINUX -DHAVE_NETINET_IN_H)
+    set (TARGET_LINUX ON)
+    set (LIBS_STATIC ${LIBS_STATIC} dl)
 endif()
 
-
+# macOS-specific definitions
 if (CMAKE_SYSTEM MATCHES "Darwin*")
-    add_definitions (-DTARGET_OSX)
+    set (DEFINES ${DEFINES} -DTARGET_OSX)
+    set (TARGET_OSX ON)
+    set (LIBS_STATIC ${LIBS_STATIC} dl)
 endif()
 
+# 
 if (CMAKE_SYSTEM MATCHES "Android")
     message("Adding the Oboe library")
     set (OBOE_DIR libs/oboe)
     add_subdirectory (${OBOE_DIR} ./oboe)
     include_directories (${OBOE_DIR}/include)
+    set (DEFINES ${DEFINES} -DTARGET_ANDROID -DHAVE_NETINET_IN_H)
+    set (TARGET_ANDROID ON)
+    set (LIBS_STATIC ${LIBS} oboe)
 endif()
 
 if (USE_MUSL)
-    add_definitions(-DTARGET_MUSL)
+    set (DEFINES ${DEFINES} -DTARGET_MUSL)
+    set (TARGET_MUSL ON)
 endif()
 
 set (RTPHONE_SOURCES
-    ${rtphone_engine}/media/MT_Statistics.cpp
-    ${rtphone_engine}/media/MT_WebRtc.cpp
-    ${rtphone_engine}/media/MT_Stream.cpp
-    ${rtphone_engine}/media/MT_SrtpHelper.cpp
-    ${rtphone_engine}/media/MT_SingleAudioStream.cpp
-    ${rtphone_engine}/media/MT_NativeRtpSender.cpp
-    ${rtphone_engine}/media/MT_Dtmf.cpp
-    ${rtphone_engine}/media/MT_CodecList.cpp
-    ${rtphone_engine}/media/MT_Codec.cpp
-    ${rtphone_engine}/media/MT_Box.cpp
-    ${rtphone_engine}/media/MT_AudioStream.cpp
-    ${rtphone_engine}/media/MT_AudioReceiver.cpp
-    ${rtphone_engine}/media/MT_AudioCodec.cpp
-    ${rtphone_engine}/media/MT_CngHelper.cpp
-    ${rtphone_engine}/agent/Agent_Impl.cpp
-    ${rtphone_engine}/agent/Agent_AudioManager.cpp
-    ${rtphone_engine}/endpoint/EP_Account.cpp
-    ${rtphone_engine}/endpoint/EP_AudioProvider.cpp
-    ${rtphone_engine}/endpoint/EP_DataProvider.cpp
-    ${rtphone_engine}/endpoint/EP_Engine.cpp
-    ${rtphone_engine}/endpoint/EP_NetworkQueue.cpp
-    ${rtphone_engine}/endpoint/EP_Observer.cpp
-    ${rtphone_engine}/endpoint/EP_Session.cpp
+    ${E}/engine_config.h
+    ${E}/media/MT_Statistics.cpp
+    ${E}/media/MT_WebRtc.cpp
+    ${E}/media/MT_Stream.cpp
+    ${E}/media/MT_SrtpHelper.cpp
+    ${E}/media/MT_SingleAudioStream.cpp
+    ${E}/media/MT_NativeRtpSender.cpp
+    ${E}/media/MT_Dtmf.cpp
+    ${E}/media/MT_CodecList.cpp
+    ${E}/media/MT_Codec.cpp
+    ${E}/media/MT_Box.cpp
+    ${E}/media/MT_AudioStream.cpp
+    ${E}/media/MT_AudioReceiver.cpp
+    ${E}/media/MT_AudioCodec.cpp
+    ${E}/media/MT_CngHelper.cpp
+    ${E}/agent/Agent_Impl.cpp
+    ${E}/agent/Agent_Impl.h
+    ${E}/agent/Agent_AudioManager.cpp
+    ${E}/agent/Agent_AudioManager.h
+    ${E}/endpoint/EP_Account.cpp
+    ${E}/endpoint/EP_Account.h
+    ${E}/endpoint/EP_AudioProvider.cpp
+    ${E}/endpoint/EP_AudioProvider.h
+    ${E}/endpoint/EP_DataProvider.cpp
+    ${E}/endpoint/EP_DataProvider.h
+    ${E}/endpoint/EP_Engine.cpp
+    ${E}/endpoint/EP_Engine.h
+    ${E}/endpoint/EP_NetworkQueue.cpp
+    ${E}/endpoint/EP_NetworkQueue.h
+    ${E}/endpoint/EP_Observer.cpp
+    ${E}/endpoint/EP_Observer.h
+    ${E}/endpoint/EP_Session.cpp
+    ${E}/endpoint/EP_Session.h
 
-    ${rtphone_engine}/media/MT_Statistics.h
-    ${rtphone_engine}/media/MT_WebRtc.h
-    ${rtphone_engine}/media/MT_Stream.h
-    ${rtphone_engine}/media/MT_SrtpHelper.h
-    ${rtphone_engine}/media/MT_SingleAudioStream.h
-    ${rtphone_engine}/media/MT_NativeRtpSender.h
-    ${rtphone_engine}/media/MT_Dtmf.h
-    ${rtphone_engine}/media/MT_CodecList.h
-    ${rtphone_engine}/media/MT_Codec.h
-    ${rtphone_engine}/media/MT_Box.h
-    ${rtphone_engine}/media/MT_AudioStream.h
-    ${rtphone_engine}/media/MT_AudioReceiver.h
-    ${rtphone_engine}/media/MT_AudioCodec.h
+    ${E}/media/MT_Statistics.h
+    ${E}/media/MT_WebRtc.h
+    ${E}/media/MT_Stream.h
+    ${E}/media/MT_SrtpHelper.h
+    ${E}/media/MT_SingleAudioStream.h
+    ${E}/media/MT_NativeRtpSender.h
+    ${E}/media/MT_Dtmf.h
+    ${E}/media/MT_CodecList.h
+    ${E}/media/MT_Codec.h
+    ${E}/media/MT_Box.h
+    ${E}/media/MT_AudioStream.h
+    ${E}/media/MT_AudioReceiver.h
+    ${E}/media/MT_AudioCodec.h
+    ${E}/media/MT_CngHelper.h
     
-    ${rtphone_engine}/media/MT_CngHelper.h
-    ${rtphone_engine}/agent/Agent_Impl.h
-    ${rtphone_engine}/agent/Agent_AudioManager.h
-    ${rtphone_engine}/endpoint/EP_Account.h
-    ${rtphone_engine}/endpoint/EP_AudioProvider.h
-    ${rtphone_engine}/endpoint/EP_DataProvider.h
-    ${rtphone_engine}/endpoint/EP_Engine.h
-    ${rtphone_engine}/endpoint/EP_NetworkQueue.h
-    ${rtphone_engine}/endpoint/EP_Observer.h
-    ${rtphone_engine}/endpoint/EP_Session.h
+    ${E}/media/MT_Statistics.cpp
+    ${E}/media/MT_WebRtc.cpp
+    ${E}/media/MT_Stream.cpp
+    ${E}/media/MT_SrtpHelper.cpp
+    ${E}/media/MT_SingleAudioStream.cpp
+    ${E}/media/MT_NativeRtpSender.cpp
+    ${E}/media/MT_Dtmf.cpp
+    ${E}/media/MT_CodecList.cpp
+    ${E}/media/MT_Codec.cpp
+    ${E}/media/MT_Box.cpp
+    ${E}/media/MT_AudioStream.cpp
+    ${E}/media/MT_AudioReceiver.cpp
+    ${E}/media/MT_AudioCodec.cpp
+    ${E}/media/MT_CngHelper.cpp
+    ${E}/media/MT_AmrCodec.cpp
+    ${E}/media/MT_EvsCodec.cpp
+    ${E}/media/MT_Statistics.h
+    ${E}/media/MT_WebRtc.h
+    ${E}/media/MT_Stream.h
+    ${E}/media/MT_SrtpHelper.h
+    ${E}/media/MT_SingleAudioStream.h
+    ${E}/media/MT_NativeRtpSender.h
+    ${E}/media/MT_Dtmf.h
+    ${E}/media/MT_CodecList.h
+    ${E}/media/MT_Codec.h
+    ${E}/media/MT_Box.h
+    ${E}/media/MT_AudioStream.h
+    ${E}/media/MT_AudioReceiver.h
+    ${E}/media/MT_AudioCodec.h
+    ${E}/media/MT_CngHelper.h
+    ${E}/media/MT_AmrCodec.h
+    ${E}/media/MT_EvsCodec.h
+
+    ${E}/helper/HL_AsyncCommand.cpp
+    ${E}/helper/HL_AsyncCommand.h
+    ${E}/helper/HL_Base64.h
+    ${E}/helper/HL_ByteBuffer.h
+    ${E}/helper/HL_Calculator.cpp
+    ${E}/helper/HL_Calculator.h
+    ${E}/helper/HL_CrashRpt.cpp
+    ${E}/helper/HL_CrashRpt.h
+    ${E}/helper/HL_CsvReader.cpp
+    ${E}/helper/HL_CsvReader.h
+    ${E}/helper/HL_Epoll.cpp
+    ${E}/helper/HL_Epoll.h
+    ${E}/helper/HL_Exception.h
+    ${E}/helper/HL_File.cpp
+    ${E}/helper/HL_File.h
+    ${E}/helper/HL_HepSupport.cpp
+    ${E}/helper/HL_HepSupport.h
+    ${E}/helper/HL_InternetAddress.h
+    ${E}/helper/HL_IuUP.cpp
+    ${E}/helper/HL_IuUP.h
+    ${E}/helper/HL_Log.cpp
+    ${E}/helper/HL_Log.h
+    ${E}/helper/HL_NetworkFrame.cpp
+    ${E}/helper/HL_NetworkFrame.h
+    ${E}/helper/HL_NetworkSocket.cpp
+    ${E}/helper/HL_NetworkSocket.h
+    ${E}/helper/HL_Optional.hpp
+    ${E}/helper/HL_OsVersion.cpp
+    ${E}/helper/HL_OsVersion.h
+    ${E}/helper/HL_Pointer.cpp
+    ${E}/helper/HL_Pointer.h
+    ${E}/helper/HL_Process.cpp
+    ${E}/helper/HL_Process.h
+    ${E}/helper/HL_Rtp.cpp
+    ${E}/helper/HL_Rtp.h
+    ${E}/helper/HL_Singletone.cpp
+    ${E}/helper/HL_Singletone.h
+    ${E}/helper/HL_SocketHeap.cpp
+    ${E}/helper/HL_SocketHeap.h
+    ${E}/helper/HL_Statistics.cpp
+    ${E}/helper/HL_Statistics.h
+    ${E}/helper/HL_StreamState.h
+    ${E}/helper/HL_String.cpp
+    ${E}/helper/HL_String.h
+    ${E}/helper/HL_Sync.cpp
+    ${E}/helper/HL_Sync.h
+    ${E}/helper/HL_ThreadPool.cpp
+    ${E}/helper/HL_ThreadPool.h
+    ${E}/helper/HL_Time.cpp
+    ${E}/helper/HL_Time.h
+    ${E}/helper/HL_Types.h
+    ${E}/helper/HL_Types.cpp
+    ${E}/helper/HL_Usb.cpp
+    ${E}/helper/HL_Usb.h
+    ${E}/helper/HL_Uuid.cpp
+    ${E}/helper/HL_Uuid.h
+    ${E}/helper/HL_VariantMap.cpp
+    ${E}/helper/HL_VariantMap.h
+    ${E}/helper/HL_Xcap.cpp
+    ${E}/helper/HL_Xcap.h
+
+    ${E}/audio/Audio_Resampler.cpp
+    ${E}/audio/Audio_Resampler.h
+    ${E}/audio/Audio_Quality.cpp
+    ${E}/audio/Audio_Quality.h
+    ${E}/audio/Audio_Mixer.cpp
+    ${E}/audio/Audio_Mixer.h
+    ${E}/audio/Audio_Interface.cpp
+    ${E}/audio/Audio_Interface.h
+    ${E}/audio/Audio_Helper.cpp
+    ${E}/audio/Audio_Helper.h
+    ${E}/audio/Audio_DataWindow.cpp
+    ${E}/audio/Audio_DataWindow.h
+    ${E}/audio/Audio_DevicePair.cpp
+    ${E}/audio/Audio_DevicePair.h
+    ${E}/audio/Audio_Player.cpp
+    ${E}/audio/Audio_Player.h
+    ${E}/audio/Audio_Null.cpp
+    ${E}/audio/Audio_Null.h
+    ${E}/audio/Audio_CoreAudio.cpp
+    ${E}/audio/Audio_CoreAudio.h
+    ${E}/audio/Audio_DirectSound.cpp
+    ${E}/audio/Audio_DirectSound.h
+    ${E}/audio/Audio_AndroidOboe.cpp
+    ${E}/audio/Audio_AndroidOboe.h
+    ${E}/audio/Audio_WavFile.cpp
+    ${E}/audio/Audio_WavFile.h
+
+    ${L}/ice/hmac_sha1_impl.cpp
+    ${L}/ice/hmac_sha1_impl.h
+    ${L}/ice/ICEAction.h
+    ${L}/ice/ICEAddress.cpp
+    ${L}/ice/ICEAddress.h
+    ${L}/ice/ICEAuthTransaction.cpp
+    ${L}/ice/ICEAuthTransaction.h
+    ${L}/ice/ICEBinding.cpp
+    ${L}/ice/ICEBinding.h
+    ${L}/ice/ICEBox.cpp
+    ${L}/ice/ICEBox.h
+    ${L}/ice/ICEBoxImpl.cpp
+    ${L}/ice/ICEBoxImpl.h
+    ${L}/ice/ICEByteBuffer.cpp
+    ${L}/ice/ICEByteBuffer.h
+    ${L}/ice/ICECandidate.cpp
+    ${L}/ice/ICECandidate.h
+    ${L}/ice/ICECandidatePair.cpp
+    ${L}/ice/ICECandidatePair.h
+    ${L}/ice/ICECheckList.cpp
+    ${L}/ice/ICECheckList.h
+    ${L}/ice/ICECRC32.cpp
+    ${L}/ice/ICECRC32.h
+    ${L}/ice/ICEError.cpp
+    ${L}/ice/ICEError.h
+    ${L}/ice/ICEEvent.h
+    ${L}/ice/ICELog.cpp
+    ${L}/ice/ICELog.h
+    ${L}/ice/ICEMD5.cpp
+    ${L}/ice/ICEMD5.h
+    ${L}/ice/ICENetworkHelper.cpp
+    ${L}/ice/ICENetworkHelper.h
+    ${L}/ice/ICEPacketTimer.cpp
+    ${L}/ice/ICEPacketTimer.h
+    ${L}/ice/ICEPlatform.cpp
+    ${L}/ice/ICEPlatform.h
+    ${L}/ice/ICERelaying.cpp
+    ${L}/ice/ICERelaying.h
+    ${L}/ice/ICESession.cpp
+    ${L}/ice/ICESession.h
+    ${L}/ice/ICESHA1.cpp
+    ${L}/ice/ICESHA1.h
+    ${L}/ice/ICESocket.h
+    ${L}/ice/ICEStream.cpp
+    ${L}/ice/ICEStream.h
+    ${L}/ice/ICEStunAttributes.cpp
+    ${L}/ice/ICEStunAttributes.h
+    ${L}/ice/ICEStunConfig.cpp
+    ${L}/ice/ICEStunConfig.h
+    ${L}/ice/ICEStunMessage.cpp
+    ${L}/ice/ICEStunMessage.h
+    ${L}/ice/ICEStunTransaction.cpp
+    ${L}/ice/ICEStunTransaction.h
+    ${L}/ice/ICESync.cpp
+    ${L}/ice/ICESync.h
+    ${L}/ice/ICETime.cpp
+    ${L}/ice/ICETime.h
+    ${L}/ice/ICETransactionList.cpp
+    ${L}/ice/ICETransactionList.h
+    ${L}/ice/ICETypes.h
+    ${L}/ice/md5_impl.cpp
+    ${L}/ice/md5_impl.h
     )
 
-if (USE_AMR_CODEC)
-    add_definitions(-DUSE_AMR_CODEC)
-    set (RTPHONE_SOURCES ${RTPHONE_SOURCES} ${rtphone_engine}/media/MT_AmrCodec.cpp ${rtphone_engine}/media/MT_AmrCodec.h)
-endif()
-
-if (USE_EVS_CODEC)
-    add_definitions(-DUSE_EVS_CODEC)
-    set (RTPHONE_SOURCES ${RTPHONE_SOURCES} ${rtphone_engine}/media/MT_EvsCodec.cpp ${rtphone_engine}/media/MT_EvsCodec.h)
-endif()
-
 if (USE_OPUS_CODEC)
-    add_definitions(-DUSE_OPUS_CODEC)
+    set (DEFINES ${DEFINES} -DUSE_OPUS_CODEC)
 endif()
 
 add_library (rtphone STATIC ${RTPHONE_SOURCES})
 
-add_subdirectory(${rtphone_libs}/resiprocate)
-add_subdirectory(${rtphone_libs}/ice)
-add_subdirectory(${rtphone_libs}/jrtplib/src)
-add_subdirectory(${rtphone_libs}/libg729)
+add_subdirectory(${L}/resiprocate)
+add_subdirectory(${L}/jrtplib/src)
+add_subdirectory(${L}/libg729)
 
 if (USE_EVS_CODEC)
-    add_subdirectory(${rtphone_libs}/libevs)
+    add_subdirectory(${L}/libevs)
 endif()
 
-add_subdirectory(${rtphone_libs}/libgsm)
-add_subdirectory(${rtphone_libs}/gsmhr)
-add_subdirectory(${rtphone_libs}/g722)
-add_subdirectory(${rtphone_libs}/speexdsp)
-add_subdirectory(${rtphone_libs}/srtp)
-add_subdirectory(${rtphone_libs}/webrtc)
-add_subdirectory(${rtphone_engine}/helper)
-add_subdirectory(${rtphone_engine}/audio)
-add_subdirectory(${rtphone_engine}/media)
+add_subdirectory(${L}/libgsm)
+add_subdirectory(${L}/gsmhr)
+add_subdirectory(${L}/g722)
+add_subdirectory(${L}/speexdsp)
+add_subdirectory(${L}/libsrtp)
+add_subdirectory(${L}/webrtc)
+add_subdirectory(${L}/opus)
 
-set (LIBS ice_stack jrtplib g729_codec gsm_codec
-    gsmhr_codec g722_codec srtp resiprocate helper_lib audio_lib webrtc speexdsp
-    uuid)
+set (LIBS_STATIC ${LIBS_STATIC} jrtplib g729_codec gsm_codec opus
+                                gsmhr_codec g722_codec srtp3 resiprocate webrtc speexdsp)
 
-if (CMAKE_SYSTEM MATCHES "Win*")
-    set (LIBS ${LIBS} )
-else ()
-    set (LIBS ${LIBS} dl uuid)
-endif ()
-
-if (CMAKE_SYSTEM MATCHES "Android")
-    set (LIBS ${LIBS} oboe)
+if (USE_AMR_CODEC)
+    include (${LIB_PLATFORM}/platform_libs.cmake)
+    message("Media: AMR NB and WB codecs will be included.")
+    set (DEFINES ${DEFINES} -DUSE_AMR_CODEC)
+    set (LIBS_STATIC ${LIBS_STATIC} ${OPENCORE_AMRNB} ${OPENCORE_AMRWB})
 endif()
 
+if (USE_EVS_CODEC)
+    message("Media: EVS codec will be included.")
+    set (DEFINES ${DEFINES} -DUSE_EVS_CODEC)
+    set (LIBS_STATIC ${LIBS_STATIC} evs_codec)
+endif()
 
-target_link_libraries(rtphone
-    ice_stack jrtplib g729_codec gsm_codec
-    gsmhr_codec g722_codec srtp resiprocate
-    helper_lib
-    audio_lib
-    webrtc
-    speexdsp
-    uuid
-    ${OPENSSL_SSL}
-    ${OPENSSL_CRYPTO}
-    ${LIBS} )
+target_compile_definitions(rtphone PUBLIC ${DEFINES})
 
+if (TARGET_LINUX)
+    target_link_options(rtphone PUBLIC -Wl,-Bstatic)
+endif()
+target_link_libraries(rtphone PUBLIC ${LIBS_STATIC} ${OPENSSL_SSL} ${OPENSSL_CRYPTO})
+
+if (TARGET_LINUX)
+    target_link_options(rtphone PUBLIC -Wl,-Bdynamic)
+endif()
 
 target_include_directories(rtphone
     PUBLIC
@@ -217,15 +363,18 @@ target_include_directories(rtphone
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/engine>
         ${CMAKE_CURRENT_SOURCE_DIR}/libs
         ${LIB_PLATFORM}/opus/include
+        ${E}/helper
+        ${E}/audio
+        ${E}/media
+        ${L}
+        ${L}/ice
     PRIVATE
-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/
-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/libevs/lib_com
-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/libevs/lib_enc
-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/libevs/lib_dec
-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/speex/include
-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/opus/include/
-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/json
+        ${L}/libevs/lib_com
+        ${L}/libevs/lib_enc
+        ${L}/libevs/lib_dec
+        ${L}/speex/include
+        ${L}/libs/json
     )
 
 # For MSVC static builds
-configure_msvc_runtime()
+# set_property(TARGET rtphone PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")

src/engine/agent/Agent_AudioManager.cpp

@@ -1,12 +1,12 @@
-/* Copyright(C) 2007-2017 VoIP objects (voipobjects.com)
+/* Copyright(C) 2007-2023 VoIP objects (voipobjects.com)
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "Agent_AudioManager.h"
 #include "../engine/audio/Audio_WavFile.h"
-#include "../engine/helper/HL_String.h"
 #include "../engine/audio/Audio_Null.h"
+#include "HL_String.h"
 
 #if defined(TARGET_ANDROID)
 # include "../engine/audio/Audio_Android.h"
@@ -15,168 +15,182 @@
 #define LOG_SUBSYSTEM "AudioManager"
 
 
-// ---------------- AudioManager -------------
-//static AudioManager GAudioManager;
-
 AudioManager::AudioManager()
-:mTerminal(nullptr)
+    :mTerminal(nullptr), mAudioMonitoring(nullptr)
 {
-  mPlayer.setDelegate(this);
+    mPlayer.setDelegate(this);
 }
 
 AudioManager::~AudioManager()
 {
-  //stop();
+    // stop();
 }
 
 AudioManager& AudioManager::instance()
 {
-  static std::shared_ptr<AudioManager> GAudioManager;
+    static std::shared_ptr<AudioManager> GAudioManager;
 
-  if (!GAudioManager)
-    GAudioManager = std::make_shared<AudioManager>();
+    if (!GAudioManager)
+        GAudioManager = std::make_shared<AudioManager>();
 
-  return *GAudioManager;
+    return *GAudioManager;
 }
 
 void AudioManager::setTerminal(MT::Terminal* terminal)
 {
-  mTerminal = terminal;
+    mTerminal = terminal;
 }
 
 MT::Terminal* AudioManager::terminal()
 {
-  return mTerminal;
+    return mTerminal;
+}
+
+void AudioManager::setAudioMonitoring(Audio::DataConnection* monitoring)
+{
+    mAudioMonitoring = monitoring;
+}
+
+Audio::DataConnection* AudioManager::audioMonitoring()
+{
+    return mAudioMonitoring;
 }
 
 #define LOCK_MANAGER std::unique_lock<std::mutex> l(mGuard)
 void AudioManager::start(int usageId)
 {
-  assert(mTerminal);
-  LOCK_MANAGER;
+    assert(mTerminal);
+    LOCK_MANAGER;
 
-  ICELogInfo(<< "Start main audio with usage id " << usageId);
+    ICELogInfo(<< "Start main audio with usage id " << usageId);
 
-  if (mUsage.obtain(usageId) > 1)
-    return;
+    if (mUsage.obtain(usageId) > 1)
+        return;
 
-  if (Audio::OsEngine::instance())
-    Audio::OsEngine::instance()->open();
+    if (Audio::OsEngine::instance())
+        Audio::OsEngine::instance()->open();
 
-  if (!mAudioInput || !mAudioOutput)
-  {
-      // Disable AEC for now - because PVQA conflicts with speex AEC.
-      std::shared_ptr<Audio::Enumerator> enumerator(Audio::Enumerator::make(usageId == atNull));
-      if (!mTerminal->audio())
-          mTerminal->setAudio(std::make_shared<Audio::DevicePair>(false, true));
+    if (!mAudioInput || !mAudioOutput)
+    {
+        // Disable AEC for now - because PVQA conflicts with speex AEC.
+        std::shared_ptr<Audio::Enumerator> enumerator(Audio::Enumerator::make(usageId == atNull));
+        if (!mTerminal->audio())
+        {
+            auto audio = std::make_shared<Audio::DevicePair>();
+            audio->setAgc(true);
+            audio->setAec(false);
+            audio->setMonitoring(mAudioMonitoring);
 
-      if (!mAudioInput)
-      {
-          enumerator->open(Audio::myMicrophone);
-          int inputIndex = enumerator->indexOfDefaultDevice();
+            mTerminal->setAudio(audio);
+        }
 
-          // Construct and set to terminal's audio pair input device
-          if (usageId != atNull)
-              mAudioInput = Audio::PInputDevice(Audio::InputDevice::make(enumerator->idAt(inputIndex)));
-          else
-              mAudioInput = Audio::PInputDevice(new Audio::NullInputDevice());
+        if (!mAudioInput)
+        {
+            enumerator->open(Audio::myMicrophone);
+            int inputIndex = enumerator->indexOfDefaultDevice();
 
-          mTerminal->audio()->setInput(mAudioInput);
-      }
+            // Construct and set to terminal's audio pair input device
+            if (usageId != atNull)
+                mAudioInput = Audio::PInputDevice(Audio::InputDevice::make(enumerator->idAt(inputIndex)));
+            else
+                mAudioInput = Audio::PInputDevice(new Audio::NullInputDevice());
 
-      if (!mAudioOutput)
-      {
-          Audio::Enumerator *enumerator = Audio::Enumerator::make(usageId == atNull);
-          enumerator->open(Audio::mySpeaker);
-          int outputIndex = enumerator->indexOfDefaultDevice();
+            mTerminal->audio()->setInput(mAudioInput);
+        }
 
-          // Construct and set terminal's audio pair output device
-          if (usageId != atNull)
-          {
-            if (outputIndex >= enumerator->count())
-              outputIndex = 0;
+        if (!mAudioOutput)
+        {
+            Audio::Enumerator *enumerator = Audio::Enumerator::make(usageId == atNull);
+            enumerator->open(Audio::mySpeaker);
+            int outputIndex = enumerator->indexOfDefaultDevice();
 
-              mAudioOutput = Audio::POutputDevice(
-                      Audio::OutputDevice::make(enumerator->idAt(outputIndex)));
-          }
-          else
-              mAudioOutput = Audio::POutputDevice(new Audio::NullOutputDevice());
+            // Construct and set terminal's audio pair output device
+            if (usageId != atNull)
+            {
+                if (outputIndex >= enumerator->count())
+                    outputIndex = 0;
 
-          mTerminal->audio()->setOutput(mAudioOutput);
-      }
-  }
+                mAudioOutput = Audio::POutputDevice(
+                    Audio::OutputDevice::make(enumerator->idAt(outputIndex)));
+            }
+            else
+                mAudioOutput = Audio::POutputDevice(new Audio::NullOutputDevice());
 
-  // Open audio
-  if (mAudioInput)
-    mAudioInput->open();
-  if (mAudioOutput)
-    mAudioOutput->open();
+            mTerminal->audio()->setOutput(mAudioOutput);
+        }
+    }
+
+    // Open audio
+    if (mAudioInput)
+        mAudioInput->open();
+    if (mAudioOutput)
+        mAudioOutput->open();
 }
 
 void AudioManager::close()
 {
-  mUsage.clear();
-  if (mAudioInput)
-  {
-    mAudioInput->close();
-    mAudioInput.reset();
-  }
+    mUsage.clear();
+    if (mAudioInput)
+    {
+        mAudioInput->close();
+        mAudioInput.reset();
+    }
 
-  if (mAudioOutput)
-  {
-    mAudioOutput->close();
-    mAudioOutput.reset();
-  }
-  mPlayer.setOutput(Audio::POutputDevice());
+    if (mAudioOutput)
+    {
+        mAudioOutput->close();
+        mAudioOutput.reset();
+    }
+    mPlayer.setOutput(Audio::POutputDevice());
 }
 
 void AudioManager::stop(int usageId)
 {
-  LOCK_MANAGER;
+    LOCK_MANAGER;
 
-  ICELogInfo( << "Stop main audio with usage id " << usageId);
-  if (mTerminal)
-  {
-    if (mTerminal->audio())
-      mTerminal->audio()->player().release(usageId);
-  }
+    ICELogInfo( << "Stop main audio with usage id " << usageId);
+    if (mTerminal)
+    {
+        if (mTerminal->audio())
+            mTerminal->audio()->player().release(usageId);
+    }
 
-  if (!mUsage.release(usageId))
-  {
-    close();
+    if (!mUsage.release(usageId))
+    {
+        close();
 
-    // Reset device pair on terminal side
-    mTerminal->setAudio(Audio::PDevicePair());
+        // Reset device pair on terminal side
+        mTerminal->setAudio(Audio::PDevicePair());
 
-    if (Audio::OsEngine::instance())
-      Audio::OsEngine::instance()->close();
-  }
+        if (Audio::OsEngine::instance())
+            Audio::OsEngine::instance()->close();
+    }
 }
 
 void AudioManager::startPlayFile(int usageId, const std::string& path, AudioTarget target, LoopMode lm, int timelimit)
 {
-  // Check if file exists
-  Audio::PWavFileReader r = std::make_shared<Audio::WavFileReader>();
+    // Check if file exists
+    Audio::PWavFileReader r = std::make_shared<Audio::WavFileReader>();
 #ifdef TARGET_WIN
-  r->open(StringHelper::makeTstring(path));
+    r->open(strx::makeTstring(path));
 #else
-  r->open(path);
+    r->open(path);
 #endif
-  if (!r->isOpened())
-  {
-    ICELogError(<< "Cannot open file to play");
-    return;
-  }
+    if (!r->isOpened())
+    {
+        ICELogError(<< "Cannot open file to play");
+        return;
+    }
 
-  // Delegate processing to existing audio device pair manager
-  mTerminal->audio()->player().add(usageId, r, lm == lmLoopAudio, timelimit);
-  start(usageId);
+    // Delegate processing to existing audio device pair manager
+    mTerminal->audio()->player().add(usageId, r, lm == lmLoopAudio, timelimit);
+    start(usageId);
 }
 
 void AudioManager::stopPlayFile(int usageId)
 {
-  stop(usageId);
-  mPlayer.release(usageId);
+    stop(usageId);
+    mPlayer.release(usageId);
 }
 
 void AudioManager::onFilePlayed(Audio::Player::PlaylistItem& item)
@@ -185,9 +199,9 @@ void AudioManager::onFilePlayed(Audio::Player::PlaylistItem& item)
 
 void AudioManager::process()
 {
-  mPlayer.releasePlayed();
-  std::vector<int> ids;
-  mTerminal->audio()->player().retrieveUsageIds(ids);
-  for (unsigned i=0; i<ids.size(); i++)
-    stop(ids[i]);
+    mPlayer.releasePlayed();
+    std::vector<int> ids;
+    mTerminal->audio()->player().retrieveUsageIds(ids);
+    for (unsigned i=0; i<ids.size(); i++)
+        stop(ids[i]);
 }

src/engine/agent/Agent_AudioManager.h

@@ -8,28 +8,25 @@
 
 #include "../engine/audio/Audio_Interface.h"
 #include "../engine/audio/Audio_Player.h"
-#include "../engine/endpoint/EP_Engine.h"
 #include "../engine/media/MT_Box.h"
-#include "../engine/helper/HL_Log.h"
-#include "../engine/helper/HL_Sync.h"
 
 
 
 enum
 {
-  AudioPrefix_Ring = 1,
-  AudioPrefix_Zero,
-  AudioPrefix_One,
-  AudioPrefix_Two,
-  AudioPrefix_Three,
-  AudioPrefix_Four,
-  AudioPrefix_Five,
-  AudioPrefix_Six,
-  AudioPrefix_Seven,
-  AudioPrefix_Eight,
-  AudioPrefix_Nine,
-  AudioPrefix_Asterisk,
-  AudioPrefix_Diez
+    AudioPrefix_Ring = 1,
+    AudioPrefix_Zero,
+    AudioPrefix_One,
+    AudioPrefix_Two,
+    AudioPrefix_Three,
+    AudioPrefix_Four,
+    AudioPrefix_Five,
+    AudioPrefix_Six,
+    AudioPrefix_Seven,
+    AudioPrefix_Eight,
+    AudioPrefix_Nine,
+    AudioPrefix_Asterisk,
+    AudioPrefix_Diez
 };
 
 #define AudioSessionCoeff 64
@@ -37,51 +34,56 @@ enum
 class AudioManager: public Audio::Player::EndOfAudioDelegate
 {
 public:
-  AudioManager();
-  virtual ~AudioManager();
+    AudioManager();
+    virtual ~AudioManager();
 
-  static AudioManager& instance();
+    static AudioManager& instance();
 
-  // Enforces to close audio devices. Used to shutdown AudioManager on exit from application
-  void close();
+    // Enforces to close audio devices. Used to shutdown AudioManager on exit from application
+    void close();
 
-  // Terminal and settings must be available for AudioManager
-  void setTerminal(MT::Terminal* terminal);
-  MT::Terminal* terminal();
+    // Terminal and settings must be available for AudioManager
+    void setTerminal(MT::Terminal* terminal);
+    MT::Terminal* terminal();
 
-  // Start/stop methods relies on usage counter; only first start and last stop opens/closes devices actually
-  void start(int usageId);
-  void stop(int usageId);
+    void setAudioMonitoring(Audio::DataConnection* monitoring);
+    Audio::DataConnection* audioMonitoring();
 
-  enum AudioTarget
-  {
-    atNull,
-    atReceiver,
-    atRinger
-  };
+    // Start/stop methods relies on usage counter; only first start and last stop opens/closes devices actually
+    void start(int usageId);
+    void stop(int usageId);
 
-  enum LoopMode
-  {
-    lmLoopAudio,
-    lmNoloop
-  };
+    enum AudioTarget
+    {
+        atNull,
+        atReceiver,
+        atRinger
+    };
 
-  void startPlayFile(int usageId, const std::string& path, AudioTarget target, LoopMode lm, int timelimit = 0);
-  void stopPlayFile(int usageId);
+    enum LoopMode
+    {
+        lmLoopAudio,
+        lmNoloop
+    };
 
-  void onFilePlayed(Audio::Player::PlaylistItem& item);
+    void startPlayFile(int usageId, const std::string& path, AudioTarget target, LoopMode lm, int timelimit = 0);
+    void stopPlayFile(int usageId);
 
-  // Must be called from main loop to release used audio devices
-  void process();
+
+    void onFilePlayed(Audio::Player::PlaylistItem& item);
+
+    // Must be called from main loop to release used audio devices
+    void process();
 
 protected:
-  Audio::PInputDevice mAudioInput;
-  Audio::POutputDevice mAudioOutput;
-  Audio::Player mPlayer;
-  MT::Terminal* mTerminal;
+    Audio::PInputDevice mAudioInput;
+    Audio::POutputDevice mAudioOutput;
+    Audio::Player mPlayer;
+    MT::Terminal* mTerminal;
+    Audio::DataConnection* mAudioMonitoring;
 
-  std::map<int, int> UsageMap;
-  UsageCounter mUsage;
-  std::mutex mGuard;
+    std::map<int, int> UsageMap;
+    UsageCounter mUsage;
+    std::mutex mGuard;
 };
 #endif

src/engine/agent/Agent_Impl.cpp

@@ -32,6 +32,24 @@ AgentImpl::~AgentImpl()
     stopAgentAndThread();
 }
 
+// Get access to internal audio manager. Value can be nullptr.
+const std::shared_ptr<AudioManager>& AgentImpl::audioManager() const
+{
+  return mAudioManager;
+}
+
+void AgentImpl::setAudioMonitoring(Audio::DataConnection* monitoring)
+{
+  mAudioMonitoring = monitoring;
+  if (mAudioManager)
+    mAudioManager->setAudioMonitoring(monitoring);
+}
+
+Audio::DataConnection* AgentImpl::monitoring() const
+{
+  return mAudioMonitoring;
+}
+
 void AgentImpl::run()
 {
     while (!mShutdown)
@@ -132,7 +150,9 @@ std::string AgentImpl::command(const std::string& command)
     {
         answer["status"] = e.what();
     }
-    return answer.toStyledString();
+    std::string result = answer.toStyledString();
+
+    return result;
 }
 
 bool AgentImpl::waitForData(int /*milliseconds*/)
@@ -210,8 +230,10 @@ void AgentImpl::processStart(JsonCpp::Value& request, JsonCpp::Value &answer)
     // Enable audio
     mAudioManager = std::make_shared<AudioManager>();
     mAudioManager->setTerminal(mTerminal.get());
+    if (mAudioMonitoring)
+      mAudioManager->setAudioMonitoring(mAudioMonitoring);
 
-    // Do not start here. Start right before call.
+    // Do not start audio manager here. Start right before call.
 
     // Initialize endpoint
     start();
@@ -238,7 +260,7 @@ void AgentImpl::processCreateAccount(JsonCpp::Value &d, JsonCpp::Value& answer)
     (*c)[CONFIG_DOMAIN] = d["domain"].asString();
     (*c)[CONFIG_EXTERNALIP] = d["use_external_ip"].asBool();
 
-    auto nameAndPort = StringHelper::parseHost(d["stun_server"].asString(), 3478);
+    auto nameAndPort = strx::parseHost(d["stun_server"].asString(), 3478);
     (*c)[CONFIG_STUNSERVER_NAME] = nameAndPort.first;
     (*c)[CONFIG_STUNSERVER_PORT] = nameAndPort.second;
 
@@ -320,7 +342,7 @@ void AgentImpl::processStartSession(JsonCpp::Value& request, JsonCpp::Value& ans
         PDataProvider audioProvider = std::make_shared<AudioProvider>(*this, *mTerminal);
         audioProvider->setState(audioProvider->state() | static_cast<int>(StreamState::Grabbing) | static_cast<int>(StreamState::Playing));
 
-#if defined(USE_AQUA_LIBRARY)
+/*#if defined(USE_AQUA_LIBRARY)
         std::string path_faults = request["path_faults"].asString();
 
         sevana::aqua::config config = {
@@ -344,8 +366,8 @@ void AgentImpl::processStartSession(JsonCpp::Value& request, JsonCpp::Value& ans
         };
 
         // std::string config = "-avlp on -smtnrm on -decor off -mprio off -npnt auto -voip off -enorm off -g711 on -spfrcor off -grad off -tmc on -miter 1 -trim a 10 -output json";
-        /*if (temp_path.size())
-            config += " -fau " + temp_path; */
+        // if (temp_path.size())
+        //    config += " -fau " + temp_path;
 
         auto qc = std::make_shared<sevana::aqua>();
         if (!qc->is_open())
@@ -358,6 +380,7 @@ void AgentImpl::processStartSession(JsonCpp::Value& request, JsonCpp::Value& ans
         mAquaMap[sessionIter->first] = qc;
         dynamic_cast<AudioProvider*>(audioProvider.get())->configureMediaObserver(this, (void*)qc.get());
 #endif
+        */
 
         // TODO: support SRTP via StreamState::Srtp option in audio provider state
 
@@ -432,9 +455,9 @@ void AgentImpl::processDestroySession(JsonCpp::Value& request, JsonCpp::Value& a
     auto sessionIter = mSessionMap.find(sessionId);
     if (sessionIter != mSessionMap.end())
         mSessionMap.erase(sessionIter);
-#if defined(USE_AQUA_LIBRARY)
-    closeAqua(sessionId);
-#endif
+//#if defined(USE_AQUA_LIBRARY)
+//    closeAqua(sessionId);
+//#endif
     answer["status"] = Status_Ok;
 }
 
@@ -458,41 +481,6 @@ void AgentImpl::processWaitForEvent(JsonCpp::Value &request, JsonCpp::Value &ans
     answer["status"] = Status_Ok;
 }
 
-#if defined(USE_PVQA_LIBRARY)
-static JsonCpp::Value CsvReportToJson(const std::string& report)
-{
-    JsonCpp::Value detectorValues;
-    std::istringstream iss(report);
-    CsvReader reader(iss);
-    std::vector<std::string> cells;
-    if (reader.readLine(cells))
-    {
-        JsonCpp::Value detectorNames;
-        for (size_t nameIndex = 0; nameIndex < cells.size(); nameIndex++)
-            detectorNames[static_cast<int>(nameIndex)] = StringHelper::trim(cells[nameIndex]);
-        // Put first line name of columns
-        detectorValues[0] = detectorNames;
-
-        int rowIndex = 1;
-        while (reader.readLine(cells))
-        {
-            // Skip last column for now
-            JsonCpp::Value row;
-            for (size_t valueIndex = 0; valueIndex < cells.size(); valueIndex++)
-            {
-                bool isFloat = true;
-                float v = StringHelper::toFloat(cells[valueIndex], 0.0, &isFloat);
-                if (isFloat)
-                    row[static_cast<int>(valueIndex)] = static_cast<double>(v);
-                else
-                    row[static_cast<int>(valueIndex)] = cells[valueIndex];
-            }
-            detectorValues[rowIndex++] = row;
-        }
-    }
-    return detectorValues;
-}
-#endif
 
 void AgentImpl::processGetMediaStats(JsonCpp::Value& request, JsonCpp::Value& answer)
 {
@@ -503,24 +491,13 @@ void AgentImpl::processGetMediaStats(JsonCpp::Value& request, JsonCpp::Value& an
     {
         PSession session = sessionIter->second;
         VariantMap result;
-        bool includePvqa = request["include_pvqa"].asBool();
-#if defined(USE_AQUA_LIBRARY)
-        bool includeAqua = request["include_aqua"].asBool();
-        std::string aquaReference = request["aqua_reference_audio"].asString();
-#endif
-        session->getSessionInfo(includePvqa ? Session::InfoOptions::Detailed : Session::InfoOptions::Standard,
+        session->getSessionInfo(Session::InfoOptions::Detailed,
                                 result);
 
         if (result.exists(SessionInfo_AudioCodec))
             answer["codec"] = result[SessionInfo_AudioCodec].asStdString();
         if (result.exists(SessionInfo_NetworkMos))
             answer["network_mos"] = result[SessionInfo_NetworkMos].asFloat();
-#if defined(USE_PVQA_LIBRARY)
-        if (result.exists(SessionInfo_PvqaMos))
-            answer["pvqa_mos"] = result[SessionInfo_PvqaMos].asFloat();
-        if (result.exists(SessionInfo_PvqaReport))
-            answer["pvqa_report"] = CsvReportToJson(result[SessionInfo_PvqaReport].asStdString());
-#endif
         if (result.exists(SessionInfo_PacketLoss))
             answer["rtp_lost"] = result[SessionInfo_LostRtp].asInt();
         if (result.exists(SessionInfo_DroppedRtp))
@@ -543,74 +520,6 @@ void AgentImpl::processGetMediaStats(JsonCpp::Value& request, JsonCpp::Value& an
         if (result.exists(SessionInfo_RemotePeer))
             answer["rtp_remotepeer"] = result[SessionInfo_RemotePeer].asStdString();
 
-#if defined(USE_AQUA_LIBRARY)
-        if (includeAqua)
-        {
-            answer["incoming_audio"] = mAquaIncoming.hexstring();
-            answer["incoming_audio_samplerate"] = AUDIO_SAMPLERATE;
-            answer["incoming_audio_channels"] = AUDIO_CHANNELS;
-
-            ICELogInfo(<< "Running AQuA analyzer.");
-            ByteBuffer referenceAudio;
-            // Read AQuA reference audio from file if available
-            if (aquaReference.empty())
-            {
-                ICELogCritical(<< "AQuA reference audio file is not set, skipping analyzing.");
-            }
-            else {
-                auto sa = mAquaMap[sessionIter->first];
-                if (sa) {
-                    Audio::WavFileReader reader;
-                    reader.open(StringHelper::makeTstring(aquaReference));
-
-                    if (reader.isOpened()) {
-                        char buffer[1024];
-                        int wasRead = 0;
-                        do {
-                            wasRead = reader.read(buffer, 1024);
-                            if (wasRead > 0)
-                                referenceAudio.appendBuffer(buffer, wasRead);
-                        } while (wasRead == 1024);
-                    }
-                    else {
-                        ICELogCritical(<< "Failed to read AQuA reference audio, error code: " << reader.lastError());
-                    }
-
-                    sevana::aqua::audio_buffer test(mAquaIncoming.data(), mAquaIncoming.size()),
-                            reference(referenceAudio.data(), referenceAudio.size());
-                    test.mRate = AUDIO_SAMPLERATE;
-                    reference.mRate = AUDIO_SAMPLERATE;
-                    test.mChannels = AUDIO_CHANNELS;
-                    reference.mChannels = AUDIO_CHANNELS;
-                    ICELogInfo(
-                            << "Comparing test audio " << mAquaIncoming.size() << " bytes with reference audio " << referenceAudio.size() << " bytes.");
-                    auto r = sa->compare(reference, test);
-                    if (r.mErrorCode) {
-                        ICELogInfo(
-                                << "Error code: " << r.mErrorCode << ", msg: " << r.mErrorMessage);
-                    } else {
-                        ICELogInfo(<< "MOS: " << r.mMos << ", faults: " << r.mFaultsText);
-                    }
-                    answer["aqua_mos"] = r.mMos;
-                    answer["aqua_report"] = r.mFaultsText;
-                    /*std::string aqua_audio_text;
-                    if (Base64::Encode(std::string(reinterpret_cast<const char*>(mAquaIncoming.data()), mAquaIncoming.size()), &aqua_audio_text))
-                    {
-                        answer["aqua_audio"] = aqua_audio_text;
-                    }*/
-
-                    if (r.mErrorCode) {
-                        answer["aqua_error_code"] = r.mErrorCode;
-                        answer["aqua_error_message"] = r.mErrorMessage;
-                    }
-                    closeAqua(sessionIter->first);
-                }
-            }
-            // Remove test audio
-            mAquaIncoming.clear(); mAquaOutgoing.clear();
-        }
-#endif
-
         answer["status"] = Status_Ok;
     }
     else
@@ -631,18 +540,16 @@ void AgentImpl::processAddRootCert(JsonCpp::Value& request, JsonCpp::Value& answ
     std::string pem = request["cert"].asString();
 
     std::string::size_type pb = 0, pe = 0;
+    while (pb != std::string::npos && pe != std::string::npos) {
+        pb = pem.find(BeginCertificate, pb);
+        pe = pem.find(EndCertificate, pe);
 
-    for(pb = pem.find(BeginCertificate, pb), pe = pem.find(EndCertificate, pe);
-        pb != std::string::npos && pe != std::string::npos;
-        pb = pem.find(BeginCertificate, pb + BeginCertificate.size()), pe = pem.find(EndCertificate, pe + EndCertificate.size()))
-    {
-        // Get single certificate
-        std::string cert = pem.substr(pb, pe + EndCertificate.size());
-        //int size = cert.size();
-        addRootCert(ByteBuffer(cert.c_str(), cert.size()));
+        if (pb != std::string::npos && pe != std::string::npos && pe > pb) {
+            std::string cert = pem.substr(pb, pe - pb + EndCertificate.size());
+            addRootCert(ByteBuffer(cert.c_str(), cert.size()));
 
-        // Delete processed part
-        pem.erase(0, pe + EndCertificate.size());
+            pb = ++pe;
+        }
     }
 
     answer["status"] = Status_Ok;
@@ -730,7 +637,7 @@ void AgentImpl::processUseStreamForSession(JsonCpp::Value& request, JsonCpp::Val
                 else
                 {
                     Audio::PWavFileReader reader = std::make_shared<Audio::WavFileReader>();
-                    if (!reader->open(StringHelper::makeTstring(path)))
+                    if (!reader->open(strx::makeTstring(path)))
                         answer["status"] = Status_FailedToOpenFile;
                     else
                     {
@@ -740,59 +647,48 @@ void AgentImpl::processUseStreamForSession(JsonCpp::Value& request, JsonCpp::Val
                 }
             }
             else
-                if (actionText == "write")
+            if (actionText == "write")
+            {
+                if (path.empty())
                 {
-                    if (path.empty())
-                    {
-                        // Turn off recording from the stream
-                        prov->writeFile(Audio::PWavFileWriter(), direction);
-                        answer["status"] = Status_Ok;
-                    }
-                    else
-                    {
-                        Audio::PWavFileWriter writer = std::make_shared<Audio::WavFileWriter>();
-                        if (!writer->open(StringHelper::makeTstring(path), AUDIO_SAMPLERATE, AUDIO_CHANNELS))
-                            answer["status"] = Status_FailedToOpenFile;
-                        else
-                        {
-                            prov->writeFile(writer, direction);
-                            answer["status"] = Status_Ok;
-                        }
-                    }
+                    // Turn off recording from the stream
+                    prov->writeFile(Audio::PWavFileWriter(), direction);
+                    answer["status"] = Status_Ok;
                 }
                 else
-                    if (actionText == "mirror")
+                {
+                    Audio::PWavFileWriter writer = std::make_shared<Audio::WavFileWriter>();
+                    if (!writer->open(strx::makeTstring(path), AUDIO_SAMPLERATE, AUDIO_CHANNELS))
+                        answer["status"] = Status_FailedToOpenFile;
+                    else
                     {
-                        prov->setupMirror(request["enable"].asBool());
+                        prov->writeFile(writer, direction);
                         answer["status"] = Status_Ok;
                     }
-                    else
-                        answer["status"] = Status_AccountNotFound;
+                }
+            }
+            else
+            if (actionText == "mirror")
+            {
+                prov->setupMirror(request["enable"].asBool());
+                answer["status"] = Status_Ok;
+            }
+            else
+                answer["status"] = Status_AccountNotFound;
         }
         else
             answer["status"] = Status_NoMediaAction;
     }
 }
 
-#if defined(USE_AQUA_LIBRARY)
 void AgentImpl::onMedia(const void* data, int length, MT::Stream::MediaDirection direction, void* context, void* userTag)
 {
-    /*  if (mIncomingAudioDump && direction == MT::Stream::MediaDirection::Incoming)
-    mIncomingAudioDump->write(data, length);
-
-  if (mOutgoingAudioDump && direction == MT::Stream::MediaDirection::Outgoing)
-    mOutgoingAudioDump->write(data, length);*/
-
-    // User tag points to accumulator object which includes
-    // auto* sa = reinterpret_cast<sevana::aqua*>(userTag);
-
-    switch (direction)
+    /*switch (direction)
     {
     case MT::Stream::MediaDirection::Incoming: mAquaIncoming.appendBuffer(data, length); break;
     case MT::Stream::MediaDirection::Outgoing: mAquaOutgoing.appendBuffer(data, length); break;
-    }
+    }*/
 }
-#endif
 
 
 // Called on new incoming session; providers shoukld
@@ -949,12 +845,12 @@ void AgentImpl::addEvent(const JsonCpp::Value& v)
 }
 
 #if defined(USE_AQUA_LIBRARY)
-void AgentImpl::closeAqua(int sessionId)
+/*void AgentImpl::closeAqua(int sessionId)
 {
     auto aquaIter = mAquaMap.find(sessionId);
     if (aquaIter != mAquaMap.end()) {
         aquaIter->second->close();
         mAquaMap.erase(aquaIter);
     }
-}
+}*/
 #endif

src/engine/agent/Agent_Impl.h

@@ -14,7 +14,8 @@
 #include <mutex>
 #include <condition_variable>
 
-class AgentImpl: public UserAgent
+
+class AgentImpl: public UserAgent, public MT::Stream::MediaObserver
 {
 protected:
   std::recursive_mutex mAgentMutex;
@@ -29,19 +30,12 @@ protected:
   typedef std::map<int, PSession> SessionMap;
   SessionMap mSessionMap;
 
-#if defined(USE_AQUA_LIBRARY)
-  // Keys are the same as used in mSessionMap
-  typedef std::map<int, std::shared_ptr<sevana::aqua>> AquaMap;
-  AquaMap mAquaMap;
-  ByteBuffer mAquaIncoming, mAquaOutgoing;
-  void closeAqua(int sessionId);
-#endif
 
   std::shared_ptr<std::thread> mThread;
   volatile bool mShutdown;
   std::shared_ptr<MT::Terminal> mTerminal;
   std::shared_ptr<AudioManager> mAudioManager;
-  //Audio::PWavFileWriter mIncomingAudioDump, mOutgoingAudioDump;
+  Audio::DataConnection* mAudioMonitoring = nullptr;
 
   void run();
   void addEvent(const JsonCpp::Value& v);
@@ -72,6 +66,12 @@ public:
   bool waitForData(int milliseconds);
   std::string read();
 
+  // Get access to internal audio manager. Value can be nullptr.
+  const std::shared_ptr<AudioManager>& audioManager() const;
+
+  void setAudioMonitoring(Audio::DataConnection* monitoring);
+  Audio::DataConnection* monitoring() const;
+
   // UserAgent overrides
   // Called on new incoming session; providers shoukld
   PDataProvider onProviderNeeded(const std::string& name) override;
@@ -121,10 +121,8 @@ public:
   // Called when problem with SIP connection(s) detected
   void onSipConnectionFailed() override;
 
-#if defined(USE_AQUA_LIBRARY)
   // Called on incoming & outgoing audio for voice sessions
   void onMedia(const void* data, int length, MT::Stream::MediaDirection direction, void* context, void* userTag) override;
-#endif
 };
 
 #endif

src/engine/audio/Audio_Android.cpp

@@ -365,8 +365,9 @@ void AndroidInputDevice::DeviceCallback(SLAndroidSimpleBufferQueueItf bq, void *
 // ------------ AndroidOutputDevice -----------------
 AndroidOutputDevice::AndroidOutputDevice(int devId)
 {
-  ICELogDebug(<< "Creating AndroidOutputDevice. This is: " << StringHelper::toHex(this));
+  ICELogDebug(<< "Creating AndroidOutputDevice. This is: " << strx::toHex(this));
 }
+
 AndroidOutputDevice::~AndroidOutputDevice()
 {
   ICELogDebug(<< "Deleting AndroidOutputDevice.");

src/engine/audio/Audio_AndroidOboe.cpp

@@ -136,7 +136,7 @@ int AndroidInputDevice::readBuffer(void* buffer)
 // ------------ AndroidOutputDevice -----------------
 AndroidOutputDevice::AndroidOutputDevice(int devId)
 {
-  ICELogDebug(<< "Creating AndroidOutputDevice. This is: " << StringHelper::toHex(this));
+  ICELogDebug(<< "Creating AndroidOutputDevice. This is: " << strx::toHex(this));
 }
 AndroidOutputDevice::~AndroidOutputDevice()
 {

src/engine/audio/Audio_DataWindow.cpp

@@ -10,171 +10,171 @@ using namespace Audio;
 
 DataWindow::DataWindow()
 {
-  mFilled = 0;
-  mData = NULL;
-  mCapacity = 0;
+    mFilled = 0;
+    mData = NULL;
+    mCapacity = 0;
 }
 
 DataWindow::~DataWindow()
 {
-  if (mData)
-    free(mData);
+    if (mData)
+        free(mData);
 }
 
 void DataWindow::setCapacity(int capacity)
 {
-  Lock l(mMutex);
-  int tail  = capacity - mCapacity;
-  mData = (char*)realloc(mData, capacity);
-  if (tail > 0)
-    memset(mData + mCapacity, 0, tail);
-  mCapacity = capacity;
+    Lock l(mMutex);
+    int tail  = capacity - mCapacity;
+    mData = (char*)realloc(mData, capacity);
+    if (tail > 0)
+        memset(mData + mCapacity, 0, tail);
+    mCapacity = capacity;
 }
 
 void DataWindow::addZero(int length)
 {
-  Lock l(mMutex);
+    Lock l(mMutex);
 
-  if (length > mCapacity)
-    length = mCapacity;
+    if (length > mCapacity)
+        length = mCapacity;
 
-  int avail = mCapacity - mFilled;
+    int avail = mCapacity - mFilled;
 
-  if (avail < length)
-  {
-    memmove(mData, mData + length - avail, mFilled - (length - avail));
-    mFilled -= length - avail;
-  }
-  memset(mData + mFilled, 0, length);
-  mFilled += length;
+    if (avail < length)
+    {
+        memmove(mData, mData + length - avail, mFilled - (length - avail));
+        mFilled -= length - avail;
+    }
+    memset(mData + mFilled, 0, length);
+    mFilled += length;
 }
 
 
 void DataWindow::add(const void* data, int length)
 {
-  Lock l(mMutex);
+    Lock l(mMutex);
 
-  if (length > mCapacity)
-  {
-    // Use latest bytes from data buffer in this case.
-    data = (char*)data + length - mCapacity;
-    length = mCapacity;
-  }
+    if (length > mCapacity)
+    {
+        // Use latest bytes from data buffer in this case.
+        data = (char*)data + length - mCapacity;
+        length = mCapacity;
+    }
 
-  // Check how much free space we have
-  int avail = mCapacity - mFilled;
+    // Check how much free space we have
+    int avail = mCapacity - mFilled;
 
-  if (avail < length)
-  {
-    // Find the portion of data to move & save
-    int delta = length - avail;
+    if (avail < length)
+    {
+        // Find the portion of data to move & save
+        int delta = length - avail;
 
-    // Move the data
-    if (mFilled - delta > 0)
-      memmove(mData, mData + delta, mFilled - delta);
-    mFilled -= delta;
-  }
+        // Move the data
+        if (mFilled - delta > 0)
+            memmove(mData, mData + delta, mFilled - delta);
+        mFilled -= delta;
+    }
 
-  memcpy(mData + mFilled, data, length);
-  mFilled += length;
+    memcpy(mData + mFilled, data, length);
+    mFilled += length;
 }
 
 void DataWindow::add(short sample)
 {
-  add(&sample, sizeof sample);
+    add(&sample, sizeof sample);
 }
 
 void DataWindow::erase(int length)
 {
-  Lock l(mMutex);
-  if (length > mFilled)
-    length = mFilled;
-  if (length != mFilled)
-    memmove(mData, mData + length, mFilled - length);
-  mFilled -= length;
+    Lock l(mMutex);
+    if (length > mFilled)
+        length = mFilled;
+    if (length != mFilled)
+        memmove(mData, mData + length, mFilled - length);
+    mFilled -= length;
 }
 
 const char* DataWindow::data() const
 {
-  return mData;
+    return mData;
 }
 
 char* DataWindow::mutableData()
 {
-  return mData;
+    return mData;
 }
 
 void DataWindow::clear()
 {
-  Lock l(mMutex);
-  mFilled = 0;
+    Lock l(mMutex);
+    mFilled = 0;
 }
 
 short DataWindow::shortAt(int index) const
 {
-  Lock l(mMutex);
-  assert(index < mFilled / 2);
-  return ((short*)mData)[index];
+    Lock l(mMutex);
+    assert(index < mFilled / 2);
+    return ((short*)mData)[index];
 }
 
 void DataWindow::setShortAt(short value, int index)
 {
-  Lock l(mMutex);
-  assert(index < mFilled / 2);
-  ((short*)mData)[index] = value;
+    Lock l(mMutex);
+    assert(index < mFilled / 2);
+    ((short*)mData)[index] = value;
 }
 
 int DataWindow::read(void* buffer, int length)
 {
-  Lock l(mMutex);
-  if (length > mFilled)
-    length = mFilled;
-  if (length)
-  {
-    if (buffer)
-      memcpy(buffer, mData, length);
-    if (length < mFilled)
-      memmove(mData, mData+length, mFilled - length);
-    mFilled -= length;
-  }
-  return length;
+    Lock l(mMutex);
+    if (length > mFilled)
+        length = mFilled;
+    if (length)
+    {
+        if (buffer)
+            memcpy(buffer, mData, length);
+        if (length < mFilled)
+            memmove(mData, mData+length, mFilled - length);
+        mFilled -= length;
+    }
+    return length;
 }
 
 int DataWindow::filled() const
 {
-  Lock l(mMutex);
-  return mFilled;
+    Lock l(mMutex);
+    return mFilled;
 }
 
 void DataWindow::setFilled(int filled)
 {
-  Lock l(mMutex);
-  mFilled = filled;
+    Lock l(mMutex);
+    mFilled = filled;
 }
 
 int DataWindow::capacity() const
 {
-  Lock l(mMutex);
-  return mCapacity;
+    Lock l(mMutex);
+    return mCapacity;
 }
 
 void DataWindow::zero(int length)
 {
-  Lock l(mMutex);
-  assert(length <= mCapacity);
-  mFilled = length;
-  memset(mData, 0, mFilled);
+    Lock l(mMutex);
+    assert(length <= mCapacity);
+    mFilled = length;
+    memset(mData, 0, mFilled);
 }
 
 void DataWindow::makeStereoFromMono(DataWindow& dst, DataWindow& src)
 {
-  Lock lockDst(dst.mMutex), lockSrc(src.mMutex);
+    Lock lockDst(dst.mMutex), lockSrc(src.mMutex);
 
-  dst.setCapacity(src.filled()*2);
-  short* input = (short*)src.mutableData();
-  short* output = (short*)dst.mutableData();
+    dst.setCapacity(src.filled()*2);
+    short* input = (short*)src.mutableData();
+    short* output = (short*)dst.mutableData();
 
-  for (int i=0; i<src.filled()/2; i++)
-    output[i*2] = output[i*2+1] = input[i];
-  dst.mFilled = src.filled() * 2;
+    for (int i=0; i<src.filled()/2; i++)
+        output[i*2] = output[i*2+1] = input[i];
+    dst.mFilled = src.filled() * 2;
 }

src/engine/audio/Audio_DevicePair.cpp

@@ -13,8 +13,9 @@
 using namespace Audio;
 
 // --- DevicePair ---
-DevicePair::DevicePair(bool aec, bool agc)
-:mConfig(NULL), mDelegate(NULL), mAec(aec), mAgc(agc), mAecFilter(AUDIO_MIC_BUFFER_LENGTH*10, AUDIO_MIC_BUFFER_LENGTH, AUDIO_SAMPLERATE), mAgcFilter(AUDIO_CHANNELS)
+DevicePair::DevicePair()
+:mConfig(nullptr), mDelegate(nullptr), mAec(false), mAgc(false), mAecFilter(AUDIO_MIC_BUFFER_LENGTH*10, AUDIO_MIC_BUFFER_LENGTH, AUDIO_SAMPLERATE), mAgcFilter(AUDIO_CHANNELS),
+  mMonitoring(nullptr)
 {
   mInputBuffer.setCapacity(AUDIO_MIC_BUFFER_SIZE * (AUDIO_MIC_BUFFER_COUNT + 1));
   mOutputBuffer.setCapacity(AUDIO_SPK_BUFFER_SIZE * (AUDIO_SPK_BUFFER_COUNT + 1));
@@ -28,26 +29,50 @@ DevicePair::~DevicePair()
   if (mInput)
   {
     if (mInput->connection() == this)
-      mInput->setConnection(NULL);
+      mInput->setConnection(nullptr);
     mInput.reset();
   }
 
   if (mOutput)
   {
     if (mOutput->connection() == this)
-      mOutput->setConnection(NULL);
+      mOutput->setConnection(nullptr);
     mOutput.reset();
   }
 }
 
+DevicePair& DevicePair::setAec(bool aec)
+{
+  mAec = aec;
+  return *this;
+}
+
+bool DevicePair::aec()
+{
+  return mAec;
+}
+
+DevicePair& DevicePair::setAgc(bool agc)
+{
+  mAgc = agc;
+  return *this;
+}
+
+bool DevicePair::agc()
+{
+  return mAgc;
+}
+
+
 VariantMap* DevicePair::config()
 {
   return mConfig;
 }
 
-void DevicePair::setConfig(VariantMap* config)
+DevicePair& DevicePair::setConfig(VariantMap* config)
 {
   mConfig = config;
+  return *this;
 }
 
 PInputDevice DevicePair::input()
@@ -55,15 +80,17 @@ PInputDevice DevicePair::input()
   return mInput;
 }
 
-void DevicePair::setInput(PInputDevice input)
+DevicePair& DevicePair::setInput(PInputDevice input)
 {
   if (mInput == input)
-    return;
+    return *this;
 
   mInput = input;
   mInput->setConnection(this);
   if (mDelegate)
     mDelegate->deviceChanged(this);
+
+  return *this;
 }
 
 POutputDevice DevicePair::output()
@@ -71,14 +98,17 @@ POutputDevice DevicePair::output()
   return mOutput;
 }
 
-void DevicePair::setOutput(POutputDevice output)
+DevicePair& DevicePair::setOutput(POutputDevice output)
 {
   if (output == mOutput)
-    return;
+    return *this;
+
   mOutput = output;  
   mOutput->setConnection(this);
   if (mDelegate)
     mDelegate->deviceChanged(this);
+
+  return *this;
 }
 
 bool DevicePair::start()
@@ -88,6 +118,7 @@ bool DevicePair::start()
     result = mInput->open();
   if (mOutput && result)
     result &= mOutput->open();
+
   return result;
 }
 
@@ -99,9 +130,10 @@ void DevicePair::stop()
     mOutput->close();
 }
 
-void DevicePair::setDelegate(Delegate* dc)
+DevicePair& DevicePair::setDelegate(Delegate* dc)
 {
   mDelegate = dc;
+  return *this;
 }
 
 DevicePair::Delegate* DevicePair::delegate()
@@ -109,6 +141,17 @@ DevicePair::Delegate* DevicePair::delegate()
   return mDelegate;
 }
 
+DevicePair& DevicePair::setMonitoring(DataConnection* monitoring)
+{
+  mMonitoring = monitoring;
+  return *this;
+}
+
+DataConnection* DevicePair::monitoring()
+{
+  return mMonitoring;
+}
+
 Player& DevicePair::player()
 {
   return mPlayer;
@@ -219,6 +262,10 @@ void DevicePair::onSpkData(const Format& f, void* buffer, int length)
 
   mOutputNativeData.read(buffer, length);
 
+  // Send data to monitoring if needed
+  if (mMonitoring)
+    mMonitoring->onSpkData(f, buffer, length);
+
   #define AEC_FRAME_SIZE (AUDIO_CHANNELS * (AUDIO_SAMPLERATE / 1000) * AEC_FRAME_TIME * sizeof(short))
 
   // AEC filter wants frames.
@@ -229,7 +276,6 @@ void DevicePair::onSpkData(const Format& f, void* buffer, int length)
       mAecFilter.toSpeaker(mAecSpkBuffer.mutableData() + AEC_FRAME_SIZE * frameIndex);
     mAecSpkBuffer.erase(nrOfFrames * AEC_FRAME_SIZE);
   }
-  //ICELogMedia(<< "Audio::DevicePair::onSpkData() end")
 }
 
 void DevicePair::processMicData(const Format& f, void* buffer, int length)

src/engine/audio/Audio_DevicePair.h

@@ -26,29 +26,32 @@ namespace Audio
       virtual void deviceChanged(DevicePair* dpair) = 0;
     };
 
-    DevicePair(bool aec = true, bool agc = true);
+    DevicePair();
     virtual ~DevicePair();
 
-    void setAec(bool aec);
+    DevicePair& setAec(bool aec);
     bool aec();
-    void setAgc(bool agc);
+    DevicePair& setAgc(bool agc);
     bool agc();
 
     VariantMap* config();
-    void setConfig(VariantMap* config);
+    DevicePair& setConfig(VariantMap* config);
 
     PInputDevice input();
-    void setInput(PInputDevice input);
+    DevicePair& setInput(PInputDevice input);
 
     POutputDevice output();
-    void setOutput(POutputDevice output);
+    DevicePair& setOutput(POutputDevice output);
 
     bool start();
     void stop();
 
-    void setDelegate(Delegate* dc);
+    DevicePair& setDelegate(Delegate* dc);
     Delegate* delegate();
 
+    DevicePair& setMonitoring(DataConnection* monitoring);
+    DataConnection* monitoring();
+
     Player& player();
 
   protected:
@@ -63,6 +66,7 @@ namespace Audio
     Player mPlayer;
     UniversalResampler mMicResampler, mSpkResampler;
     DataWindow mInputBuffer, mOutputBuffer, mAecSpkBuffer, mInputResampingData, mOutputNativeData, mOutput10msBuffer;
+    DataConnection* mMonitoring;
 
 #ifdef DUMP_NATIVEOUTPUT
     std::shared_ptr<WavFileWriter> mNativeOutputDump;

src/engine/audio/Audio_DirectSound.h

@@ -1,4 +1,4 @@
-/* Copyright(C) 2007-2017 VoIP objects (voipobjects.com)
+/* Copyright(C) 2007-2025 VoIP objects (voipobjects.com)
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -6,7 +6,7 @@
 #ifndef __AUDIO_DSOUND_H
 #define __AUDIO_DSOUND_H
 
-#include "../config.h"
+#include "../engine_config.h"
 
 #include <winsock2.h>
 #include <windows.h>

src/engine/audio/Audio_Helper.cpp

@@ -29,10 +29,6 @@ TimeSource::TimeSource(int quantTime, int nrOfQuants)
   mTailTime = 0;
 }
 
-TimeSource::~TimeSource()
-{
-}
-
 void TimeSource::start()
 {
 #ifdef TARGET_WIN
@@ -102,11 +98,12 @@ unsigned TimeSource::time()
 #if defined(TARGET_ANDROID)
   assert(0);
 #endif
+  return 0;
 }
 
 // --- StubTimer ---
 StubTimer::StubTimer(int bufferTime, int bufferCount)
-:mBufferTime(bufferTime), mBufferCount(bufferCount), mTimeSource(bufferTime, bufferCount), mActive(false)
+:mBufferTime(bufferTime), mBufferCount(bufferCount), mTimeSource(bufferTime, bufferCount), mActive(false), mCurrentTime(0)
 {
 #ifdef TARGET_WIN
     mStubSignal = ::CreateEvent(NULL, FALSE, FALSE, NULL);

src/engine/audio/Audio_Helper.h

@@ -47,7 +47,7 @@ namespace Audio
 
   public:
     TimeSource(int quantTime, int nrOfQuants);
-    ~TimeSource();
+    ~TimeSource() = default;
 
     void start();
     void stop();

src/engine/audio/Audio_Interface.h

@@ -7,7 +7,7 @@
 #define __AUDIO_INTERFACE_H
 
 #include <string>
-#include "../config.h"
+#include "../engine_config.h"
 #include "../helper/HL_Types.h"
 #include "../helper/HL_VariantMap.h"
 #include "../helper/HL_Pointer.h"
@@ -57,6 +57,27 @@ namespace Audio
       sprintf(buffer, "%dHz %dch", mRate, mChannels);
       return std::string(buffer);
     }
+
+    bool operator == (const Format& rhs) const
+    {
+        return mRate == rhs.mRate && mChannels == rhs.mChannels;
+    }
+
+    bool operator != (const Format& rhs) const
+    {
+        return mRate != rhs.mRate || mChannels != rhs.mChannels;
+    }
+
+    int rate() const
+    {
+        return mRate;
+    }
+
+    int channels() const
+    {
+        return mChannels;
+    }
+
   };
 
   class DataConnection

src/engine/audio/Audio_Mixer.cpp

@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "../config.h"
+#include "../engine_config.h"
 #include "../helper/HL_Exception.h"
 #include "../helper/HL_Log.h"
 

src/engine/audio/Audio_Mixer.h

@@ -6,7 +6,7 @@
 #ifndef _RX_MIXER_H
 #define _RX_MIXER_H
 
-#include "../config.h"
+#include "../engine_config.h"
 #include "../helper/HL_ByteBuffer.h"
 #include "../helper/HL_Sync.h"
 #include "Audio_Resampler.h"

src/engine/audio/Audio_Null.cpp

@@ -1,6 +1,7 @@
 #include "Audio_Null.h"
 #include "helper/HL_Log.h"
 #include <assert.h>
+#include <chrono>
 #define LOG_SUBSYSTEM "NULL audio"
 
 using namespace Audio;
@@ -59,7 +60,7 @@ NullInputDevice::NullInputDevice()
 
 NullInputDevice::~NullInputDevice()
 {
-  close();
+  internalClose();
 }
 
 bool NullInputDevice::open()
@@ -72,7 +73,7 @@ bool NullInputDevice::open()
   return true;
 }
 
-void NullInputDevice::close()
+void NullInputDevice::internalClose()
 {
   mTimer.reset();
   if (mBuffer)
@@ -83,6 +84,10 @@ void NullInputDevice::close()
   ICELogInfo(<<"Pseudocaptured " << mTimeCounter << " milliseconds , " << mDataCounter << " bytes.");
 }
 
+void NullInputDevice::close()
+{
+    internalClose();
+}
 Format NullInputDevice::getFormat()
 {
   assert (Format().sizeFromTime(AUDIO_MIC_BUFFER_LENGTH) == AUDIO_MIC_BUFFER_SIZE);
@@ -105,7 +110,7 @@ NullOutputDevice::NullOutputDevice()
 
 NullOutputDevice::~NullOutputDevice()
 {
-  close();
+  internalClose();
 }
 
 
@@ -118,13 +123,18 @@ bool NullOutputDevice::open()
   return true;
 }
 
-void NullOutputDevice::close()
+void NullOutputDevice::internalClose()
 {
   mTimer.reset();
   free(mBuffer); mBuffer = nullptr;
   ICELogInfo(<< "Pseudoplayed " << mTimeCounter << " milliseconds, " << mDataCounter << " bytes.");
 }
 
+void NullOutputDevice::close()
+{
+    internalClose();
+}
+
 Format NullOutputDevice::getFormat()
 {
   assert (Format().sizeFromTime(AUDIO_SPK_BUFFER_LENGTH) == AUDIO_SPK_BUFFER_SIZE);

src/engine/audio/Audio_Null.h

@@ -38,6 +38,8 @@ namespace Audio
     void* mBuffer = nullptr;
     std::shared_ptr<NullTimer> mTimer;
     int64_t mTimeCounter = 0, mDataCounter = 0;
+    void internalClose();
+
   public:
     NullInputDevice();
     virtual ~NullInputDevice();
@@ -55,6 +57,8 @@ namespace Audio
     std::shared_ptr<NullTimer> mTimer;
     void* mBuffer = nullptr;
     int64_t mDataCounter = 0, mTimeCounter = 0;
+
+    void internalClose();
   public:
     NullOutputDevice();
     virtual ~NullOutputDevice();

src/engine/audio/Audio_Quality.cpp

@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "../config.h"
+#include "../engine_config.h"
 #include "Audio_Quality.h"
 #include "../helper/HL_Exception.h"
 #include "../helper/HL_Types.h"
@@ -17,7 +17,10 @@
 
 using namespace Audio;
 
-#define SHRT_MAX      32767         /* maximum (signed) short value */
+#ifndef SHRT_MAX
+# define SHRT_MAX      32767         /* maximum (signed) short value */
+#endif
+
 AgcFilter::AgcFilter(int channels)
 {
   static const float DefaultLevel = 0.8f;

src/engine/audio/Audio_Quality.h

@@ -5,7 +5,7 @@
 
 #ifndef __AUDIO_QUALITY_H
 #define __AUDIO_QUALITY_H
-#include "../config.h"
+#include "../engine_config.h"
 #include "../helper/HL_Sync.h"
 #include <vector>
 

src/engine/audio/Audio_Resampler.cpp

@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "../config.h"
+#include "../engine_config.h"
 #include "Audio_Resampler.h"
 #include <stdlib.h>
 #include <assert.h>
@@ -18,7 +18,7 @@ namespace Audio
 
 
 SpeexResampler::SpeexResampler()
-    :mContext(NULL), mErrorCode(0), mSourceRate(0), mDestRate(0), mLastSample(0)
+    :mContext(NULL), mErrorCode(0), mSourceRate(0), mDestRate(0), mLastSample(0), mChannels(0)
 {
 }
 
@@ -125,12 +125,13 @@ int SpeexResampler::destRate()
 
 size_t SpeexResampler::getDestLength(size_t sourceLen)
 {
-    return size_t(sourceLen * (float(mDestRate) / mSourceRate) + 0.5f) / 2 * 2;
+    return size_t(sourceLen * (float(mDestRate) / mSourceRate) + 0.5f);
 }
 
 size_t SpeexResampler::getSourceLength(size_t destLen)
 {
-    return size_t(destLen * (float(mSourceRate) / mDestRate) + 0.5f) / 2 * 2;
+    // Here we want to get 'destLen' number of samples
+    return size_t(destLen * (float(mSourceRate) / mDestRate) + 0.5f);
 }
 
 // Returns instance + speex resampler size in bytes
@@ -273,7 +274,7 @@ PResampler UniversalResampler::findResampler(int sourceRate, int destRate)
     PResampler r;
     if (resamplerIter == mResamplerMap.end())
     {
-        r = PResampler(new Resampler());
+        r = std::make_shared<Resampler>();
         r->start(AUDIO_CHANNELS, sourceRate, destRate);
         mResamplerMap[RatePair(sourceRate, destRate)] = r;
     }

src/engine/audio/Audio_WavFile.cpp

@@ -7,9 +7,10 @@
 #include "helper/HL_Exception.h"
 #include "helper/HL_String.h"
 #include "helper/HL_Log.h"
-#include "../config.h"
+#include "../engine_config.h"
 
 #include <memory.h>
+#include <assert.h>
 
 #ifndef WORD
 # define WORD unsigned short
@@ -19,13 +20,13 @@
 #endif
 
 typedef struct {
-  WORD  wFormatTag;
-  WORD  nChannels;
-  DWORD nSamplesPerSec;
-  DWORD nAvgBytesPerSec;
-  WORD  nBlockAlign;
-  WORD  wBitsPerSample;
-  WORD  cbSize;
+    WORD  wFormatTag;
+    WORD  nChannels;
+    DWORD nSamplesPerSec;
+    DWORD nAvgBytesPerSec;
+    WORD  nBlockAlign;
+    WORD  wBitsPerSample;
+    WORD  cbSize;
 }
 WaveFormatEx;
 
@@ -39,9 +40,9 @@ using namespace Audio;
 
 // ---------------------- WavFileReader -------------------------
 WavFileReader::WavFileReader()
-:mHandle(nullptr), mRate(0), mLastError(0)
+    :mSamplerate(0), mLastError(0), mChannels(0), mBits(0), mDataLength(0)
 {
-  mDataOffset = 0;
+    mDataOffset = 0;
 }
 
 WavFileReader::~WavFileReader()
@@ -52,207 +53,245 @@ WavFileReader::~WavFileReader()
 
 std::string WavFileReader::readChunk()
 {
-  char name[5];
-  if (fread(name, 1, 4, mHandle) != 4)
-    THROW_READERROR;
+    char name[5] = {0};
+    readBuffer(name, 4);
 
-  name[4] = 0;
-  std::string result = name;
-  unsigned size;
-  if (fread(&size, 4, 1, mHandle) != 1)
-    THROW_READERROR;
+    std::string result = name;
+    uint32_t size = 0;
+    readBuffer(&size, 4);
 
-  if (result == "fact")
-    fread(&mDataLength, 4, 1, mHandle);
-  else
-  if (result != "data")
-    fseek(mHandle, size, SEEK_CUR);
-  else
-    mDataLength = size;
+    if (result == "fact")
+    {
+        uint32_t dataLength = 0;
+        readBuffer(&dataLength, sizeof dataLength);
+        mDataLength = dataLength;
+    }
+    else
+    if (result != "data")
+        mInput->seekg(size, std::ios_base::beg);
+    else
+        mDataLength = size;
 
-  return result;
+    return result;
 }
 
-bool WavFileReader::open(const std::tstring& filename)
+void  WavFileReader::readBuffer(void* buffer, size_t sz)
 {
-  LOCK;
-  try
-  {
-  #ifdef WIN32
-    mHandle = _wfopen(filename.c_str(), L"rb");
-  #else
-    mHandle = fopen(strx::makeUtf8(filename).c_str(), "rb");
-  #endif
-    if (NULL == mHandle)
+    auto p = mInput->tellg();
+    mInput->read(reinterpret_cast<char*>(buffer), sz);
+    if (mInput->tellg() - p != sz)
+        throw Exception(ERR_WAVFILE_FAILED);
+}
+
+size_t WavFileReader::tryReadBuffer(void* buffer, size_t sz)
+{
+    auto p = mInput->tellg();
+    mInput->read(reinterpret_cast<char*>(buffer), sz);
+    return mInput->tellg() - p;
+}
+
+bool WavFileReader::open(const std::filesystem::path& p)
+{
+    LOCK;
+    try
     {
+        mPath = p;
+        mInput = std::make_unique<std::ifstream>(p, std::ios::binary | std::ios::in);
+        if (!mInput->is_open())
+        {
 #if defined(TARGET_ANDROID) || defined(TARGET_LINUX) || defined(TARGET_OSX)
-      mLastError = errno;
+            mLastError = errno;
 #endif
 #if defined(TARGET_WIN)
-      mLastError = GetLastError();
+            mLastError = GetLastError();
 #endif
-      return false;
+            return false;
+        }
+        mLastError = 0;
+
+        // Read the .WAV header
+        char riff[4];
+        readBuffer(riff, sizeof riff);
+
+        if (!(riff[0] == 'R' && riff[1] == 'I' && riff[2] == 'F' && riff[3] == 'F'))
+            THROW_READERROR;
+
+        // Read the file size
+        uint32_t filesize = 0;
+        readBuffer(&filesize, sizeof(filesize));
+
+        char wavefmt[9] = {0};
+        readBuffer(wavefmt, 8);
+        if (strcmp(wavefmt, "WAVEfmt ") != 0)
+            THROW_READERROR;
+
+        uint32_t fmtSize = 0;
+        readBuffer(&fmtSize, sizeof(fmtSize));
+
+        auto fmtStart = mInput->tellg();
+
+        uint16_t formattag  = 0;
+        readBuffer(&formattag, sizeof(formattag));
+
+        if (formattag != 1/*WAVE_FORMAT_PCM*/)
+            THROW_READERROR;
+
+        mChannels = 0;
+        readBuffer(&mChannels, sizeof(mChannels));
+
+        mSamplerate = 0;
+        readBuffer(&mSamplerate, sizeof(mSamplerate));
+
+        uint32_t avgbytespersec = 0;
+        readBuffer(&avgbytespersec, sizeof(avgbytespersec));
+
+        uint16_t blockalign = 0;
+        readBuffer(&blockalign, sizeof(blockalign));
+
+        mBits = 0;
+        readBuffer(&mBits, sizeof(mBits));
+
+        if (mBits !=8 && mBits != 16)
+            THROW_READERROR;
+
+        // Look for the chunk 'data'
+        mInput->seekg(fmtStart + std::streampos(fmtSize));
+
+        mDataLength = 0;
+        while (readChunk() != "data")
+            ;
+
+        mDataOffset = mInput->tellg();
+        mResampler.start(AUDIO_CHANNELS, mSamplerate, AUDIO_SAMPLERATE);
     }
-    mLastError = 0;
-    
-    // Read the .WAV header
-    char riff[4];
-    if (fread(riff, 4, 1, mHandle) < 1)
-		  THROW_READERROR;
-  	
-    if (!(riff[0] == 'R' && riff[1] == 'I' && riff[2] == 'F' && riff[3] == 'F'))
-		  THROW_READERROR;
-
-    // Read the file size
-    unsigned int filesize = 0;
-    if (fread(&filesize, 4, 1, mHandle) < 1)
-      THROW_READERROR;
-
-    char wavefmt[9];
-    if (fread(wavefmt, 8, 1, mHandle) < 1)
-      THROW_READERROR;
-
-    wavefmt[8] = 0;
-    if (strcmp(wavefmt, "WAVEfmt ") != 0)
-      THROW_READERROR;
-
-    unsigned fmtSize = 0;
-    if (fread(&fmtSize, 4, 1, mHandle) < 1)
-		  THROW_READERROR;
-
-    unsigned fmtStart = ftell(mHandle);
-
-    unsigned short formattag  = 0;
-    if (fread(&formattag, 2, 1, mHandle) < 1)
-      THROW_READERROR;
-    
-    if (formattag != 1/*WAVE_FORMAT_PCM*/)
-      THROW_READERROR;
-
-    mChannels = 0;
-    if (fread(&mChannels, 2, 1, mHandle) < 1)
-		  THROW_READERROR;
-    
-    mRate = 0;
-    if (fread(&mRate, 4, 1, mHandle) < 1)
-      THROW_READERROR;
-
-    unsigned int avgbytespersec = 0;
-    if (fread(&avgbytespersec, 4, 1, mHandle) < 1)
-      THROW_READERROR;
-    
-    unsigned short blockalign = 0;
-    if (fread(&blockalign, 2, 1, mHandle) < 1)
-      THROW_READERROR;
-    
-    mBits = 0;
-    if (fread(&mBits, 2, 1, mHandle) < 1)
-      THROW_READERROR;
-    
-    if (mBits !=8 && mBits != 16)
-      THROW_READERROR;
-
-    // Read the "chunk"
-    fseek(mHandle, fmtStart + fmtSize, SEEK_SET);
-    //unsigned pos = ftell(mHandle);
-    mDataLength = 0;
-    while (readChunk() != "data")
-      ;
-  	
-    mFileName = filename;
-    mDataOffset = ftell(mHandle);
-
-    mResampler.start(AUDIO_CHANNELS, mRate, AUDIO_SAMPLERATE);
-  }
-  catch(...)
-  {
-    fclose(mHandle); mHandle = nullptr;
-    mLastError = static_cast<unsigned>(-1);
-  }
-  return isOpened();
+    catch(...)
+    {
+        mInput.reset();
+        mLastError = static_cast<unsigned>(-1);
+    }
+    return isOpened();
 }
 
 void WavFileReader::close()
 {
-  LOCK;
-
-  if (nullptr != mHandle)
-    fclose(mHandle);
-  mHandle = nullptr;
+    LOCK;
+    mInput.reset();
 }
 
-int WavFileReader::rate() const
+int WavFileReader::samplerate() const
 {
-  return mRate;
+    return mSamplerate;
 }
 
-unsigned WavFileReader::read(void* buffer, unsigned bytes)
+int WavFileReader::channels() const
 {
-  return read((short*)buffer, bytes / (AUDIO_CHANNELS * 2)) * AUDIO_CHANNELS * 2;
+    return mChannels;
 }
 
-unsigned WavFileReader::read(short* buffer, unsigned samples)
+size_t WavFileReader::read(void* buffer, size_t bytes)
 {
-  LOCK;
+    return read((short*)buffer, bytes / (AUDIO_CHANNELS * 2)) * AUDIO_CHANNELS * 2;
+}
 
-  if (!mHandle)
-    return 0;
+size_t WavFileReader::readRaw(void* buffer, size_t bytes)
+{
+    return readRaw((short*)buffer, bytes / channels() / sizeof(short)) * channels() * sizeof(short);
+}
 
-  // Get number of samples that must be read from source file
-  int requiredBytes = mResampler.getSourceLength(samples) * mChannels * mBits / 8;
-  void* temp = alloca(requiredBytes);
-  memset(temp, 0, requiredBytes);
+size_t WavFileReader::read(short* buffer, size_t samples)
+{
+    LOCK;
 
-  // Find required size of input buffer
-  if (mDataLength)
-  {
-    unsigned filePosition = ftell(mHandle);
+    if (!mInput)
+        return 0;
 
-    // Check how much data we can read
-    unsigned fileAvailable = mDataLength + mDataOffset - filePosition;
-    requiredBytes = (int)fileAvailable < requiredBytes ? (int)fileAvailable : requiredBytes;
-  }
+    // Get number of samples that must be read from source file
+    size_t requiredBytes = mResampler.getSourceLength(samples) * mChannels * mBits / 8;
+    bool useHeap = requiredBytes > sizeof mTempBuffer;
+    void* temp;
+    if (useHeap)
+        temp = malloc(requiredBytes);
+    else
+        temp = mTempBuffer;
 
-  /*int readSamples = */fread(temp, 1, requiredBytes, mHandle);// / mChannels / (mBits / 8);
-  size_t processedBytes = 0;
-  size_t result = mResampler.processBuffer(temp, requiredBytes, processedBytes,
-                                           buffer, samples * 2 * AUDIO_CHANNELS);
+    memset(temp, 0, requiredBytes);
 
-  return result / 2 / AUDIO_CHANNELS;
+    // Find required size of input buffer
+    if (mDataLength)
+    {
+        auto filePosition = mInput->tellg();
+
+        // Check how much data we can read
+        size_t fileAvailable = mDataLength + mDataOffset - filePosition;
+        requiredBytes = fileAvailable < requiredBytes ? fileAvailable : requiredBytes;
+    }
+
+    size_t readBytes = tryReadBuffer(temp, requiredBytes);
+
+    size_t processedBytes = 0;
+    size_t result = mResampler.processBuffer(temp, readBytes, processedBytes,
+                                             buffer, samples * 2 * AUDIO_CHANNELS);
+
+    if (useHeap)
+        free(temp);
+    return result / 2 / AUDIO_CHANNELS;
+}
+
+
+size_t WavFileReader::readRaw(short* buffer, size_t samples)
+{
+    LOCK;
+
+    if (!mInput)
+        return 0;
+
+    // Get number of samples that must be read from source file
+    size_t requiredBytes = samples * channels() * sizeof(short);
+
+    // Find required size of input buffer
+    if (mDataLength)
+    {
+        auto filePosition = mInput->tellg();
+
+        // Check how much data we can read
+        size_t fileAvailable = mDataLength + mDataOffset - filePosition;
+        requiredBytes = (int)fileAvailable < requiredBytes ? (int)fileAvailable : requiredBytes;
+    }
+
+    size_t readBytes = tryReadBuffer(buffer, requiredBytes);
+    return readBytes / channels() / sizeof(short);
 }
 
 bool WavFileReader::isOpened()
 {
-  LOCK;
-
-  return (mHandle != 0);
+    LOCK;
+    if (!mInput)
+        return false;
+    return mInput->is_open();
 }
 
 void WavFileReader::rewind()
 {
-  LOCK;
- 
-  if (mHandle)
-    fseek(mHandle, mDataOffset, SEEK_SET);
+    LOCK;
+    if (mInput)
+        mInput->seekg(mDataOffset);
 }
 
-std::tstring WavFileReader::filename() const
+std::filesystem::path WavFileReader::path() const
 {
-  LOCK;
-
-  return mFileName;
+    LOCK;
+    return mPath;
 }
 
-unsigned WavFileReader::size() const
+size_t WavFileReader::size() const
 {
-  LOCK;
-
-  return mDataLength;
+    LOCK;
+    return mDataLength;
 }
 
 unsigned WavFileReader::lastError() const
 {
-  return mLastError;
+    return mLastError;
 }
 // ------------------------- WavFileWriter -------------------------
 #define LOG_SUBSYTEM "WavFileWriter"
@@ -260,135 +299,133 @@ unsigned WavFileReader::lastError() const
 #define BITS_PER_CHANNEL  16
 
 WavFileWriter::WavFileWriter()
-:mHandle(nullptr), mLengthOffset(0), mRate(AUDIO_SAMPLERATE), mChannels(1), mWritten(0)
-{
-}
+    :mLengthOffset(0), mSamplerate(AUDIO_SAMPLERATE), mChannels(1), mWritten(0)
+{}
 
 WavFileWriter::~WavFileWriter()
 {
-  close();
+    close();
 }
 
 void WavFileWriter::checkWriteResult(int result)
 {
-  if (result < 1) 
-    throw Exception(ERR_WAVFILE_FAILED, errno);
+    if (result < 1)
+        throw Exception(ERR_WAVFILE_FAILED, errno);
 }
 
-bool WavFileWriter::open(const std::tstring& filename, int rate, int channels)
+void WavFileWriter::writeBuffer(const void* buffer, size_t sz)
 {
-  LOCK;
+    if (!mOutput)
+        return;
 
-  close();
+    auto p = mOutput->tellp();
+    mOutput->write(reinterpret_cast<const char*>(buffer), sz);
+    if (mOutput->tellp() - p != sz)
+        throw Exception(ERR_WAVFILE_FAILED);
+}
 
-  mRate = rate;
-  mChannels = channels;
+bool WavFileWriter::open(const std::filesystem::path& p, int samplerate, int channels)
+{
+    LOCK;
+    close();
+    mSamplerate = samplerate;
+    mChannels = channels;
 
-#ifdef WIN32
-  mHandle = _wfopen(filename.c_str(), L"wb");
-#else
-  mHandle = fopen(strx::makeUtf8(filename).c_str(), "wb");
-#endif
-  if (nullptr == mHandle)
-  {
-    ICELogError(<< "Failed to create .wav file: filename = " << strx::makeUtf8(filename) << " , error = " << errno);
-    return false;
-  }
+    mOutput = std::make_unique<std::ofstream>(p, std::ios::binary | std::ios::trunc);
+    if (!mOutput)
+    {
+        int errorcode = errno;
+        ICELogError(<< "Failed to create .wav file: filename = " << p << " , error = " << errorcode);
+        return false;
+    }
 
-  // Write the .WAV header
-  const char* riff = "RIFF";
-  checkWriteResult( fwrite(riff, 4, 1, mHandle) );
+    // Write the .WAV header
+    const char* riff = "RIFF";
+    writeBuffer(riff, 4);
 
-  // Write the file size
-  unsigned int filesize = 0;
-  checkWriteResult( fwrite(&filesize, 4, 1, mHandle) );
+    // Write the file size
+    uint32_t filesize = 0;
+    writeBuffer(&filesize, sizeof filesize);
 
-  const char* wavefmt = "WAVEfmt ";
-  checkWriteResult( fwrite(wavefmt, 8, 1, mHandle) );
+    const char* wavefmt = "WAVEfmt ";
+    writeBuffer(wavefmt, 8);
 
-  // Set the format description
-  DWORD dwFmtSize = 16; /*= 16L*/;
-  checkWriteResult( fwrite(&dwFmtSize, sizeof(dwFmtSize), 1, mHandle) );
+    // Set the format description
+    uint32_t dwFmtSize = 16; /*= 16L*/;
+    writeBuffer(&dwFmtSize, sizeof(dwFmtSize));
 
-  WaveFormatEx format;
-  format.wFormatTag = WAVE_FORMAT_PCM; 
-  checkWriteResult( fwrite(&format.wFormatTag, sizeof(format.wFormatTag), 1, mHandle) );
+    WaveFormatEx format;
+    format.wFormatTag = WAVE_FORMAT_PCM;
+    writeBuffer(&format.wFormatTag, sizeof(format.wFormatTag));
 
-  format.nChannels = mChannels;
-  checkWriteResult( fwrite(&format.nChannels, sizeof(format.nChannels), 1, mHandle) );
+    format.nChannels = mChannels;
+    writeBuffer(&format.nChannels, sizeof(format.nChannels));
 
-  format.nSamplesPerSec = mRate; 
-  checkWriteResult( fwrite(&format.nSamplesPerSec, sizeof(format.nSamplesPerSec), 1, mHandle) );
+    format.nSamplesPerSec = mSamplerate;
+    writeBuffer(&format.nSamplesPerSec, sizeof(format.nSamplesPerSec));
 
-  format.nAvgBytesPerSec = mRate * 2 * mChannels;
-  checkWriteResult( fwrite(&format.nAvgBytesPerSec, sizeof(format.nAvgBytesPerSec), 1, mHandle) );
+    format.nAvgBytesPerSec = mSamplerate * 2 * mChannels;
+    writeBuffer(&format.nAvgBytesPerSec, sizeof(format.nAvgBytesPerSec));
 
-  format.nBlockAlign = 2 * mChannels;
-  checkWriteResult( fwrite(&format.nBlockAlign, sizeof(format.nBlockAlign), 1, mHandle) );
+    format.nBlockAlign = 2 * mChannels;
+    writeBuffer(&format.nBlockAlign, sizeof(format.nBlockAlign));
 
-  format.wBitsPerSample = BITS_PER_CHANNEL; 
-  checkWriteResult( fwrite(&format.wBitsPerSample, sizeof(format.wBitsPerSample), 1, mHandle) );
+    format.wBitsPerSample = BITS_PER_CHANNEL;
+    writeBuffer(&format.wBitsPerSample, sizeof(format.wBitsPerSample));
 
-  const char* data = "data";
-  checkWriteResult( fwrite(data, 4, 1, mHandle));
+    const char* data = "data";
+    writeBuffer(data, 4);
 
-  mFileName = filename;
-  mWritten  = 0;
+    mPath = p;
+    mWritten  = 0;
 
-  mLengthOffset = ftell(mHandle);
-  checkWriteResult( fwrite(&mWritten, 4, 1, mHandle) );
+    mLengthOffset = mOutput->tellp();
+    writeBuffer(&mWritten, sizeof mWritten);
 
-  return isOpened();
+    return isOpened();
 }
 
 void WavFileWriter::close()
 {
-  LOCK;
-
-  if (mHandle)
-  {
-    fclose(mHandle);
-    mHandle = nullptr;
-  }
+    LOCK;
+    mOutput.reset();
 }
 
 size_t WavFileWriter::write(const void* buffer, size_t bytes)
 {
-  LOCK;
+    LOCK;
 
-  if (!mHandle)
-    return 0;
+    if (!mOutput)
+        return 0;
 
-  // Seek the end of file
-  fseek(mHandle, 0, SEEK_END);
-  mWritten += bytes;
+    // Seek the end of file - here new data will be written
+    mOutput->seekp(0, std::ios_base::end);
+    mWritten += bytes;
 
-  // Write the data
-  fwrite(buffer, bytes, 1, mHandle);
+    // Write the data
+    writeBuffer(buffer, bytes);
 
-  // Write file length
-  fseek(mHandle, 4, SEEK_SET);
-  int32_t fl = mWritten + 36;
-  fwrite(&fl, sizeof(fl), 1, mHandle);
+    // Write file length
+    mOutput->seekp(4, std::ios_base::beg);
+    uint32_t fl = mWritten + 36;
+    writeBuffer(&fl, sizeof(fl));
 
-  // Write data length
-  fseek(mHandle, static_cast<long>(mLengthOffset), SEEK_SET);
-  checkWriteResult( fwrite(&mWritten, 4, 1, mHandle) );
+    // Write data length
+    mOutput->seekp(mLengthOffset, std::ios_base::beg);
+    writeBuffer(&mWritten, sizeof(mWritten));
 
-  return bytes;
+    return bytes;
 }
 
-bool WavFileWriter::isOpened()
+bool WavFileWriter::isOpened() const
 {
-  LOCK;
-
-  return (mHandle != nullptr);
+    LOCK;
+    return mOutput.get();
 }
 
-std::tstring WavFileWriter::filename()
+std::filesystem::path WavFileWriter::path() const
 {
-  LOCK;
-
-  return mFileName;
+    LOCK;
+    return mPath;
 }
 

src/engine/audio/Audio_WavFile.h

@@ -12,74 +12,84 @@
 #include <string>
 #include <memory>
 #include <mutex>
+#include <filesystem>
+#include <fstream>
 
 
 namespace Audio
 {
 
-  class WavFileReader
-  {
-  protected:
-    FILE* mHandle;
-    short mChannels;
-    short mBits;
-    int mRate;
-    std::tstring mFileName;
-    mutable std::recursive_mutex mFileMtx;
-    unsigned mDataOffset;
-    unsigned mDataLength;
-    Resampler mResampler;
-    unsigned mLastError;
+class WavFileReader
+{
+protected:
+    uint16_t                        mChannels = 0;
+    uint16_t                        mBits = 0;
+    int                             mSamplerate = 0;
+    std::filesystem::path           mPath;
+    mutable std::recursive_mutex    mFileMtx;
+    size_t                          mDataOffset = 0;
+    size_t                          mDataLength = 0;
+    Resampler                       mResampler;
+    unsigned                        mLastError = 0;
+    std::unique_ptr<std::ifstream>  mInput;
+    uint8_t                         mTempBuffer[16384];
 
-    std::string readChunk();
-  public:
+    std::string         readChunk();
+    void                readBuffer(void* buffer, size_t sz);       // This raises an exception if sz bytes are not read
+    size_t              tryReadBuffer(void* buffer, size_t sz);  // This doesn't raise an exception
+
+public:
     WavFileReader();
     ~WavFileReader();
 
-    bool open(const std::tstring& filename);
+    bool open(const std::filesystem::path& p);
     void close();
     bool isOpened();
     void rewind();
-    int rate() const;
+    int  samplerate() const;
+    int  channels() const;
 
     // This method returns number of read bytes
-    unsigned read(void* buffer, unsigned bytes);
+    size_t read(void* buffer, size_t bytes);
+    size_t  readRaw(void* buffer, size_t bytes);
 
     // This method returns number of read samples
-    unsigned read(short* buffer, unsigned samples);
-    std::tstring filename() const;
-    unsigned size() const;
+    size_t read(short* buffer, size_t samples);
+    size_t readRaw(short* buffer, size_t samples);
+
+    std::filesystem::path path() const;
+    size_t size() const;
 
     unsigned lastError() const;
-  };
+};
 
-  typedef std::shared_ptr<WavFileReader> PWavFileReader;
+typedef std::shared_ptr<WavFileReader> PWavFileReader;
 
-  class WavFileWriter
-  {
-  protected:
-    FILE*                   mHandle;        /// Handle of audio file.
-    std::tstring            mFileName;      /// Path to requested audio file.
-    std::recursive_mutex    mFileMtx;       /// Mutex to protect this instance.
-    int                     mWritten;       /// Amount of written data (in bytes)
-    int                     mLengthOffset;  /// Position of length field.
-    int                     mRate,
-                            mChannels;
+class WavFileWriter
+{
+protected:
+    std::unique_ptr<std::ofstream>  mOutput;            /// Handle of audio file.
+    std::filesystem::path           mPath;              /// Path to requested audio file.
+    mutable std::recursive_mutex    mFileMtx;           /// Mutex to protect this instance.
+    size_t                          mWritten = 0;       /// Amount of written data (in bytes)
+    size_t                          mLengthOffset = 0;  /// Position of length field.
+    int                             mSamplerate = 0,
+                                    mChannels = 0;
 
     void checkWriteResult(int result);
-
-  public:
+    void writeBuffer(const void* buffer, size_t sz);
+public:
     WavFileWriter();
     ~WavFileWriter();
 
-    bool open(const std::tstring& filename, int rate, int channels);
+    bool open(const std::filesystem::path& p, int samplerate, int channels);
     void close();
-    bool isOpened();
+    bool isOpened() const;
     size_t write(const void* buffer, size_t bytes);
-    std::tstring filename();
-  };
+    std::filesystem::path path() const;
+};
 
-  typedef std::shared_ptr<WavFileWriter> PWavFileWriter;
+typedef std::shared_ptr<WavFileWriter> PWavFileWriter;
 
 }
 

src/engine/audio/Audio_Wmme.h

@@ -8,7 +8,7 @@
 
 #ifdef TARGET_WIN
 
-#include "../config.h"
+#include "../engine_config.h"
 
 #include <winsock2.h>
 #include <windows.h>

src/engine/audio/CMakeLists.txt

@@ -1,24 +1,38 @@
 project (audio_lib)
 
 # Rely on C++ 11
-set (CMAKE_CXX_STANDARD 11)
+set (CMAKE_CXX_STANDARD 20)
 set (CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 set (AUDIOLIB_SOURCES
     Audio_Resampler.cpp
+    Audio_Resampler.h
     Audio_Quality.cpp
+    Audio_Quality.h
     Audio_Mixer.cpp
+    Audio_Mixer.h
     Audio_Interface.cpp
+    Audio_Interface.h
     Audio_Helper.cpp
+    Audio_Helper.h
     Audio_DataWindow.cpp
+    Audio_DataWindow.h
     Audio_DevicePair.cpp
+    Audio_DevicePair.h
     Audio_Player.cpp
+    Audio_Player.h
     Audio_Null.cpp
+    Audio_Null.h
     Audio_CoreAudio.cpp
+    Audio_CoreAudio.h
     Audio_DirectSound.cpp
+    Audio_DirectSound.h
+    Audio_AndroidOboe.cpp
+    Audio_AndroidOboe.h
     Audio_WavFile.cpp
+    Audio_WavFile.h
 )
 
 add_library(audio_lib ${AUDIOLIB_SOURCES})

src/engine/config.h

@@ -1,113 +0,0 @@
-/* Copyright(C) 2007-2020 VoIP objects (voipobjects.com)
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef __TOOLKIT_CONFIG_H
-#define __TOOLKIT_CONFIG_H
-
-#define USE_SPEEX_AEC
-
-// TODO: test implementation with webrtc aec; be careful - it needs fixes!
-//#define USE_WEBRTC_AEC
-#define USER
-
-
-#define AUDIO_SAMPLE_WIDTH 16
-#define AUDIO_CHANNELS 1
-
-// Samplerate must be 8 / 16 / 24 / 32 / 48 KHz
-#define AUDIO_SAMPLERATE 8000
-#define AUDIO_MIC_BUFFER_COUNT 16
-#define AUDIO_MIC_BUFFER_LENGTH 10
-#define AUDIO_MIC_BUFFER_SIZE  (AUDIO_MIC_BUFFER_LENGTH * AUDIO_SAMPLERATE / 1000 * 2 * AUDIO_CHANNELS)
-#define AUDIO_SPK_BUFFER_COUNT 16
-#define AUDIO_SPK_BUFFER_LENGTH 10
-#define AUDIO_SPK_BUFFER_SIZE (AUDIO_SPK_BUFFER_LENGTH * AUDIO_SAMPLERATE / 1000 * 2 * AUDIO_CHANNELS)
-#define AUDIO_MIX_CHANNEL_COUNT 16
-#define AUDIO_DEVICEPAIR_INPUTBUFFER 16384
-
-// Avoid too high resampler quality - it can take many CPU and cause gaps in playing
-#define AUDIO_RESAMPLER_QUALITY 1
-#define AEC_FRAME_TIME 10
-#define AEC_TAIL_TIME 160
-
-
-// Defined these two lines to get dumping of audio input/output
-//#define AUDIO_DUMPINPUT
-//#define AUDIO_DUMPOUTPUT
-
-
-#define UA_REGISTRATION_TIME 3600
-#define UA_MEDIA_PORT_START  20000
-#define UA_MEDIA_PORT_FINISH 30000
-#define UA_MAX_UDP_PACKET_SIZE 576
-#define UA_PUBLICATION_ID "314"
-
-#define MT_SAMPLERATE AUDIO_SAMPLERATE
-
-#define MT_MAXAUDIOFRAME 1440
-#define MT_MAXRTPPACKET 1500
-#define MT_DTMF_END_PACKETS 3
-
-#define RTP_BUFFER_HIGH 24480
-#define RTP_BUFFER_LOW 10
-#define RTP_BUFFER_PREBUFFER 80
-#define RTP_DECODED_CAPACITY 2048
-
-#define DEFAULT_SUBSCRIPTION_TIME 1200
-#define DEFAULT_SUBSCRIPTION_REFRESHTIME 500
-
-#define PRESENCE_IN_REG_HEADER "PresenceInReg"
-
-// Maximum UDP packet length
-#define MAX_UDPPACKET_SIZE 65535
-#define MAX_VALID_UDPPACKET_SIZE 2048
-
-// AMR codec defines - it requires USE_AMR_CODEC defined
-// #define USE_AMR_CODEC
-#define MT_AMRNB_PAYLOADTYPE 112
-#define MT_AMRNB_CODECNAME "amr"
-
-#define MT_AMRNB_OCTET_PAYLOADTYPE 113
-
-#define MT_AMRWB_PAYLOADTYPE 96
-#define MT_AMRWB_CODECNAME "amr-wb"
-
-#define MT_AMRWB_OCTET_PAYLOADTYPE 97
-
-#define MT_GSMEFR_PAYLOADTYPE 126
-#define MT_GSMEFR_CODECNAME "GERAN-EFR"
-
-#define MT_EVS_PAYLOADTYPE 127
-#define MT_EVS_CODECNAME "EVS"
-
-// OPUS codec defines
-// #define USE_OPUS_CODEC
-#define MT_OPUS_CODEC_PT 106
-
-// ILBC codec defines
-#define MT_ILBC20_PAYLOADTYPE -1
-#define MT_ILBC30_PAYLOADTYPE -1
-
-// ISAC codec defines
-#define MT_ISAC16K_PAYLOADTYPE -1
-#define MT_ISAC32K_PAYLOADTYPE -1
-
-// GSM HR payload type
-#define MT_GSMHR_PAYLOADTYPE -1
-
-// Mirror buffer capacity
-#define MT_MIRROR_CAPACITY 32768
-
-// Mirror buffer readiness threshold - 50 milliseconds
-#define MT_MIRROR_PREBUFFER (MT_SAMPLERATE / 10)
-
-#if defined(TARGET_OSX) || defined(TARGET_LINUX)
-# define TEXT(X) X
-#endif
-
-// In milliseconds
-#define MT_SEVANA_FRAME_TIME 680
-
-#endif

src/engine/endpoint/EP_Account.h

@@ -24,118 +24,118 @@ class Session;
 
 class Account: public resip::DnsResultSink
 {
-friend class UserAgent;
-friend class NATDecorator;
+    friend class UserAgent;
+    friend class NATDecorator;
 public:
-  Account(PVariantMap config, UserAgent& agent);
-  ~Account();
+    Account(PVariantMap config, UserAgent& agent);
+    ~Account();
 
-  void start();
-  void stop();
-  void refresh();
-  bool active();
-  int id() const;
+    void start();
+    void stop();
+    void refresh();
+    bool active();
+    int id() const;
 
-  enum class RegistrationState
-  {
-    None,
-    Registering,
-    Reregistering,
-    Registered,
-    Unregistering
-  };
-  RegistrationState registrationState();
+    enum class RegistrationState
+    {
+        None,
+        Registering,
+        Reregistering,
+        Registered,
+        Unregistering
+    };
+    RegistrationState registrationState();
 
-  /* Publishes new presence information */
-  void publishPresence(bool online, const std::string& content, int seconds = 600);
+    /* Publishes new presence information */
+    void publishPresence(bool online, const std::string& content, int seconds = 600);
 
-  /* Stops publishing of presence */
-  void stopPublish();
+    /* Stops publishing of presence */
+    void stopPublish();
 
-  /* Starts observing on specified target / package */
-  PClientObserver observe(const std::string& target, const std::string& package, void* tag);
+    /* Starts observing on specified target / package */
+    PClientObserver observe(const std::string& target, const std::string& package, void* tag);
 
-  /* Queues message to peer with specified mime type. Returns ID of message. */
-  int sendMsg(const std::string& peer, const void* ptr, unsigned length, const std::string& mime, void* tag);
+    /* Queues message to peer with specified mime type. Returns ID of message. */
+    int sendMsg(const std::string& peer, const void* ptr, unsigned length, const std::string& mime, void* tag);
 
-  /* Returns name of account - <sip:user@domain> */
-  std::string name();
+    /* Returns name of account - <sip:user@domain> */
+    std::string name();
 
-  /* Updates account with configuration */
-  void setup(VariantMap& config);
+    /* Updates account with configuration */
+    void setup(VariantMap& config);
 
-  /* Returns corresponding resiprocate profile */
-  resip::SharedPtr<resip::UserProfile> getUserProfile() const { return mProfile; }
+    /* Returns corresponding resiprocate profile */
+    std::shared_ptr<resip::UserProfile> getUserProfile() const { return mProfile; }
 
-  typedef std::map<std::string, std::string> UserInfo;
-  void setUserInfo(const UserInfo& info);
-  UserInfo getUserInfo() const;
+    typedef std::map<std::string, std::string> UserInfo;
+    void setUserInfo(const UserInfo& info);
+    UserInfo getUserInfo() const;
 
 protected:
-  PVariantMap mConfig;
+    PVariantMap mConfig;
 
-  // Registration
-  ResipSession* mRegistration;
-  resip::ClientRegistrationHandle mRegistrationHandle;
-  resip::ClientPublicationHandle mPublication;
-  resip::TransportType mUsedTransport;
+    // Registration
+    ResipSession* mRegistration;
+    resip::ClientRegistrationHandle mRegistrationHandle;
+    resip::ClientPublicationHandle mPublication;
+    resip::TransportType mUsedTransport;
 
-  RegistrationState mRegistrationState;
+    RegistrationState mRegistrationState;
 
-  ice::NetworkAddress mExternalAddress;
-  resip::SharedPtr<resip::UserProfile> mProfile;
-  UserAgent& mAgent;
-  bool mPresenceOnline;
-  std::string mPresenceContent;
+    ice::NetworkAddress mExternalAddress;
+    std::shared_ptr<resip::UserProfile> mProfile;
+    UserAgent& mAgent;
+    bool mPresenceOnline;
+    std::string mPresenceContent;
 
-  // Timer to refresh STUN server IP
-  ice::ICEScheduleTimer mRefreshStunServerIpTimer;
+    // Timer to refresh STUN server IP
+    ice::ICEScheduleTimer mRefreshStunServerIpTimer;
 
-  // Cached auth
-  resip::Auth mCachedAuth;
+    // Cached auth
+    resip::Auth mCachedAuth;
 
-  // Id of account
-  int mId;
+    // Id of account
+    int mId;
 
-  // User info about current state
-  UserInfo mUserInfo;
+    // User info about current state
+    UserInfo mUserInfo;
 
-  // List of client subscriptions sent from this account
-  typedef std::set<PClientObserver> ClientObserverSet;
-  ClientObserverSet mClientObserverSet;
+    // List of client subscriptions sent from this account
+    typedef std::set<PClientObserver> ClientObserverSet;
+    ClientObserverSet mClientObserverSet;
 
 
-  void process();
-  // Method queries new stun server ip from dns (if stun server is specified as dns name)
-  void queryStunServerIp();
+    void process();
+    // Method queries new stun server ip from dns (if stun server is specified as dns name)
+    void queryStunServerIp();
 
-  bool isResponsibleFor(const resip::NameAddr& addr);
-  enum class SecureScheme
-  {
-    SipsAndTls,
-    SipsOnly,
-    TlsOnly,
-    Nothing
-  };
+    bool isResponsibleFor(const resip::NameAddr& addr);
+    enum class SecureScheme
+    {
+        SipsAndTls,
+        SipsOnly,
+        TlsOnly,
+        Nothing
+    };
 
-  resip::NameAddr contact(SecureScheme ss = SecureScheme::SipsOnly);
+    resip::NameAddr contact(SecureScheme ss = SecureScheme::SipsOnly);
 
-  // This method prepares configuration, creates ice stack and sets ownership to session
-  void prepareIceStack(Session* session, ice::AgentRole role);
-  void onSuccess(resip::ClientRegistrationHandle h, const resip::SipMessage& response);
-  void onRemoved(resip::ClientRegistrationHandle h, const resip::SipMessage& response);
-  void onFailure(resip::ClientRegistrationHandle, const resip::SipMessage& response);
+    // This method prepares configuration, creates ice stack and sets ownership to session
+    void prepareIceStack(Session* session, ice::AgentRole role);
+    void onSuccess(resip::ClientRegistrationHandle h, const resip::SipMessage& response);
+    void onRemoved(resip::ClientRegistrationHandle h, const resip::SipMessage& response);
+    void onFailure(resip::ClientRegistrationHandle, const resip::SipMessage& response);
 
 #pragma region DnsResultSink implementation
-  void onDnsResult(const resip::DNSResult<resip::DnsHostRecord>&);
-  void onDnsResult(const resip::DNSResult<resip::DnsAAAARecord>&);
-  void onDnsResult(const resip::DNSResult<resip::DnsSrvRecord>&);
-  void onDnsResult(const resip::DNSResult<resip::DnsNaptrRecord>&);
-  void onDnsResult(const resip::DNSResult<resip::DnsCnameRecord>&);
+    void onDnsResult(const resip::DNSResult<resip::DnsHostRecord>&);
+    void onDnsResult(const resip::DNSResult<resip::DnsAAAARecord>&);
+    void onDnsResult(const resip::DNSResult<resip::DnsSrvRecord>&);
+    void onDnsResult(const resip::DNSResult<resip::DnsNaptrRecord>&);
+    void onDnsResult(const resip::DNSResult<resip::DnsCnameRecord>&);
 #pragma endregion
 
-  static int generateId();
-  static resip::AtomicCounter IdGenerator;
+    static int generateId();
+    static std::atomic_int IdGenerator;
 };
 
 typedef std::shared_ptr<Account> PAccount;

src/engine/endpoint/EP_AudioProvider.cpp

@@ -64,7 +64,7 @@ void AudioProvider::configureMediaObserver(MT::Stream::MediaObserver *observer,
 }
 
 // Processes incoming data
-void  AudioProvider::processData(PDatagramSocket s, const void* dataBuffer, int dataSize, InternetAddress& source)
+void  AudioProvider::processData(const PDatagramSocket& s, const void* dataBuffer, int dataSize, InternetAddress& source)
 {
     if (!mActiveStream)
         return;
@@ -77,7 +77,7 @@ void  AudioProvider::processData(PDatagramSocket s, const void* dataBuffer, int
 }
 
 // This method is called by user agent to send ICE packet from mediasocket
-void AudioProvider::sendData(PDatagramSocket s, InternetAddress& destination, const void* buffer, unsigned int size)
+void AudioProvider::sendData(const PDatagramSocket& s, InternetAddress& destination, const void* buffer, unsigned int size)
 {
     s->sendDatagram(destination, buffer, size);
 }
@@ -99,7 +99,6 @@ void AudioProvider::updateSdpOffer(resip::SdpContents::Session::Medium& sdp, Sdp
         else
             sdp.addAttribute("crypto", resip::Data(createCryptoAttribute(mSrtpSuite)));
     }
-#if defined(USE_RESIP_INTEGRATION)
 
     // Use CodecListPriority mCodecPriority adapter to work with codec priorities
     if (mAvailableCodecs.empty())
@@ -114,7 +113,7 @@ void AudioProvider::updateSdpOffer(resip::SdpContents::Session::Medium& sdp, Sdp
         if (mRemoteTelephoneCodec)
             sdp.addCodec(resip::SdpContents::Session::Codec::TelephoneEvent);
     }
-#endif
+
 
     // Publish stream state
     const char* attr = nullptr;
@@ -125,6 +124,8 @@ void AudioProvider::updateSdpOffer(resip::SdpContents::Session::Medium& sdp, Sdp
         {
         case msSendonly: attr = "recvonly"; break;
         case msInactive: attr = "recvonly"; break;
+        case msRecvonly:
+        case msSendRecv: break; // Do nothing here
         }
         break;
 
@@ -227,10 +228,8 @@ bool AudioProvider::processSdpOffer(const resip::SdpContents::Session::Medium& m
     for (int localIndex=0; localIndex<mCodecPriority.count(mTerminal.codeclist()); localIndex++)
     {
         MT::Codec::Factory& factory = mCodecPriority.codecAt(mTerminal.codeclist(), localIndex);
-#if defined(USE_RESIP_INTEGRATION)
         if ((pt = factory.processSdp(media.codecs(), sdpDirection)) != -1)
             mAvailableCodecs.push_back(RemoteCodec(&factory, pt));
-#endif
     }
 
     if (!mAvailableCodecs.size())
@@ -301,26 +300,12 @@ std::string AudioProvider::createCryptoAttribute(SrtpSuite suite)
     if (!mActiveStream)
         return "";
 
-    // Use tag 1 - it is ok, as we use only single crypto attribute
-    int   srtpTag = 1;
-
     // Print key to base64 string
     PByteBuffer keyBuffer = mActiveStream->srtp().outgoingKey(suite).first;
     resip::Data d(keyBuffer->data(), keyBuffer->size());
     resip::Data keyText = d.base64encode();
 
-    // Create "crypto" attribute value
-    char buffer[512];
-    const char* suiteName = NULL;
-    switch (suite)
-    {
-    case SRTP_AES_128_AUTH_80: suiteName = SRTP_SUITE_NAME_1; break;
-    case SRTP_AES_256_AUTH_80: suiteName = SRTP_SUITE_NAME_2; break;
-    default: assert(0);
-    }
-    sprintf(buffer, "%d %s inline:%s", srtpTag, suiteName, keyText.c_str());
-
-    return buffer;
+    return std::format("{} {} inline:{}", 1, toString(suite), keyText.c_str());
 }
 
 SrtpSuite AudioProvider::processCryptoAttribute(const resip::Data& value, ByteBuffer& key)
@@ -341,15 +326,7 @@ SrtpSuite AudioProvider::processCryptoAttribute(const resip::Data& value, ByteBu
     resip::Data rawkey = keyText.base64decode();
     key = ByteBuffer(rawkey.c_str(), rawkey.size());
 
-    // Open srtp
-    SrtpSuite result = SRTP_NONE;
-    if (strcmp(suite, SRTP_SUITE_NAME_1) == 0)
-        result = SRTP_AES_128_AUTH_80;
-    else
-        if (strcmp(suite, SRTP_SUITE_NAME_2) == 0)
-            result = SRTP_AES_256_AUTH_80;
-
-    return result;
+    return toSrtpSuite(suite);
 }
 
 void AudioProvider::findRfc2833(const resip::SdpContents::Session::Medium::CodecContainer& codecs)

src/engine/endpoint/EP_AudioProvider.h

@@ -1,4 +1,4 @@
-/* Copyright(C) 2007-2014 VoIP objects (voipobjects.com)
+/* Copyright(C) 2007-2023 VoIP objects (voipobjects.com)
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -12,9 +12,7 @@
 #include "../media/MT_Box.h"
 #include "../media/MT_Stream.h"
 #include "../media/MT_Codec.h"
-#include "../audio/Audio_Interface.h"
 
-#include "rutil/ThreadIf.hxx"
 #include <vector>
 #include <string>
 
@@ -37,10 +35,10 @@ public:
   void          setDestinationAddress(const RtpPair<InternetAddress>& addr) override;
 
   // Processes incoming data
-  void          processData(PDatagramSocket s, const void* dataBuffer, int dataSize, InternetAddress& source) override;
+  void          processData(const PDatagramSocket& s, const void* dataBuffer, int dataSize, InternetAddress& source) override;
 
   // This method is called by user agent to send ICE packet from mediasocket
-  void          sendData(PDatagramSocket s, InternetAddress& destination, const void* dataBuffer, unsigned int datasize) override;
+  void          sendData(const PDatagramSocket& s, InternetAddress& destination, const void* dataBuffer, unsigned int datasize) override;
 
   // Updates SDP offer
   void          updateSdpOffer(resip::SdpContents::Session::Medium& sdp, SdpDirection direction) override;
@@ -76,6 +74,7 @@ public:
   void setupMirror(bool enable);
 
   void configureMediaObserver(MT::Stream::MediaObserver* observer, void* userTag);
+  static SrtpSuite processCryptoAttribute(const resip::Data& value, ByteBuffer& key);
 
 protected:
   // SDP's stream name
@@ -111,7 +110,6 @@ protected:
   void* mMediaObserverTag = nullptr;
 
   std::string createCryptoAttribute(SrtpSuite suite);
-  SrtpSuite processCryptoAttribute(const resip::Data& value, ByteBuffer& key);
   void findRfc2833(const resip::SdpContents::Session::Medium::CodecContainer& codecs);
 
   // Implements setState() logic. This allows to be called from constructor (it is not virtual function)

src/engine/endpoint/EP_DataProvider.cpp

@@ -8,67 +8,67 @@
 
 bool DataProvider::isSupported(const char* name)
 {
-  return !strcmp(name, "audio");
+    return !strcmp(name, "audio");
 
-  //return (!strcmp(name, "screen") || !strcmp(name, "data") || !strcmp(name, "audio") || !strcmp(name, "video"));
+    //return (!strcmp(name, "screen") || !strcmp(name, "data") || !strcmp(name, "audio") || !strcmp(name, "video"));
 }
 
 void DataProvider::pause()
 {
-  /*if (state() & STATE_SIPRECV)
+    /*if (state() & STATE_SIPRECV)
     setState( state() & ~STATE_SIPRECV );*/
 
-  // Stop receive RTP stream
-  if (state() & (int)StreamState::Receiving)
-    setState( state() & ~(int)StreamState::Receiving );
+    // Stop receive RTP stream
+    if (state() & (int)StreamState::Receiving)
+        setState( state() & ~(int)StreamState::Receiving );
 
-  mActive = mfPaused;
+    mActive = mfPaused;
 }
 
 void DataProvider::resume()
 {
-  // Tell remote peer about resumed receiving in SDP
-  //setState( state() | STATE_SIPRECV );
+    // Tell remote peer about resumed receiving in SDP
+    //setState( state() | STATE_SIPRECV );
 
-  // Start receive RTP stream
-  setState( state() | (int)StreamState::Receiving );
+    // Start receive RTP stream
+    setState( state() | (int)StreamState::Receiving );
 
-  mActive = mfActive;
+    mActive = mfActive;
 }
 
 bool DataProvider::processSdpOffer(const resip::SdpContents::Session::Medium& media, SdpDirection sdpDirection)
 {
-  // Process paused and inactive calls
-  if (media.exists("sendonly"))
-  {
-    mRemoteState = msSendonly;
-    setState(state() & ~(int)StreamState::Sending);
-  }
-  else
-  if (media.exists("recvonly"))
-  {
-    mRemoteState = msRecvonly;
-    setState(state() & ~(int)StreamState::Receiving);
-  }
-  else
-  if (media.exists("inactive"))
-  {
-    mRemoteState = msInactive;
-    setState(state() & ~((int)StreamState::Sending | (int)StreamState::Receiving) );
-  }
-  else
-  {
-    mRemoteState = msSendRecv;
-    switch (mActive)
+    // Process paused and inactive calls
+    if (media.exists("sendonly"))
     {
-    case mfActive:
-      setState(state() | (int)StreamState::Sending | (int)StreamState::Receiving);
-      break;
-
-    case mfPaused:
-      setState(state() | (int)StreamState::Sending );
-      break;
+        mRemoteState = msSendonly;
+        setState(state() & ~(int)StreamState::Sending);
     }
-  }
-  return true;
+    else
+        if (media.exists("recvonly"))
+        {
+            mRemoteState = msRecvonly;
+            setState(state() & ~(int)StreamState::Receiving);
+        }
+        else
+            if (media.exists("inactive"))
+            {
+                mRemoteState = msInactive;
+                setState(state() & ~((int)StreamState::Sending | (int)StreamState::Receiving) );
+            }
+            else
+            {
+                mRemoteState = msSendRecv;
+                switch (mActive)
+                {
+                case mfActive:
+                    setState(state() | (int)StreamState::Sending | (int)StreamState::Receiving);
+                    break;
+
+                case mfPaused:
+                    setState(state() | (int)StreamState::Sending );
+                    break;
+                }
+            }
+    return true;
 }

src/engine/endpoint/EP_DataProvider.h

@@ -10,7 +10,6 @@
 #include <vector>
 
 #include "resip/stack/SdpContents.hxx"
-#include "rutil/SharedPtr.hxx"
 
 #include "../helper/HL_InternetAddress.h"
 #include "../helper/HL_NetworkSocket.h"
@@ -20,70 +19,70 @@
 class DataProvider
 {
 public:
-  enum MediaFlow
-  {
-    mfActive,
-    mfPaused
-  };
+    enum MediaFlow
+    {
+        mfActive,
+        mfPaused
+    };
 
-  enum MediaState
-  {
-    msSendRecv,
-    msSendonly,
-    msRecvonly,
-    msInactive
-  };
+    enum MediaState
+    {
+        msSendRecv,
+        msSendonly,
+        msRecvonly,
+        msInactive
+    };
 
-  static bool isSupported(const char* name);
+    static bool isSupported(const char* name);
 
-  // Returns provider RTP name
-  virtual std::string   streamName() = 0;
+    // Returns provider RTP name
+    virtual std::string   streamName() = 0;
 
-  // Returns provider RTP profile name
-  virtual std::string   streamProfile() = 0;
+    // Returns provider RTP profile name
+    virtual std::string   streamProfile() = 0;
 
-  // Sets destination IP address
-  virtual void          setDestinationAddress(const RtpPair<InternetAddress>& addr) = 0;
+    // Sets destination IP address
+    virtual void          setDestinationAddress(const RtpPair<InternetAddress>& addr) = 0;
 
-  // Processes incoming data
-  virtual void          processData(PDatagramSocket s, const void* dataBuffer, int dataSize, InternetAddress& address) = 0;
+    // Processes incoming data
+    virtual void          processData(const PDatagramSocket& s, const void* dataBuffer, int dataSize, InternetAddress& address) = 0;
 
-  // This method is called by user agent to send ICE packet from mediasocket
-  virtual void          sendData(PDatagramSocket s, InternetAddress& destination, const void* dataBuffer, unsigned int datasize) = 0;
+    // This method is called by user agent to send ICE packet from mediasocket
+    virtual void          sendData(const PDatagramSocket& s, InternetAddress& destination, const void* dataBuffer, unsigned int datasize) = 0;
 
-  // Updates SDP offer
-  virtual void          updateSdpOffer(resip::SdpContents::Session::Medium& sdp, SdpDirection direction) = 0;
+    // Updates SDP offer
+    virtual void          updateSdpOffer(resip::SdpContents::Session::Medium& sdp, SdpDirection direction) = 0;
 
-  // Called by user agent when session is deleted. Comes after sessionTerminated().
-  virtual void          sessionDeleted() = 0;
+    // Called by user agent when session is deleted. Comes after sessionTerminated().
+    virtual void          sessionDeleted() = 0;
 
-  // Called by user agent when session is terminated.
-  virtual void          sessionTerminated() = 0;
+    // Called by user agent when session is terminated.
+    virtual void          sessionTerminated() = 0;
 
-  // Called by user agent when session is started.
-  virtual void          sessionEstablished(int conntype) = 0;
+    // Called by user agent when session is started.
+    virtual void          sessionEstablished(int conntype) = 0;
 
-  // Called by user agent to save media socket for this provider
-  virtual void          setSocket(const RtpPair<PDatagramSocket>&  p4, const RtpPair<PDatagramSocket>& p6) = 0;
+    // Called by user agent to save media socket for this provider
+    virtual void          setSocket(const RtpPair<PDatagramSocket>&  p4, const RtpPair<PDatagramSocket>& p6) = 0;
 
-  // Called by user agent to get media socket for this provider
-  virtual RtpPair<PDatagramSocket>& socket(int family) = 0;
+    // Called by user agent to get media socket for this provider
+    virtual RtpPair<PDatagramSocket>& socket(int family) = 0;
 
-  // Called by user agent to process media stream description from remote peer.
-  // Returns true if description is processed succesfully. Otherwise method returns false.
-  virtual bool          processSdpOffer(const resip::SdpContents::Session::Medium& media, SdpDirection sdpDirection) = 0;
+    // Called by user agent to process media stream description from remote peer.
+    // Returns true if description is processed succesfully. Otherwise method returns false.
+    virtual bool          processSdpOffer(const resip::SdpContents::Session::Medium& media, SdpDirection sdpDirection) = 0;
 
-  virtual unsigned      state() = 0;
-  virtual void          setState(unsigned state) = 0;
+    virtual unsigned      state() = 0;
+    virtual void          setState(unsigned state) = 0;
 
-  virtual void          pause();
-  virtual void          resume();
+    virtual void          pause();
+    virtual void          resume();
 
-  virtual MT::Statistics  getStatistics() = 0;
+    virtual MT::Statistics  getStatistics() = 0;
 
 protected:
-  MediaFlow  mActive;
-  MediaState mRemoteState;
+    MediaFlow  mActive;
+    MediaState mRemoteState;
 };
 
 typedef std::shared_ptr<DataProvider>  PDataProvider;

src/engine/endpoint/EP_Engine.h

@@ -47,7 +47,7 @@
 #include "../ice/ICETime.h"
 #include <sstream>
 #include <time.h>
-#include "../config.h"
+#include "../engine_config.h"
 #include "EP_Session.h"
 #include "EP_Observer.h"
 #include "EP_DataProvider.h"
@@ -70,52 +70,52 @@ enum
 
 enum
 {
-  CONFIG_IPV4 = 0,            // Use IP4
-  CONFIG_IPV6,                // Use IP6.
-  CONFIG_USERNAME,            // Username. String value.
-  CONFIG_DOMAIN,              // Domain. String value.
-  CONFIG_PASSWORD,            // Password. String value.
-  CONFIG_RINSTANCE,           // Determines if SIP rinstance field has to be used during registration. Boolean value.
-  CONFIG_INSTANCE_ID,         // Instance id. It is alternative option to rinstance.
-  CONFIG_DISPLAYNAME,         // Optional user display name. String value.
-  CONFIG_DOMAINPORT,          // Optional domain port number. Integer value.
-  CONFIG_REGISTERDURATION,    // Wanted duration for registration. Integer value. It is MANDATORY value.
-  CONFIG_RPORT,               // Use SIP rport field. Recommended to set it to true. Boolean value.
-  CONFIG_KEEPALIVETIME,       // Interval between UDP keep-alive messages. Boolean value.
-  CONFIG_RELAY,               // Sets if TURN server must be used instead of STUN. Boolean value.
-  CONFIG_ICETIMEOUT,          // Optional timeout for ICE connectivity checks and candidate gathering. Integer value.
-  CONFIG_ICEUSERNAME,	        // Optional username for TURN server. String value.
-  CONFIG_ICEPASSWORD,         // Optional password for TURN server. String value.
-  CONFIG_SIPS,                // Marks if account credentials are sips: scheme. Boolean value.
-  CONFIG_STUNSERVER_IP,       // Optional IP address of STUN/TURN server. String value. It is better to use CONFIG_STUNSERVER_NAME.
-  CONFIG_STUNSERVER_NAME,     // Host name of STUN/TURN server. stun.xten.com for example. String value.
-  CONFIG_STUNSERVER_PORT,     // Port number of STUN/TURN server. Integer value.
-  CONFIG_USERAGENT,           // Name of user agent in SIP headers. String value.
-  CONFIG_ICEREQUIRED,         // ICE MUST be present in remote peer offers and answers. Boolean value.
-  CONFIG_TRANSPORT,           // 0 - all transports, 1 - UDP, 2 - TCP, 3 - TLS,
-  CONFIG_SUBSCRIPTION_TIME,   // Subscription time (in seconds)
-  CONFIG_SUBSCRIPTION_REFRESHTIME, // Refresh interval for subscriptions
-  CONFIG_DNS_CACHE_TIME,       // DNS cache time; default is 86400 seconds
-  CONFIG_PRESENCE_ID,         // Tuple ID used in presence publishing; determines source device
-  CONFIG_ROOTCERT,            // Additional root cert in PEM format; string.
-  CONFIG_CACHECREDENTIALS,    // Attempt to cache credentials that comes in response from PBX. Use them when possible to reduce number of steps of SIP transaction
-  CONFIG_RTCP_ATTR,           // Use "rtcp" attribute in sdp. Default value is true.
-  CONFIG_MULTIPLEXING,        // Do rtp/rtcp multiplexing
-  CONFIG_DEFERRELAYED,        // Defer relayed media path
-  CONFIG_PROXY,               // Proxy host name or IP address
-  CONFIG_PROXYPORT,           // Proxy port number
-  CONFIG_CODEC_PRIORITY,      // Another VariantMap with codec priorities,
-  CONFIG_ACCOUNT,             // VariantMap with account configuration
-  CONFIG_EXTERNALIP,          // Use external/public IP in outgoing requests
-  CONFIG_OWN_DNS,             // Use predefined DNS servers
-  CONFIG_REGID                // reg-id value from RFC5626
+    CONFIG_IPV4 = 0,            // Use IP4
+    CONFIG_IPV6,                // Use IP6.
+    CONFIG_USERNAME,            // Username. String value.
+    CONFIG_DOMAIN,              // Domain. String value.
+    CONFIG_PASSWORD,            // Password. String value.
+    CONFIG_RINSTANCE,           // Determines if SIP rinstance field has to be used during registration. Boolean value.
+    CONFIG_INSTANCE_ID,         // Instance id. It is alternative option to rinstance.
+    CONFIG_DISPLAYNAME,         // Optional user display name. String value.
+    CONFIG_DOMAINPORT,          // Optional domain port number. Integer value.
+    CONFIG_REGISTERDURATION,    // Wanted duration for registration. Integer value. It is MANDATORY value.
+    CONFIG_RPORT,               // Use SIP rport field. Recommended to set it to true. Boolean value.
+    CONFIG_KEEPALIVETIME,       // Interval between UDP keep-alive messages. Boolean value.
+    CONFIG_RELAY,               // Sets if TURN server must be used instead of STUN. Boolean value.
+    CONFIG_ICETIMEOUT,          // Optional timeout for ICE connectivity checks and candidate gathering. Integer value.
+    CONFIG_ICEUSERNAME,	        // Optional username for TURN server. String value.
+    CONFIG_ICEPASSWORD,         // Optional password for TURN server. String value.
+    CONFIG_SIPS,                // Marks if account credentials are sips: scheme. Boolean value.
+    CONFIG_STUNSERVER_IP,       // Optional IP address of STUN/TURN server. String value. It is better to use CONFIG_STUNSERVER_NAME.
+    CONFIG_STUNSERVER_NAME,     // Host name of STUN/TURN server. stun.xten.com for example. String value.
+    CONFIG_STUNSERVER_PORT,     // Port number of STUN/TURN server. Integer value.
+    CONFIG_USERAGENT,           // Name of user agent in SIP headers. String value.
+    CONFIG_ICEREQUIRED,         // ICE MUST be present in remote peer offers and answers. Boolean value.
+    CONFIG_TRANSPORT,           // 0 - all transports, 1 - UDP, 2 - TCP, 3 - TLS,
+    CONFIG_SUBSCRIPTION_TIME,   // Subscription time (in seconds)
+    CONFIG_SUBSCRIPTION_REFRESHTIME, // Refresh interval for subscriptions
+    CONFIG_DNS_CACHE_TIME,       // DNS cache time; default is 86400 seconds
+    CONFIG_PRESENCE_ID,         // Tuple ID used in presence publishing; determines source device
+    CONFIG_ROOTCERT,            // Additional root cert in PEM format; string.
+    CONFIG_CACHECREDENTIALS,    // Attempt to cache credentials that comes in response from PBX. Use them when possible to reduce number of steps of SIP transaction
+    CONFIG_RTCP_ATTR,           // Use "rtcp" attribute in sdp. Default value is true.
+    CONFIG_MULTIPLEXING,        // Do rtp/rtcp multiplexing
+    CONFIG_DEFERRELAYED,        // Defer relayed media path
+    CONFIG_PROXY,               // Proxy host name or IP address
+    CONFIG_PROXYPORT,           // Proxy port number
+    CONFIG_CODEC_PRIORITY,      // Another VariantMap with codec priorities,
+    CONFIG_ACCOUNT,             // VariantMap with account configuration
+    CONFIG_EXTERNALIP,          // Use external/public IP in outgoing requests
+    CONFIG_OWN_DNS,             // Use predefined DNS servers
+    CONFIG_REGID                // reg-id value from RFC5626
 };
 
 // Conntype parameter for OnSessionEstablished event
 enum
 {
-  EV_SIP = 1,
-  EV_ICE = 2
+    EV_SIP = 1,
+    EV_ICE = 2
 };
 
 class UserAgent;
@@ -124,7 +124,7 @@ class UserAgent;
 class SIPAction
 {
 public:
-  virtual void Run(UserAgent& ua) = 0;
+    virtual void Run(UserAgent& ua) = 0;
 };
 
 typedef std::vector<SIPAction*> SIPActionVector;
@@ -132,15 +132,15 @@ typedef std::vector<SIPAction*> SIPActionVector;
 // Session termination reason
 enum 
 {
-  Error,
-  Timeout, 
-  Replaced,
-  LocalBye,
-  RemoteBye,
-  LocalCancel,
-  RemoteCancel,
-  Rejected, //Only as UAS, UAC has distinct onFailure callback
-  Referred
+    Error,
+    Timeout,
+    Replaced,
+    LocalBye,
+    RemoteBye,
+    LocalCancel,
+    RemoteCancel,
+    Rejected, //Only as UAS, UAC has distinct onFailure callback
+    Referred
 };
 
 class UserAgent:  public resip::ClientRegistrationHandler, 
@@ -152,238 +152,239 @@ class UserAgent:  public resip::ClientRegistrationHandler,
                   public resip::ServerSubscriptionHandler,
                   public resip::ClientPagerMessageHandler, 
                   public resip::ServerPagerMessageHandler,
-                  public resip::ClientPublicationHandler,
-                  public resip::InternalTransport::TransportLogger
+                  public resip::ClientPublicationHandler
+//public resip::InternalTransport::TransportLogger
 {
-  friend class Account;
-  friend class Session;
-  friend class ResipSession;
-  friend class NATDecorator;
-  friend class WatcherQueue;
+    friend class Account;
+    friend class Session;
+    friend class ResipSession;
+    friend class NATDecorator;
+    friend class WatcherQueue;
 public:
-  /* Compares two sip addresses. Returns true if they represent the same entity - user and domain are the same. Otherwise returns false. */
-  static bool compareSipAddresses(std::string sip1, std::string sip2);
-  static std::string formatSipAddress(std::string sip);
-  static bool isSipAddressValid(std::string sip);
-  struct SipAddress
-  {
-    bool mValid;
-    std::string mScheme;
-    std::string mUsername;
-    std::string mDomain;
-    std::string mDisplayname;
-  };
+    /* Compares two sip addresses. Returns true if they represent the same entity - user and domain are the same. Otherwise returns false. */
+    static bool compareSipAddresses(const std::string& sip1, const std::string& sip2);
+    static std::string formatSipAddress(const std::string& sip);
+    static bool isSipAddressValid(const std::string& sip);
+    struct SipAddress
+    {
+        bool mValid;
+        std::string mScheme;
+        std::string mUsername;
+        std::string mDomain;
+        std::string mDisplayname;
+    };
 
-  static SipAddress parseSipAddress(const std::string& sip);
+    static SipAddress parseSipAddress(const std::string& sip);
 
-  UserAgent();
-  virtual ~UserAgent();
+    UserAgent();
+    virtual ~UserAgent();
 
-  /* Brings user agent online. Basically it creates a signalling socket(s).
+    /* Brings user agent online. Basically it creates a signalling socket(s).
      This is asynchronous method. */
-  void start();
+    void start();
 
-  /* Shutdowns user agent. It closes all sessions, tries to unregister from server and disconnects from it. 
+    /* Shutdowns user agent. It closes all sessions, tries to unregister from server and disconnects from it.
      This is asynchronous method. onStop() event will be called later */
-  void shutdown();
+    void shutdown();
 
-  /* Emergency stop. Please always call shutdown() before this. Kills registration, sessions & presence - everything. onStop() is called in context of this method. */
-  void stop();
+    /* Emergency stop. Please always call shutdown() before this. Kills registration, sessions & presence - everything. onStop() is called in context of this method. */
+    void stop();
 
-  /* Checks if user agent is active (started). */
-  bool active();
+    /* Checks if user agent is active (started). */
+    bool active();
 
-  /* Used to refresh existing registration(s), publication, subscriptions. */
-  void refresh();
+    /* Used to refresh existing registration(s), publication, subscriptions. */
+    void refresh();
 
-  /* Runs sip & ice stacks. Event handlers are called in its context. */
-  void process();
+    /* Runs sip & ice stacks. Event handlers are called in its context. */
+    void process();
 
-  /* Adds root cert in PEM format. Usable after start() call. */
-  void addRootCert(const ByteBuffer& data);
+    /* Adds root cert in PEM format. Usable after start() call. */
+    void addRootCert(const ByteBuffer& data);
 
-  PAccount createAccount(PVariantMap config);
-  void deleteAccount(PAccount account);
+    PAccount createAccount(PVariantMap config);
+    void deleteAccount(PAccount account);
 
-  /* Creates session. Returns session ID. */
-  PSession createSession(PAccount account);
+    /* Creates session. Returns session ID. */
+    PSession createSession(PAccount account);
 
-  // Must be called when IP interface list is changed
-  void updateInterfaceList();
+    // Must be called when IP interface list is changed
+    void updateInterfaceList();
 
-  // Called on new incoming session; providers shoukld
-  virtual PDataProvider onProviderNeeded(const std::string& name) = 0;
+    // Called on new incoming session; providers shoukld
+    virtual PDataProvider onProviderNeeded(const std::string& name) = 0;
 
-  // Called on new session offer
-  virtual void onNewSession(PSession s) = 0;
+    // Called on new session offer
+    virtual void onNewSession(PSession s) = 0;
 
-  // Called when session is terminated
-  virtual void onSessionTerminated(PSession s, int responsecode, int reason) = 0;
+    // Called when session is terminated
+    virtual void onSessionTerminated(PSession s, int responsecode, int reason) = 0;
 
-  // Called when session is established ok i.e. after all ICE signalling is finished
-  // Conntype is type of establish event - EV_SIP or EV_ICE
-  virtual void onSessionEstablished(PSession s, int conntype, const RtpPair<InternetAddress>& p) = 0;
+    // Called when session is established ok i.e. after all ICE signalling is finished
+    // Conntype is type of establish event - EV_SIP or EV_ICE
+    virtual void onSessionEstablished(PSession s, int conntype, const RtpPair<InternetAddress>& p) = 0;
 
-  // Called when client session gets
-  virtual void onSessionProvisional(PSession s, int code) = 0;
+    // Called when client session gets
+    virtual void onSessionProvisional(PSession s, int code) = 0;
 
-  // Called when user agent started
-  virtual void onStart(int errorcode) = 0;
+    // Called when user agent started
+    virtual void onStart(int errorcode) = 0;
 
-  // Called when user agent stopped
-  virtual void onStop() = 0;
+    // Called when user agent stopped
+    virtual void onStop() = 0;
 
-  // Called when account registered
-  virtual void onAccountStart(PAccount account) = 0;
+    // Called when account registered
+    virtual void onAccountStart(PAccount account) = 0;
 
-  // Called when account removed or failed (non zero error code)
-  virtual void onAccountStop(PAccount account, int error) = 0;
+    // Called when account removed or failed (non zero error code)
+    virtual void onAccountStop(PAccount account, int error) = 0;
 
-  // Called when connectivity checks failed.
-  virtual void onConnectivityFailed(PSession s) = 0;
+    // Called when connectivity checks failed.
+    virtual void onConnectivityFailed(PSession s) = 0;
 
-  // Called when new candidate is gathered
-  virtual void onCandidateGathered(PSession s, const char* address);
+    // Called when new candidate is gathered
+    virtual void onCandidateGathered(PSession s, const char* address);
 
-  // Called when network change detected
-  virtual void onNetworkChange(PSession s) = 0;
+    // Called when network change detected
+    virtual void onNetworkChange(PSession s) = 0;
 
-  // Called when all candidates are gathered
-  virtual void onGathered(PSession s);
+    // Called when all candidates are gathered
+    virtual void onGathered(PSession s);
 
-  // Called when new connectivity check is finished
-  virtual void onCheckFinished(PSession s, const char* description);
+    // Called when new connectivity check is finished
+    virtual void onCheckFinished(PSession s, const char* description);
 
-  // Called when log message must be recorded
-  virtual void onLog(const char* msg);
+    // Called when log message must be recorded
+    virtual void onLog(const char* msg);
 
-  // Called when problem with SIP connection(s) detected
-  virtual void onSipConnectionFailed() = 0;
+    // Called when problem with SIP connection(s) detected
+    virtual void onSipConnectionFailed() = 0;
 
-  // Subscribe/publish presence methods
-  virtual void onPublicationSuccess(PAccount acc);
-  virtual void onPublicationTerminated(PAccount acc, int code);
-  virtual void onClientObserverStart(PClientObserver observer);
-  virtual void onServerObserverStart(PServerObserver observer);
-  virtual void onClientObserverStop(PClientObserver observer, int code);
-  virtual void onServerObserverStop(PServerObserver observer, int code);
+    // Subscribe/publish presence methods
+    virtual void onPublicationSuccess(PAccount acc);
+    virtual void onPublicationTerminated(PAccount acc, int code);
+    virtual void onClientObserverStart(PClientObserver observer);
+    virtual void onServerObserverStart(PServerObserver observer);
+    virtual void onClientObserverStop(PClientObserver observer, int code);
+    virtual void onServerObserverStop(PServerObserver observer, int code);
 
-  virtual void onPresenceUpdate(PClientObserver observer, const std::string& peer, bool online, const std::string& content);
-  virtual void onMessageArrived(PAccount account, const std::string& peer, const void* ptr, unsigned length);
-  virtual void onMessageFailed(PAccount account, int id, const std::string& peer, int code, void* tag);
-  virtual void onMessageSent(PAccount account, int id, const std::string& peer, void* tag);
+    virtual void onPresenceUpdate(PClientObserver observer, const std::string& peer, bool online, const std::string& content);
+    virtual void onMessageArrived(PAccount account, const std::string& peer, const void* ptr, unsigned length);
+    virtual void onMessageFailed(PAccount account, int id, const std::string& peer, int code, void* tag);
+    virtual void onMessageSent(PAccount account, int id, const std::string& peer, void* tag);
 
-  // Configuration methods
-  VariantMap& config();
+    // Configuration methods
+    VariantMap& config();
 
 public:
-  // InviteSessionHandler implementation
+        // InviteSessionHandler implementation
 #pragma region InviteSessionHandler implementation
-  /// called when an initial INVITE or the intial response to an outoing invite  
-  virtual void onNewSession(resip::ClientInviteSessionHandle, resip::InviteSession::OfferAnswerType oat, const resip::SipMessage& msg) override;
-  virtual void onNewSession(resip::ServerInviteSessionHandle, resip::InviteSession::OfferAnswerType oat, const resip::SipMessage& msg) override;
+        /// called when an initial INVITE or the intial response to an outoing invite
+    virtual void onNewSession(resip::ClientInviteSessionHandle, resip::InviteSession::OfferAnswerType oat, const resip::SipMessage& msg) override;
+    virtual void onNewSession(resip::ServerInviteSessionHandle, resip::InviteSession::OfferAnswerType oat, const resip::SipMessage& msg) override;
 
-  /// Received a failure response from UAS
-  virtual void onFailure(resip::ClientInviteSessionHandle, const resip::SipMessage& msg) override;
+    /// Received a failure response from UAS
+    virtual void onFailure(resip::ClientInviteSessionHandle, const resip::SipMessage& msg) override;
 
-  /// called when an in-dialog provisional response is received that contains an SDP body
-  virtual void onEarlyMedia(resip::ClientInviteSessionHandle, const resip::SipMessage&, const resip::SdpContents&) override;
+    /// called when an in-dialog provisional response is received that contains an SDP body
+    virtual void onEarlyMedia(resip::ClientInviteSessionHandle, const resip::SipMessage&, const resip::SdpContents&) override;
 
-  /// called when dialog enters the Early state - typically after getting 18x
-  virtual void onProvisional(resip::ClientInviteSessionHandle, const resip::SipMessage&) override;
+    /// called when dialog enters the Early state - typically after getting 18x
+    virtual void onProvisional(resip::ClientInviteSessionHandle, const resip::SipMessage&) override;
 
-  /// called when a dialog initiated as a UAC enters the connected state
-  virtual void onConnected(resip::ClientInviteSessionHandle, const resip::SipMessage& msg) override;
+    /// called when a dialog initiated as a UAC enters the connected state
+    virtual void onConnected(resip::ClientInviteSessionHandle, const resip::SipMessage& msg) override;
 
-  /// called when a dialog initiated as a UAS enters the connected state
-  virtual void onConnected(resip::InviteSessionHandle, const resip::SipMessage& msg) override;
+    /// called when a dialog initiated as a UAS enters the connected state
+    virtual void onConnected(resip::InviteSessionHandle, const resip::SipMessage& msg) override;
 
-  virtual void onTerminated(resip::InviteSessionHandle, resip::InviteSessionHandler::TerminatedReason reason, const resip::SipMessage* related=0) override;
+    virtual void onTerminated(resip::InviteSessionHandle, resip::InviteSessionHandler::TerminatedReason reason, const resip::SipMessage* related=0) override;
 
-  /// called when a fork that was created through a 1xx never receives a 2xx
-  /// because another fork answered and this fork was canceled by a proxy. 
-  virtual void onForkDestroyed(resip::ClientInviteSessionHandle) override;
+    /// called when a fork that was created through a 1xx never receives a 2xx
+    /// because another fork answered and this fork was canceled by a proxy.
+    virtual void onForkDestroyed(resip::ClientInviteSessionHandle) override;
 
-  /// called when a 3xx with valid targets is encountered in an early dialog     
-  /// This is different then getting a 3xx in onTerminated, as another
-  /// request will be attempted, so the DialogSet will not be destroyed.
-  /// Basically an onTermintated that conveys more information.
-  /// checking for 3xx respones in onTerminated will not work as there may
-  /// be no valid targets.
-  virtual void onRedirected(resip::ClientInviteSessionHandle, const resip::SipMessage& msg) override;
+    /// called when a 3xx with valid targets is encountered in an early dialog
+    /// This is different then getting a 3xx in onTerminated, as another
+    /// request will be attempted, so the DialogSet will not be destroyed.
+    /// Basically an onTermintated that conveys more information.
+    /// checking for 3xx respones in onTerminated will not work as there may
+    /// be no valid targets.
+    virtual void onRedirected(resip::ClientInviteSessionHandle, const resip::SipMessage& msg) override;
 
-  /// called when an SDP answer is received - has nothing to do with user
-  /// answering the call 
-  virtual void onAnswer(resip::InviteSessionHandle, const resip::SipMessage& msg, const resip::SdpContents&) override;
+    /// called when an SDP answer is received - has nothing to do with user
+    /// answering the call
+    virtual void onAnswer(resip::InviteSessionHandle, const resip::SipMessage& msg, const resip::SdpContents&) override;
 
-  /// called when an SDP offer is received - must send an answer soon after this
-  virtual void onOffer(resip::InviteSessionHandle, const resip::SipMessage& msg, const resip::SdpContents&) override;
+    /// called when an SDP offer is received - must send an answer soon after this
+    virtual void onOffer(resip::InviteSessionHandle, const resip::SipMessage& msg, const resip::SdpContents&) override;
 
-  /// called when an Invite w/out SDP is sent, or any other context which
-  /// requires an SDP offer from the user
-  virtual void onOfferRequired(resip::InviteSessionHandle, const resip::SipMessage& msg) override;
+    /// called when an Invite w/out SDP is sent, or any other context which
+    /// requires an SDP offer from the user
+    virtual void onOfferRequired(resip::InviteSessionHandle, const resip::SipMessage& msg) override;
 
-  /// called if an offer in a UPDATE or re-INVITE was rejected - not real
-  /// useful. A SipMessage is provided if one is available
-  virtual void onOfferRejected(resip::InviteSessionHandle, const resip::SipMessage* msg) override;
+    /// called if an offer in a UPDATE or re-INVITE was rejected - not real
+    /// useful. A SipMessage is provided if one is available
+    virtual void onOfferRejected(resip::InviteSessionHandle, const resip::SipMessage* msg) override;
 
-  /// called when INFO message is received 
-  virtual void onInfo(resip::InviteSessionHandle, const resip::SipMessage& msg) override;
+    /// called when INFO message is received
+    virtual void onInfo(resip::InviteSessionHandle, const resip::SipMessage& msg) override;
 
-  /// called when response to INFO message is received 
-  virtual void onInfoSuccess(resip::InviteSessionHandle, const resip::SipMessage& msg) override;
-  virtual void onInfoFailure(resip::InviteSessionHandle, const resip::SipMessage& msg) override;
+    /// called when response to INFO message is received
+    virtual void onInfoSuccess(resip::InviteSessionHandle, const resip::SipMessage& msg) override;
+    virtual void onInfoFailure(resip::InviteSessionHandle, const resip::SipMessage& msg) override;
 
-  /// called when MESSAGE message is received 
-  virtual void onMessage(resip::InviteSessionHandle, const resip::SipMessage& msg) override;
+    /// called when MESSAGE message is received
+    virtual void onMessage(resip::InviteSessionHandle, const resip::SipMessage& msg) override;
 
-  /// called when response to MESSAGE message is received 
-  virtual void onMessageSuccess(resip::InviteSessionHandle, const resip::SipMessage& msg) override;
-  virtual void onMessageFailure(resip::InviteSessionHandle, const resip::SipMessage& msg) override;
+    /// called when response to MESSAGE message is received
+    virtual void onMessageSuccess(resip::InviteSessionHandle, const resip::SipMessage& msg) override;
+    virtual void onMessageFailure(resip::InviteSessionHandle, const resip::SipMessage& msg) override;
 
-  /// called when an REFER message is received.  The refer is accepted or
-  /// rejected using the server subscription. If the offer is accepted,
-  /// DialogUsageManager::makeInviteSessionFromRefer can be used to create an
-  /// InviteSession that will send notify messages using the ServerSubscription
-  virtual void onRefer(resip::InviteSessionHandle, resip::ServerSubscriptionHandle, const resip::SipMessage& msg) override;
+    /// called when an REFER message is received.  The refer is accepted or
+    /// rejected using the server subscription. If the offer is accepted,
+    /// DialogUsageManager::makeInviteSessionFromRefer can be used to create an
+    /// InviteSession that will send notify messages using the ServerSubscription
+    virtual void onRefer(resip::InviteSessionHandle, resip::ServerSubscriptionHandle, const resip::SipMessage& msg) override;
 
-  virtual void onReferNoSub(resip::InviteSessionHandle, const resip::SipMessage& msg) override;
+    virtual void onReferNoSub(resip::InviteSessionHandle, const resip::SipMessage& msg) override;
 
-  /// called when an REFER message receives a failure response 
-  virtual void onReferRejected(resip::InviteSessionHandle, const resip::SipMessage& msg) override;
+    /// called when an REFER message receives a failure response
+    virtual void onReferRejected(resip::InviteSessionHandle, const resip::SipMessage& msg) override;
 
-  /// called when an REFER message receives an accepted response 
-  virtual void onReferAccepted(resip::InviteSessionHandle, resip::ClientSubscriptionHandle, const resip::SipMessage& msg) override;
+    /// called when an REFER message receives an accepted response
+    virtual void onReferAccepted(resip::InviteSessionHandle, resip::ClientSubscriptionHandle, const resip::SipMessage& msg) override;
 #pragma endregion
 
-  // ClientRegistrationHandler implementation
+// ClientRegistrationHandler implementation
 #pragma region ClientRegistrationHandler implementation
-  /// Called when registraion succeeds or each time it is sucessfully
-  /// refreshed. 
-  void onSuccess(resip::ClientRegistrationHandle, const resip::SipMessage& response) override;
+    /// Called when registraion succeeds or each time it is sucessfully
+    /// refreshed.
+    void onSuccess(resip::ClientRegistrationHandle, const resip::SipMessage& response) override;
 
-  // Called when all of my bindings have been removed
-  void onRemoved(resip::ClientRegistrationHandle, const resip::SipMessage& response) override;
+    // Called when all of my bindings have been removed
+    void onRemoved(resip::ClientRegistrationHandle, const resip::SipMessage& response) override;
 
-  /// call on Retry-After failure. 
-  /// return values: -1 = fail, 0 = retry immediately, N = retry in N seconds
-  int onRequestRetry(resip::ClientRegistrationHandle, int retrySeconds, const resip::SipMessage& response) override;
+    /// call on Retry-After failure.
+    /// return values: -1 = fail, 0 = retry immediately, N = retry in N seconds
+    int onRequestRetry(resip::ClientRegistrationHandle, int retrySeconds, const resip::SipMessage& response) override;
 
-  /// Called if registration fails, usage will be destroyed (unless a 
-  /// Registration retry interval is enabled in the Profile)
-  void onFailure(resip::ClientRegistrationHandle, const resip::SipMessage& response) override;
+    /// Called if registration fails, usage will be destroyed (unless a
+    /// Registration retry interval is enabled in the Profile)
+    void onFailure(resip::ClientRegistrationHandle, const resip::SipMessage& response) override;
 
 #pragma endregion
 
 #pragma region ExternalLogger implementation
-   /** return true to also do default logging, false to suppress default logging. */
-  virtual bool operator()(resip::Log::Level level,
-    const resip::Subsystem& subsystem, 
-    const resip::Data& appName,
-      const char* file,
-      int line,
-      const resip::Data& message,
-      const resip::Data& messageWithHeaders) override;
+    /** return true to also do default logging, false to suppress default logging. */
+    virtual bool operator()(resip::Log::Level level,
+                            const resip::Subsystem& subsystem,
+                            const resip::Data& appName,
+                            const char* file,
+                            int line,
+                            const resip::Data& message,
+                            const resip::Data& messageWithHeaders,
+                            const resip::Data& instanceName) override;
 #pragma endregion
 
 #pragma region DnsResultSink implementation
@@ -397,96 +398,96 @@ public:
 #pragma endregion
 
 #pragma region TransportLogger implementation
-    void onSipMessage(int flow, const char* msg, unsigned int length, const sockaddr* addr, unsigned int addrlen) override;
+    void onSipMessage(int flow, const char* msg, unsigned int length, const sockaddr* addr, unsigned int addrlen);
 #pragma  endregion
 
 #pragma region ClientPublicationHandler
-  void onSuccess(resip::ClientPublicationHandle, const resip::SipMessage& status) override;
-  void onRemove(resip::ClientPublicationHandle, const resip::SipMessage& status) override;
-  void onFailure(resip::ClientPublicationHandle, const resip::SipMessage& status) override;
-  int onRequestRetry(resip::ClientPublicationHandle, int retrySeconds, const resip::SipMessage& status) override;
+    void onSuccess(resip::ClientPublicationHandle, const resip::SipMessage& status) override;
+    void onRemove(resip::ClientPublicationHandle, const resip::SipMessage& status) override;
+    void onFailure(resip::ClientPublicationHandle, const resip::SipMessage& status) override;
+    int onRequestRetry(resip::ClientPublicationHandle, int retrySeconds, const resip::SipMessage& status) override;
 #pragma endregion
 
 #pragma region SubscriptionHandler
-  void onUpdate(resip::ClientSubscriptionHandle h, const resip::SipMessage& notify);
-  void onUpdatePending(resip::ClientSubscriptionHandle, const resip::SipMessage& notify, bool outOfOrder) override;
-  void onUpdateActive(resip::ClientSubscriptionHandle, const resip::SipMessage& notify, bool outOfOrder) override;
+    void onUpdate(resip::ClientSubscriptionHandle h, const resip::SipMessage& notify);
+    void onUpdatePending(resip::ClientSubscriptionHandle, const resip::SipMessage& notify, bool outOfOrder) override;
+    void onUpdateActive(resip::ClientSubscriptionHandle, const resip::SipMessage& notify, bool outOfOrder) override;
 
-  //unknown Subscription-State value
-  void onUpdateExtension(resip::ClientSubscriptionHandle, const resip::SipMessage& notify, bool outOfOrder) override;
-  int onRequestRetry(resip::ClientSubscriptionHandle, int retrySeconds, const resip::SipMessage& notify) override;
+    //unknown Subscription-State value
+    void onUpdateExtension(resip::ClientSubscriptionHandle, const resip::SipMessage& notify, bool outOfOrder) override;
+    int onRequestRetry(resip::ClientSubscriptionHandle, int retrySeconds, const resip::SipMessage& notify) override;
 
-  //subscription can be ended through a notify or a failure response.
-  void onTerminated(resip::ClientSubscriptionHandle, const resip::SipMessage* msg) override;
-  //not sure if this has any value.
-  void onNewSubscription(resip::ClientSubscriptionHandle, const resip::SipMessage& notify) override;
+    //subscription can be ended through a notify or a failure response.
+    void onTerminated(resip::ClientSubscriptionHandle, const resip::SipMessage* msg) override;
+    //not sure if this has any value.
+    void onNewSubscription(resip::ClientSubscriptionHandle, const resip::SipMessage& notify) override;
 
-  /// called to allow app to adorn a message.
-  void onReadyToSend(resip::ClientSubscriptionHandle, resip::SipMessage& msg) override;
-  void onNotifyNotReceived(resip::ClientSubscriptionHandle) override;
+    /// called to allow app to adorn a message.
+    void onReadyToSend(resip::ClientSubscriptionHandle, resip::SipMessage& msg) override;
+    void onNotifyNotReceived(resip::ClientSubscriptionHandle) override;
 
-  /// Called when a TCP or TLS flow to the server has terminated.  This can be caused by socket
-  /// errors, or missing CRLF keep alives pong responses from the server.
-  //  Called only if clientOutbound is enabled on the UserProfile and the first hop server 
-  /// supports RFC5626 (outbound).
-  /// Default implementation is to re-form the subscription using a new flow
-  void onFlowTerminated(resip::ClientSubscriptionHandle) override;
-  void onNewSubscription(resip::ServerSubscriptionHandle, const resip::SipMessage& sub) override;
-  void onTerminated(resip::ServerSubscriptionHandle) override;
+    /// Called when a TCP or TLS flow to the server has terminated.  This can be caused by socket
+    /// errors, or missing CRLF keep alives pong responses from the server.
+    //  Called only if clientOutbound is enabled on the UserProfile and the first hop server
+    /// supports RFC5626 (outbound).
+    /// Default implementation is to re-form the subscription using a new flow
+    void onFlowTerminated(resip::ClientSubscriptionHandle) override;
+    void onNewSubscription(resip::ServerSubscriptionHandle, const resip::SipMessage& sub) override;
+    void onTerminated(resip::ServerSubscriptionHandle) override;
 #pragma endregion
 
 #pragma region PagerHandler
-  void onSuccess(resip::ClientPagerMessageHandle, const resip::SipMessage& status) override;
-  void onFailure(resip::ClientPagerMessageHandle, const resip::SipMessage& status, std::unique_ptr<resip::Contents> contents) override;
-  void onMessageArrived(resip::ServerPagerMessageHandle, const resip::SipMessage& message) override;
+    void onSuccess(resip::ClientPagerMessageHandle, const resip::SipMessage& status) override;
+    void onFailure(resip::ClientPagerMessageHandle, const resip::SipMessage& status, std::unique_ptr<resip::Contents> contents) override;
+    void onMessageArrived(resip::ServerPagerMessageHandle, const resip::SipMessage& message) override;
 #pragma endregion
 
-  void onDumCanBeDeleted() override;
+    void onDumCanBeDeleted() override;
 protected:
-  // Mutex to protect this instance
-  Mutex mGuard;
+    // Mutex to protect this instance
+    Mutex mGuard;
 
-  // Smart pointer to resiprocate's master profile instance. The stack configuration holds here.
-  resip::SharedPtr<resip::MasterProfile> mProfile;
+    // Smart pointer to resiprocate's master profile instance. The stack configuration holds here.
+    std::shared_ptr<resip::MasterProfile> mProfile;
 
-  // Resiprocate's SIP stack object pointer
-  resip::SipStack* mStack;
+    // Resiprocate's SIP stack object pointer
+    resip::SipStack* mStack;
 
-  // Resiprocate's dialog usage manager object pointer
-  resip::DialogUsageManager* mDum;
+    // Resiprocate's dialog usage manager object pointer
+    resip::DialogUsageManager* mDum;
 
-  // List of available transports. They are owned by SipStack - so there is no need to delete instances in UserAgent.
-  std::vector<resip::InternalTransport*> mTransportList;
+    // List of available transports. They are owned by SipStack - so there is no need to delete instances in UserAgent.
+    std::vector<resip::InternalTransport*> mTransportList;
 
-  typedef std::map<int, PSession> SessionMap;
+    typedef std::map<int, PSession> SessionMap;
 
-  // Session's map
-  SessionMap mSessionMap;
+    // Session's map
+    SessionMap mSessionMap;
 
-  // Used configuration
-  VariantMap mConfig;
+    // Used configuration
+    VariantMap mConfig;
 
-  // Action vector
-  SIPActionVector mActionVector;
+    // Action vector
+    SIPActionVector mActionVector;
 
-  typedef std::map<int, PClientObserver> ClientObserverMap;
-  ClientObserverMap mClientObserverMap;
+    typedef std::map<int, PClientObserver> ClientObserverMap;
+    ClientObserverMap mClientObserverMap;
 
-  typedef std::map<int, PServerObserver> ServerObserverMap;
-  ServerObserverMap mServerObserverMap;
+    typedef std::map<int, PServerObserver> ServerObserverMap;
+    ServerObserverMap mServerObserverMap;
 
-  typedef std::set<PAccount> AccountSet;
-  AccountSet mAccountSet;
+    typedef std::set<PAccount> AccountSet;
+    AccountSet mAccountSet;
 
-  // Constructs and sends INVITE to remote peer. Remote peer address is stored inside session object.
-  void sendOffer(Session* session);
-  void internalStopSession(Session& session);
-  void processWatchingList();
-  bool handleMultipartRelatedNotify(const resip::SipMessage& notify);
+    // Constructs and sends INVITE to remote peer. Remote peer address is stored inside session object.
+    void sendOffer(Session* session);
+    void internalStopSession(Session& session);
+    void processWatchingList();
+    bool handleMultipartRelatedNotify(const resip::SipMessage& notify);
 
-  PSession getUserSession(int sessionId);
-  PAccount getAccount(const resip::NameAddr& myAddr);
-  PAccount getAccount(Account* account);
-  PAccount getAccount(int sessionId);
+    PSession getUserSession(int sessionId);
+    PAccount getAccount(const resip::NameAddr& myAddr);
+    PAccount getAccount(Account* account);
+    PAccount getAccount(int sessionId);
 };
 #endif

src/engine/endpoint/EP_NetworkQueue.cpp

@@ -2,7 +2,7 @@
 #include "EP_Engine.h"
 
 WatcherQueue::WatcherQueue(UserAgent& ua)
-:mActiveId(0), mAgent(ua)
+    :mActiveId(0), mAgent(ua)
 {}
 
 WatcherQueue::~WatcherQueue()
@@ -10,173 +10,173 @@ WatcherQueue::~WatcherQueue()
 
 int WatcherQueue::add(std::string peer, std::string package, void* tag)
 {
-  ice::Lock l(mGuard);
+    ice::Lock l(mGuard);
 
-  // Check if queue has similar item
-  for (unsigned i=0; i<mItemList.size(); i++)
-  {
-    Item& item = mItemList[i];
-    if (item.mTarget == peer && item.mPackage == package &&
-        item.mState != Item::State_Deleting)
-      return item.mId;
-  }
+    // Check if queue has similar item
+    for (unsigned i=0; i<mItemList.size(); i++)
+    {
+        Item& item = mItemList[i];
+        if (item.mTarget == peer && item.mPackage == package &&
+            item.mState != Item::State_Deleting)
+            return item.mId;
+    }
 
-  Item item;
-  item.mTarget = peer;
-  item.mPackage = package;
-  item.mTag = tag;
-  item.mState = Item::State_ScheduledToAdd;
-  item.mSession = new ResipSession(*mAgent.mDum);
-  item.mSession->setUa(&mAgent);
-  item.mSession->setType(ResipSession::Type_Subscription);
-  item.mSession->setTag(tag);
-  item.mId = item.mSession->sessionId();
-  item.mSession->setRemoteAddress(peer);
-  item.mTag = tag;
-  mItemList.push_back(item);
-  process();
+    Item item;
+    item.mTarget = peer;
+    item.mPackage = package;
+    item.mTag = tag;
+    item.mState = Item::State_ScheduledToAdd;
+    item.mSession = new ResipSession(*mAgent.mDum);
+    item.mSession->setUa(&mAgent);
+    item.mSession->setType(ResipSession::Type_Subscription);
+    item.mSession->setTag(tag);
+    item.mId = item.mSession->sessionId();
+    item.mSession->setRemoteAddress(peer);
+    item.mTag = tag;
+    mItemList.push_back(item);
+    process();
 
-  return item.mId;
+    return item.mId;
 }
 
 void WatcherQueue::remove(int id)
 {
-  ice::Lock l(mGuard);
+    ice::Lock l(mGuard);
 
-  // Check if queue has similar item
-  for (unsigned i=0; i<mItemList.size(); i++)
-  {
-    Item& item = mItemList[i];
-    if (item.mId == id && !id)
+    // Check if queue has similar item
+    for (unsigned i=0; i<mItemList.size(); i++)
     {
-      if (item.mState != Item::State_Deleting)
-        item.mState = Item::State_ScheduledToDelete;
+        Item& item = mItemList[i];
+        if (item.mId == id && !id)
+        {
+            if (item.mState != Item::State_Deleting)
+                item.mState = Item::State_ScheduledToDelete;
+        }
     }
-  }
-  process();
+    process();
 }
 
 
 void WatcherQueue::refresh(int id)
 {
-  ice::Lock l(mGuard);
+    ice::Lock l(mGuard);
 
-  // Check if queue has similar item
-  for (unsigned i=0; i<mItemList.size(); i++)
-  {
-    Item& item = mItemList[i];
-    if (item.mId == id && !id)
+    // Check if queue has similar item
+    for (unsigned i=0; i<mItemList.size(); i++)
     {
-      if (item.mState == Item::State_ScheduledToDelete || item.mState == Item::State_Active)
-        item.mState = Item::State_ScheduledToRefresh;
+        Item& item = mItemList[i];
+        if (item.mId == id && !id)
+        {
+            if (item.mState == Item::State_ScheduledToDelete || item.mState == Item::State_Active)
+                item.mState = Item::State_ScheduledToRefresh;
+        }
     }
-  }
-  process();
+    process();
 }
 
 void WatcherQueue::process()
 {
-  while (!mActiveId)
-  {
-    // Find next item to process
-    ItemList::iterator i = mItemList.begin();
-    for (;i != mItemList.end() && !i->scheduled(); i++)
-      ;
-    if (i == mItemList.end())
-      return;
-    
-    resip::SharedPtr<resip::SipMessage> msg;
-    int expires = DEFAULT_SUBSCRIPTION_TIME, refresh = DEFAULT_SUBSCRIPTION_REFRESHTIME;
-
-    switch (i->mState)
+    while (!mActiveId)
     {
-    case Item::State_ScheduledToAdd:
-      if (mAgent.mConfig.exists(CONFIG_SUBSCRIPTION_TIME))
-        expires = mAgent.mConfig[CONFIG_SUBSCRIPTION_TIME].asInt();
-      if (mAgent.mConfig.exists(CONFIG_SUBSCRIPTION_REFRESHTIME))
-        refresh = mAgent.mConfig[CONFIG_SUBSCRIPTION_REFRESHTIME].asInt();
+        // Find next item to process
+        ItemList::iterator i = mItemList.begin();
+        for (;i != mItemList.end() && !i->scheduled(); i++)
+            ;
+        if (i == mItemList.end())
+            return;
 
-      msg = mAgent.mDum->makeSubscription(resip::NameAddr(resip::Data(i->mTarget)), resip::Data(i->mPackage), 
-        expires, refresh, i->mSession);
-      msg->header(resip::h_Accepts) = mAgent.mDum->getMasterProfile()->getSupportedMimeTypes(resip::NOTIFY);
-      mActiveId = i->mId;
-      i->mState = Item::State_Adding;
-      mAgent.mDum->send(msg);
-      break;
+        std::shared_ptr<resip::SipMessage> msg;
+        int expires = DEFAULT_SUBSCRIPTION_TIME, refresh = DEFAULT_SUBSCRIPTION_REFRESHTIME;
 
-    case Item::State_ScheduledToDelete:
-      i->mSession->runTerminatedEvent(ResipSession::Type_Subscription, 0, 0);
-      if (i->mHandle.isValid())
-      {
-        mActiveId = i->mId;
-        i->mHandle->end();
-        i->mState = Item::State_Deleting;
-        break;
-      }
-      else
-        mItemList.erase(i);
-      break;
+        switch (i->mState)
+        {
+        case Item::State_ScheduledToAdd:
+            if (mAgent.mConfig.exists(CONFIG_SUBSCRIPTION_TIME))
+                expires = mAgent.mConfig[CONFIG_SUBSCRIPTION_TIME].asInt();
+            if (mAgent.mConfig.exists(CONFIG_SUBSCRIPTION_REFRESHTIME))
+                refresh = mAgent.mConfig[CONFIG_SUBSCRIPTION_REFRESHTIME].asInt();
 
-    case Item::State_ScheduledToRefresh:
-      if (i->mHandle.isValid())
-      {
-        mActiveId = i->mId;
-        i->mState = Item::State_Refreshing;
-        i->mHandle->requestRefresh();
-      }
-      else
-        mItemList.erase(i);
-      break;
+            msg = mAgent.mDum->makeSubscription(resip::NameAddr(resip::Data(i->mTarget)), resip::Data(i->mPackage),
+                                                expires, refresh, i->mSession);
+            msg->header(resip::h_Accepts) = mAgent.mDum->getMasterProfile()->getSupportedMimeTypes(resip::NOTIFY);
+            mActiveId = i->mId;
+            i->mState = Item::State_Adding;
+            mAgent.mDum->send(msg);
+            break;
 
-    default:
-      break;
+        case Item::State_ScheduledToDelete:
+            i->mSession->runTerminatedEvent(ResipSession::Type_Subscription, 0, 0);
+            if (i->mHandle.isValid())
+            {
+                mActiveId = i->mId;
+                i->mHandle->end();
+                i->mState = Item::State_Deleting;
+                break;
+            }
+            else
+                mItemList.erase(i);
+            break;
+
+        case Item::State_ScheduledToRefresh:
+            if (i->mHandle.isValid())
+            {
+                mActiveId = i->mId;
+                i->mState = Item::State_Refreshing;
+                i->mHandle->requestRefresh();
+            }
+            else
+                mItemList.erase(i);
+            break;
+
+        default:
+            break;
+        }
     }
-  }
 }
 
 void WatcherQueue::onTerminated(int id, int code)
 {
-  ice::Lock l(mGuard);
-  ItemList::iterator i = findById(id);
-  if (i != mItemList.end())
-  {
-    if (i->mSession)
-      i->mSession->runTerminatedEvent(ResipSession::Type_Subscription, code, 0);
-    mItemList.erase(i);
-    if (i->mId == mActiveId)
-      mActiveId = 0;
-  }
-  process();
+    ice::Lock l(mGuard);
+    ItemList::iterator i = findById(id);
+    if (i != mItemList.end())
+    {
+        if (i->mSession)
+            i->mSession->runTerminatedEvent(ResipSession::Type_Subscription, code, 0);
+        mItemList.erase(i);
+        if (i->mId == mActiveId)
+            mActiveId = 0;
+    }
+    process();
 }
 
 void WatcherQueue::onEstablished(int id, int code)
 {
-  ice::Lock l(mGuard);
-  ItemList::iterator i = findById(id);
-  if (i != mItemList.end())
-  {
-    i->mState = Item::State_Active;
-    if (i->mId == mActiveId)
-      mActiveId = 0;
-  }
-  process();
+    ice::Lock l(mGuard);
+    ItemList::iterator i = findById(id);
+    if (i != mItemList.end())
+    {
+        i->mState = Item::State_Active;
+        if (i->mId == mActiveId)
+            mActiveId = 0;
+    }
+    process();
 }
 
 WatcherQueue::ItemList::iterator WatcherQueue::findById(int id)
 {
-  for (ItemList::iterator i=mItemList.begin(); i != mItemList.end(); i++)
-    if (i->mId == id)
-      return i;
-  return mItemList.end();
+    for (ItemList::iterator i=mItemList.begin(); i != mItemList.end(); i++)
+        if (i->mId == id)
+            return i;
+    return mItemList.end();
 }
 
 void WatcherQueue::clear()
 {
-  ice::Lock l(mGuard);
-  for (ItemList::iterator i=mItemList.begin(); i != mItemList.end(); i++)
-  {
-    if (i->mHandle.isValid())
-      i->mHandle->end();
-  }
-  mItemList.clear();
+    ice::Lock l(mGuard);
+    for (ItemList::iterator i=mItemList.begin(); i != mItemList.end(); i++)
+    {
+        if (i->mHandle.isValid())
+            i->mHandle->end();
+    }
+    mItemList.clear();
 }

src/engine/endpoint/EP_NetworkQueue.h

@@ -13,57 +13,57 @@ class UserAgent;
 class WatcherQueue
 {
 public:
-  struct Item
-  {
-    enum State
+    struct Item
     {
-      State_None,
-      State_Active,
-      State_ScheduledToAdd,
-      State_Adding,
-      State_ScheduledToRefresh,
-      State_Refreshing,
-      State_ScheduledToDelete,
-      State_Deleting
+        enum State
+        {
+            State_None,
+            State_Active,
+            State_ScheduledToAdd,
+            State_Adding,
+            State_ScheduledToRefresh,
+            State_Refreshing,
+            State_ScheduledToDelete,
+            State_Deleting
+        };
+
+        resip::ClientSubscriptionHandle mHandle; // Subscription handle
+        ResipSession* mSession;
+        State mState;
+        std::string mTarget; // Target's address
+        std::string mPackage; // Event package
+        void* mTag; // User tag
+        int mId;
+
+        Item()
+            :mSession(NULL), mState(State_None), mTag(NULL), mId(0)
+        {}
+
+        bool scheduled()
+        {
+            return mState == State_ScheduledToAdd || mState == State_ScheduledToDelete || mState == State_ScheduledToRefresh;
+        }
     };
+    WatcherQueue(UserAgent& agent);
+    ~WatcherQueue();
 
-    resip::ClientSubscriptionHandle mHandle; // Subscription handle
-    ResipSession* mSession;
-    State mState; 
-    std::string mTarget; // Target's address
-    std::string mPackage; // Event package
-    void* mTag; // User tag
-    int mId;
+    int add(std::string peer, std::string package, void* tag);
+    void remove(int id);
+    void refresh(int id);
+    void clear();
 
-    Item()
-      :mSession(NULL), mState(State_None), mTag(NULL), mId(0)
-    {}
-
-    bool scheduled() 
-    {
-      return mState == State_ScheduledToAdd || mState == State_ScheduledToDelete || mState == State_ScheduledToRefresh;
-    }
-  };
-  WatcherQueue(UserAgent& agent);
-  ~WatcherQueue();
-
-  int add(std::string peer, std::string package, void* tag);
-  void remove(int id);
-  void refresh(int id);
-  void clear();
-
-  void onTerminated(int id, int code);
-  void onEstablished(int id, int code);
+    void onTerminated(int id, int code);
+    void onEstablished(int id, int code);
 
 protected:
-  typedef std::vector<Item> ItemList;
-  ItemList mItemList;
-  ice::Mutex mGuard;
-  UserAgent& mAgent;
-  int mActiveId;
+    typedef std::vector<Item> ItemList;
+    ItemList mItemList;
+    ice::Mutex mGuard;
+    UserAgent& mAgent;
+    int mActiveId;
 
-  void process();
-  ItemList::iterator findById(int id);
+    void process();
+    ItemList::iterator findById(int id);
 };
 
 #endif

src/engine/endpoint/EP_Observer.cpp

@@ -19,88 +19,88 @@ ClientObserver::~ClientObserver()
 
 void ClientObserver::refresh()
 {
-  if (mHandle.isValid())
-    mHandle->requestRefresh();
+    if (mHandle.isValid())
+        mHandle->requestRefresh();
 }
 
 void ClientObserver::stop()
 {
-  if (mHandle.isValid())
-    mHandle->end();
-  else
-  if (mSession)
-  {
-    mSession->runTerminatedEvent(ResipSession::Type_Subscription);
-    if (mSession)
-      mSession->end();
-  }
-  mSession = NULL;
+    if (mHandle.isValid())
+        mHandle->end();
+    else
+        if (mSession)
+        {
+            mSession->runTerminatedEvent(ResipSession::Type_Subscription);
+            if (mSession)
+                mSession->end();
+        }
+    mSession = NULL;
 }
 
 std::string ClientObserver::peer()
 {
-  return mPeer;
+    return mPeer;
 }
 
 ServerObserver::ServerObserver()
-  :mState(State_Incoming)
+    :mState(State_Incoming)
 {
 
 }
 
 ServerObserver::~ServerObserver()
 {
-  stop();
+    stop();
 }
 
 std::string ServerObserver::peer() const
 {
-  return mPeer;
+    return mPeer;
 }
 
 std::string ServerObserver::package() const
 {
-  return mPackage;
+    return mPackage;
 }
 
 void ServerObserver::update(std::string simpleId, bool online, std::string msg)
 {
-  if (mState != State_Active)
-    return;
+    if (mState != State_Active)
+        return;
 
-  resip::Pidf p;
-  p.setEntity(mContact);
-  p.setSimpleId(resip::Data(simpleId));
-  p.setSimpleStatus(online, resip::Data(msg));
+    resip::Pidf p;
+    p.setEntity(mContact);
+    p.setSimpleId(resip::Data(simpleId));
+    p.setSimpleStatus(online, resip::Data(msg));
 
-  if (mHandle.isValid())
-    mHandle->send(mHandle->update(&p));
+    if (mHandle.isValid())
+        mHandle->send(mHandle->update(&p));
 }
 
 void ServerObserver::accept()
 {
-  if (mHandle.isValid() && mState == State_Incoming)
-  {
-    mState = State_Active;
-    mHandle->accept();
-  }
+    if (mHandle.isValid() && mState == State_Incoming)
+    {
+        mState = State_Active;
+        mHandle->accept();
+    }
 }
 
 void ServerObserver::stop()
 {
-  if (!mHandle.isValid())
-    return;
+    if (!mHandle.isValid())
+        return;
 
-  switch (mState)
-  {
-  case State_Incoming:
-    mHandle->reject(404);
-    break;
-  case State_Active:
-    mHandle->end();
-    break;
-  default:
-    break;
-  }
-  mState = State_Closed;
+    switch (mState)
+    {
+    case State_Incoming:
+        mHandle->reject(404);
+        break;
+    case State_Active:
+        mHandle->end();
+        break;
+    default:
+        break;
+    }
+    mState = State_Closed;
 }

src/engine/endpoint/EP_Observer.h

@@ -21,51 +21,51 @@ class ResipSession;
 
 class ClientObserver
 {
-  friend class Account;
-  friend class UserAgent;
+    friend class Account;
+    friend class UserAgent;
 public:
-  ClientObserver();
-  ~ClientObserver();
+    ClientObserver();
+    ~ClientObserver();
 
-  void refresh();
-  void stop();
-  std::string peer();
+    void refresh();
+    void stop();
+    std::string peer();
 
 protected:
-  resip::ClientSubscriptionHandle mHandle;
-  ResipSession* mSession;
-  int mSessionId;
-  std::string mPeer;
+    resip::ClientSubscriptionHandle mHandle;
+    ResipSession* mSession;
+    int mSessionId;
+    std::string mPeer;
 };
 
 typedef std::shared_ptr<ClientObserver> PClientObserver;
 
 class ServerObserver
 {
-  friend class UserAgent;
+    friend class UserAgent;
 public:
-  ServerObserver();
-  ~ServerObserver();
+    ServerObserver();
+    ~ServerObserver();
 
-  std::string peer() const;
-  std::string package() const;
+    std::string peer() const;
+    std::string package() const;
 
-  void accept();
-  void update(std::string simpleId, bool online, std::string msg);
-  void stop();
+    void accept();
+    void update(std::string simpleId, bool online, std::string msg);
+    void stop();
 
 protected:
-  enum State
-  {
-    State_Incoming,
-    State_Active,
-    State_Closed
-  };
-  State mState;
-  resip::ServerSubscriptionHandle mHandle;
-  std::string mPeer, mPackage;
-  resip::Uri mContact;
-  int mSessionId;
+    enum State
+    {
+        State_Incoming,
+        State_Active,
+        State_Closed
+    };
+    State mState;
+    resip::ServerSubscriptionHandle mHandle;
+    std::string mPeer, mPackage;
+    resip::Uri mContact;
+    int mSessionId;
 };
 
 typedef std::shared_ptr<ServerObserver> PServerObserver;

src/engine/endpoint/EP_Session.cpp

@@ -1,4 +1,4 @@
-/* Copyright(C) 2007-2017 VoIP objects (voipobjects.com)
+/* Copyright(C) 2007-2023 VoIP objects (voipobjects.com)
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -7,11 +7,7 @@
 #include "EP_Engine.h"
 #include "EP_AudioProvider.h"
 #include "../media/MT_Stream.h"
-#include "../media/MT_AudioStream.h"
-#include "../media/MT_Dtmf.h"
 #include "../helper/HL_Log.h"
-#include "../helper/HL_Exception.h"
-#include "../helper/HL_StreamState.h"
 #include "../helper/HL_Sync.h"
 #include "../helper/HL_String.h"
 
@@ -20,7 +16,7 @@
 typedef resip::SdpContents::Session::Medium Medium;
 typedef resip::SdpContents::Session::MediumContainer MediumContainer;
 
-#define DOMULTIPLEX()  mUserAgent->mConfig[CONFIG_MULTIPLEXING].asBool() ? SocketHeap::DoMultiplexing : SocketHeap::DontMultiplexing
+#define IS_MULTIPLEX()  mUserAgent->mConfig[CONFIG_MULTIPLEXING].asBool() ? SocketHeap::DoMultiplexing : SocketHeap::DontMultiplexing
 
 
 //------------ ResipSessionAppDialog ------------
@@ -37,12 +33,12 @@ ResipSessionAppDialog::~ResipSessionAppDialog()
 
 #pragma region ResipSession
 
-resip::AtomicCounter ResipSession::InstanceCounter;
+std::atomic_int ResipSession::InstanceCounter;
 
 ResipSession::ResipSession(resip::DialogUsageManager& dum) 
     : resip::AppDialogSet(dum), mUserAgent(NULL), mType(Type_None), mSessionId(0), mSession(0)
 {
-    ResipSession::InstanceCounter.increment();
+    ResipSession::InstanceCounter++;
     mTag = NULL;
     mTerminated = false;
     mOnWatchingStartSent = false;
@@ -62,7 +58,7 @@ ResipSession::~ResipSession()
     {
     }
 
-    ResipSession::InstanceCounter.decrement();
+    ResipSession::InstanceCounter--;
 }
 
 resip::AppDialog* ResipSession::createAppDialog(const resip::SipMessage& msg)
@@ -167,12 +163,12 @@ int ResipSession::sessionId()
     return mSessionId;
 }
 
-void ResipSession::setUASProfile(std::shared_ptr<resip::UserProfile> profile)
+void ResipSession::setUASProfile(const std::shared_ptr<resip::UserProfile>& profile)
 {
     mUASProfile = profile;
 }
 
-resip::SharedPtr<resip::UserProfile> ResipSession::selectUASUserProfile(const resip::SipMessage& msg)
+std::shared_ptr<resip::UserProfile> ResipSession::selectUASUserProfile(const resip::SipMessage& msg)
 {
     assert(mUserAgent != nullptr);
 
@@ -184,7 +180,7 @@ resip::SharedPtr<resip::UserProfile> ResipSession::selectUASUserProfile(const re
         else
             return mUserAgent->mProfile;
     }
-    return resip::SharedPtr<resip::UserProfile>();
+    return std::shared_ptr<resip::UserProfile>();
 }
 
 #pragma endregion
@@ -262,11 +258,11 @@ void Session::Stream::setRtcpMuxAttr(bool value)
 #pragma endregion
 
 #pragma region Session
-resip::AtomicCounter Session::InstanceCounter;
+std::atomic_int Session::InstanceCounter;
 
 Session::Session(PAccount account)
 {  
-    InstanceCounter.increment();
+    InstanceCounter++;
     mAccount = account;
     mSessionId = Session::generateId();
     mTag = NULL;
@@ -278,7 +274,7 @@ Session::Session(PAccount account)
     mRole = Acceptor;
     mGatheredCandidates = false;
     mTerminated = false;
-    mRemoteOriginVersion = (UInt64)-1;
+    mRemoteOriginVersion = (uint64_t)-1;
     mResipSession = NULL;
     mRefCount = 1;
     mOfferAnswerCounter = 0;
@@ -296,7 +292,7 @@ Session::~Session()
     }
     catch(...)
     {}
-    InstanceCounter.decrement();
+    InstanceCounter--;
 }
 
 void Session::start(const std::string& peer)
@@ -449,28 +445,18 @@ void Session::getSessionInfo(Session::InfoOptions options, VariantMap& info)
     MT::Statistics stat;
 
     // Iterate all session providers
-    stat.reset();
-    Stream* media = NULL;
-    for (unsigned streamIndex = 0; streamIndex < mStreamList.size(); streamIndex++)
+    Stream* media = nullptr;
+    for (Stream& stream: mStreamList)
     {
-        Stream& stream = mStreamList[streamIndex];
-        if (stream.provider())
-        {
-            media = &stream;
-            MT::Statistics s = stream.provider()->getStatistics();
-#if defined(USE_PVQA_LIBRARY) && !defined(TARGET_SERVER)
-            if (options != InfoOptions::Standard)
-            {
-                // This information is available AFTER audio stream is deleted
-                info[SessionInfo_PvqaMos] = s.mPvqaMos;
-                info[SessionInfo_PvqaReport] = s.mPvqaReport;
-            }
-#endif
-            info[SessionInfo_NetworkMos] = static_cast<float>(s.calculateMos(4.14));
-            info[SessionInfo_AudioCodec] = s.mCodecName;
+        if (!stream.provider())
+            continue;
 
-            stat += s;
-        }
+        media = &stream;
+        MT::Statistics s = stream.provider()->getStatistics();
+        info[SessionInfo_NetworkMos] = static_cast<float>(s.calculateMos(4.14));
+        info[SessionInfo_AudioCodec] = s.mCodecName;
+
+        stat += s;
     }
 
     info[SessionInfo_ReceivedTraffic] = static_cast<int>(stat.mReceived);
@@ -482,7 +468,7 @@ void Session::getSessionInfo(Session::InfoOptions options, VariantMap& info)
     info[SessionInfo_SentRtp] = static_cast<int>(stat.mSentRtp);
     info[SessionInfo_SentRtcp] = static_cast<int>(stat.mSentRtcp);
     if (stat.mFirstRtpTime)
-        info[SessionInfo_Duration] = static_cast<int>(std::chrono::duration_cast<std::chrono::seconds>(std::chrono::system_clock::now() - *(stat.mFirstRtpTime)).count());
+        info[SessionInfo_Duration] = static_cast<int>(std::chrono::duration_cast<std::chrono::seconds>(std::chrono::steady_clock::now() - *(stat.mFirstRtpTime)).count());
     else
         info[SessionInfo_Duration] = 0;
 
@@ -549,12 +535,11 @@ void Session::onReceivedData(PDatagramSocket socket, InternetAddress& src, const
     {
         // Try to process incoming data by ICE stack
         int component = -1, stream = -1;
-        bool processed;
         if (mIceStack->findStreamAndComponent(socket->family(), socket->localport(), &stream, &component))
         {
             ice::ByteBuffer buffer(receivedPtr, receivedSize);
             buffer.setRemoteAddress(src);
-            processed = mIceStack->processIncomingData(stream, component, buffer);
+            /*bool processed = */mIceStack->processIncomingData(stream, component, buffer);
         }
     }
     else
@@ -714,11 +699,11 @@ void Session::buildSdp(resip::SdpContents &sdp, SdpDirection sdpDirection)
             if (mUserAgent->mConfig[CONFIG_MULTIPLEXING].asBool())
                 rtcpPort = rtpPort;
             else
-                if (rtcpPort.isEmpty())
-                {
-                    rtcpPort = rtpPort;
-                    rtcpPort.setPort( rtpPort.port() + 1);
-                }
+            if (rtcpPort.isEmpty())
+            {
+                rtcpPort = rtpPort;
+                rtcpPort.setPort( rtpPort.port() + 1);
+            }
 
             media.addAttribute("rtcp", resip::Data(rtcpPort.port()));
         }
@@ -792,8 +777,8 @@ void Session::addProvider(PDataProvider provider)
     s.setProvider( provider );
 
     // Allocate socket for provider
-    s.setSocket4( SocketHeap::instance().allocSocketPair(AF_INET, this, DOMULTIPLEX()) );
-    s.setSocket6( SocketHeap::instance().allocSocketPair(AF_INET6, this, DOMULTIPLEX()) );
+    s.setSocket4( SocketHeap::instance().allocSocketPair(AF_INET, this, IS_MULTIPLEX()) );
+    s.setSocket6( SocketHeap::instance().allocSocketPair(AF_INET6, this, IS_MULTIPLEX()) );
     s.provider()->setSocket(s.socket4(), s.socket6());
 
     // Create ICE stream/component
@@ -829,10 +814,10 @@ int Session::sessionId()
     return mSessionId;
 }
 
-resip::AtomicCounter Session::IdGenerator;
+std::atomic_int Session::IdGenerator;
 int Session::generateId()
 {
-    return (int)IdGenerator.increment();
+    return ++IdGenerator;
 }
 
 std::string Session::remoteAddress() const
@@ -896,8 +881,8 @@ void Session::refreshMediaPath()
         SocketHeap::instance().freeSocketPair(p->socket(AF_INET));
 
         // Bring new socket to provider and stream
-        RtpPair<PDatagramSocket> s4 = SocketHeap::instance().allocSocketPair(AF_INET, this, DOMULTIPLEX() ),
-                s6 = SocketHeap::instance().allocSocketPair(AF_INET, this, DOMULTIPLEX());
+        RtpPair<PDatagramSocket> s4 = SocketHeap::instance().allocSocketPair(AF_INET, this, IS_MULTIPLEX() ),
+                s6 = SocketHeap::instance().allocSocketPair(AF_INET, this, IS_MULTIPLEX());
 
         p->setSocket(s4, s6);
         s.setSocket4(s4);
@@ -914,7 +899,7 @@ void Session::refreshMediaPath()
 }
 
 // Received offer with new SDP
-int Session::processSdp(UInt64 version, bool iceAvailable, std::string icePwd, std::string iceUfrag,
+int Session::processSdp(uint64_t version, bool iceAvailable, std::string icePwd, std::string iceUfrag,
                         std::string remoteIp, const resip::SdpContents::Session::MediumContainer& media)
 {
     bool iceRestart = false;
@@ -959,7 +944,7 @@ int Session::processSdp(UInt64 version, bool iceAvailable, std::string icePwd, s
             targetAddr.mRtcp.setPort( remoteStream.port() );
         else
             if (stream.rtcpAttr())
-                targetAddr.mRtcp.setPort( StringHelper::toInt(remoteStream.getValues("rtcp").front().c_str(), remoteStream.port() + 1 ) );
+                targetAddr.mRtcp.setPort( strx::toInt(remoteStream.getValues("rtcp").front().c_str(), remoteStream.port() + 1 ) );
             else
                 targetAddr.mRtcp.setPort( remoteStream.port() + 1);
 
@@ -976,8 +961,8 @@ int Session::processSdp(UInt64 version, bool iceAvailable, std::string icePwd, s
         {
             try
             {
-                stream.setSocket4(SocketHeap::instance().allocSocketPair(AF_INET, this, DOMULTIPLEX()));
-                stream.setSocket6(SocketHeap::instance().allocSocketPair(AF_INET6, this, DOMULTIPLEX()));
+                stream.setSocket4(SocketHeap::instance().allocSocketPair(AF_INET, this, IS_MULTIPLEX()));
+                stream.setSocket6(SocketHeap::instance().allocSocketPair(AF_INET6, this, IS_MULTIPLEX()));
             }
             catch(...)
             {

src/engine/endpoint/EP_Session.h

@@ -28,15 +28,14 @@
 #include "rutil/Logger.hxx"
 #include "rutil/Random.hxx"
 #include "rutil/WinLeakCheck.hxx"
-#include "rutil/AtomicCounter.hxx"
 
 #include "../ice/ICEBox.h"
 
 #include <sstream>
+#include <atomic>
 #include <time.h>
 
-#include "../config.h"
-#include "EP_Session.h"
+#include "../engine_config.h"
 #include "EP_Account.h"
 #include "EP_DataProvider.h"
 #include "EP_AudioProvider.h"
@@ -214,7 +213,8 @@ public:
   void refreshMediaPath();
 
   // Processes new sdp from offer. Returns response code (200 is ok, 488 bad codec, 503 internal error).
-  int processSdp(UInt64 version, bool iceAvailable, std::string icePwd, std::string iceUfrag,
+  // There are passing string objects by value; this is correct; this values will modified on the stack.
+  int processSdp(uint64_t version, bool iceAvailable, std::string icePwd, const std::string iceUfrag,
     std::string remoteIp, const resip::SdpContents::Session::MediumContainer& media);
 
   // Session ID
@@ -224,7 +224,7 @@ public:
   std::vector<Stream>  mStreamList;
 
   // Smart pointer to ICE stack. Actually stack is created in CreateICEStack() method
-  resip::SharedPtr<ice::Stack>    mIceStack;
+  std::shared_ptr<ice::Stack>    mIceStack;
 
   // Pointer to owner user agent instance
   UserAgent*           mUserAgent;
@@ -237,7 +237,7 @@ public:
 
   // SDP's origin version for sending
   int                  mOriginVersion;
-  UInt64               mRemoteOriginVersion;
+  uint64_t             mRemoteOriginVersion;
 
   // SDP's session version
   int                  mSessionVersion;
@@ -318,8 +318,8 @@ public:
    void enqueueOffer();
    void processQueuedOffer();
    static int generateId();
-   static resip::AtomicCounter IdGenerator;
-   static resip::AtomicCounter InstanceCounter;
+   static std::atomic_int IdGenerator;
+   static std::atomic_int InstanceCounter;
 };
 
 typedef std::shared_ptr<Session> PSession;
@@ -354,13 +354,13 @@ public:
     Type_Call,
     Type_Auto
   };
-  static resip::AtomicCounter InstanceCounter;
+  static std::atomic_int InstanceCounter;
 
 
   ResipSession(resip::DialogUsageManager& dum);
   virtual ~ResipSession();
   virtual resip::AppDialog* createAppDialog(const resip::SipMessage& msg);
-  virtual resip::SharedPtr<resip::UserProfile> selectUASUserProfile(const resip::SipMessage& msg);
+  virtual std::shared_ptr<resip::UserProfile> selectUASUserProfile(const resip::SipMessage& msg);
   
   void setType(Type type);
   Type type();
@@ -384,7 +384,7 @@ public:
 
   void runTerminatedEvent(Type type, int code = 0, int reason = 0);
 
-  void setUASProfile(std::shared_ptr<resip::UserProfile> profile);
+  void setUASProfile(const std::shared_ptr<resip::UserProfile>& profile);
 
 protected:
   bool mTerminated;

src/engine/engine_config.h

@@ -0,0 +1,117 @@
+/* Copyright(C) 2007-2023 VoIP objects (voipobjects.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef __TOOLKIT_CONFIG_H
+#define __TOOLKIT_CONFIG_H
+
+#define USE_SPEEX_AEC
+
+// TODO: test implementation with webrtc aec; be careful - it needs fixes!
+//#define USE_WEBRTC_AEC
+#define USER
+
+
+#define AUDIO_SAMPLE_WIDTH 16
+#define AUDIO_CHANNELS 1
+
+// Samplerate must be 8 / 16 / 24 / 32 / 48 KHz
+#define AUDIO_SAMPLERATE 48000
+#define AUDIO_MIC_BUFFER_COUNT 16
+#define AUDIO_MIC_BUFFER_LENGTH 10
+#define AUDIO_MIC_BUFFER_SIZE  (AUDIO_MIC_BUFFER_LENGTH * AUDIO_SAMPLERATE / 1000 * 2 * AUDIO_CHANNELS)
+#define AUDIO_SPK_BUFFER_COUNT 16
+#define AUDIO_SPK_BUFFER_LENGTH 10
+#define AUDIO_SPK_BUFFER_SIZE (AUDIO_SPK_BUFFER_LENGTH * AUDIO_SAMPLERATE / 1000 * 2 * AUDIO_CHANNELS)
+#define AUDIO_MIX_CHANNEL_COUNT 16
+#define AUDIO_DEVICEPAIR_INPUTBUFFER 16384
+
+// Avoid too high resampler quality - it can take many CPU and cause gaps in playing
+#define AUDIO_RESAMPLER_QUALITY 1
+#define AEC_FRAME_TIME 10
+#define AEC_TAIL_TIME 160
+
+
+// Defined these two lines to get dumping of audio input/output
+//#define AUDIO_DUMPINPUT
+//#define AUDIO_DUMPOUTPUT
+
+
+#define UA_REGISTRATION_TIME 3600
+#define UA_MEDIA_PORT_START  20000
+#define UA_MEDIA_PORT_FINISH 30000
+#define UA_MAX_UDP_PACKET_SIZE 576
+#define UA_PUBLICATION_ID "314"
+
+#define MT_SAMPLERATE AUDIO_SAMPLERATE
+
+#define MT_MAXAUDIOFRAME     1440
+#define MT_MAXRTPPACKET      1500
+#define MT_DTMF_END_PACKETS  3
+
+#define RTP_BUFFER_HIGH      0
+#define RTP_BUFFER_LOW       0
+#define RTP_BUFFER_PREBUFFER 0
+
+// #define RTP_BUFFER_HIGH      160
+// #define RTP_BUFFER_LOW       10
+// #define RTP_BUFFER_PREBUFFER 160
+#define RTP_DECODED_CAPACITY 2048
+
+#define DEFAULT_SUBSCRIPTION_TIME 1200
+#define DEFAULT_SUBSCRIPTION_REFRESHTIME 500
+
+#define PRESENCE_IN_REG_HEADER "PresenceInReg"
+
+// Maximum UDP packet length
+#define MAX_UDPPACKET_SIZE 65535
+#define MAX_VALID_UDPPACKET_SIZE 2048
+
+// AMR codec defines - it requires USE_AMR_CODEC defined
+// #define USE_AMR_CODEC
+#define MT_AMRNB_PAYLOADTYPE 112
+#define MT_AMRNB_CODECNAME "amr"
+
+#define MT_AMRNB_OCTET_PAYLOADTYPE 113
+
+#define MT_AMRWB_PAYLOADTYPE 96
+#define MT_AMRWB_CODECNAME "amr-wb"
+
+#define MT_AMRWB_OCTET_PAYLOADTYPE 97
+
+#define MT_GSMEFR_PAYLOADTYPE 126
+#define MT_GSMEFR_CODECNAME "GERAN-EFR"
+
+#define MT_EVS_PAYLOADTYPE 127
+#define MT_EVS_CODECNAME "EVS"
+
+// OPUS codec defines
+// #define USE_OPUS_CODEC
+#define MT_OPUS_CODEC_PT 106
+
+// ILBC codec defines
+#define MT_ILBC20_PAYLOADTYPE -1
+#define MT_ILBC30_PAYLOADTYPE -1
+
+// ISAC codec defines
+#define MT_ISAC16K_PAYLOADTYPE -1
+#define MT_ISAC32K_PAYLOADTYPE -1
+
+// GSM HR payload type
+#define MT_GSMHR_PAYLOADTYPE -1
+
+// Mirror buffer capacity
+#define MT_MIRROR_CAPACITY 32768
+
+// Mirror buffer readiness threshold - 50 milliseconds
+#define MT_MIRROR_PREBUFFER (MT_SAMPLERATE / 10)
+
+#if defined(TARGET_OSX) || defined(TARGET_LINUX)
+# define TEXT(X) X
+#endif
+
+// In milliseconds
+#define MT_SEVANA_FRAME_TIME 680
+
+#endif

src/engine/helper/CMakeLists.txt

@@ -2,11 +2,9 @@ cmake_minimum_required (VERSION 3.15)
 project (helper_lib)
 
 # Rely on C++ 11
-set (CMAKE_CXX_STANDARD 11)
+set (CMAKE_CXX_STANDARD 20)
 set (CMAKE_CXX_STANDARD_REQUIRED ON)
 
-option (USE_NULL_UUID "When enabled linking to libuuid is avoided" OFF)
-
 set (CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 file (GLOB HELPER_LIB_SOURCES "*.cpp" "*.h")
@@ -17,3 +15,6 @@ set_property(TARGET helper_lib PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<C
 # Private include directories
 target_include_directories(helper_lib PUBLIC ../../libs/ ../../engine ../ .)
 target_compile_definitions(helper_lib PRIVATE -D_CRT_SECURE_NO_WARNINGS -D_UNICODE)
+if (TARGET_LINUX)
+target_link_libraries (helper_lib PUBLIC uuid)
+endif()

src/engine/helper/HL_File.cpp

@@ -1,7 +1,7 @@
 #include "HL_File.h"
 #include <fstream>
 
-#if defined(TARGET_LINUX) || defined(TARGET_OSX)
+#if defined(TARGET_LINUX) || defined(TARGET_OSX) || defined(TARGET_ANDROID)
 # include <unistd.h>
 # include <sys/statvfs.h>
 # include <memory.h>
@@ -32,23 +32,24 @@ void FileHelper::remove(const char* s)
     ::remove(s);
 }
 
-std::string FileHelper::gettempname()
-{
-#if defined(TARGET_LINUX)
-    char template_filename[L_tmpnam] = "rtphone_XXXXXXX.tmp";
-    mkstemp(template_filename);
-    return template_filename;
-#elif defined(TARGET_WIN)
-    char buffer[L_tmpnam];
-    tmpnam(buffer);
+// std::string FileHelper::gettempname()
+// {
+// #if defined(TARGET_LINUX) || defined(TARGET_ANDROID)
+//     char template_filename[L_tmpnam] = "rtphone_XXXXXXX.tmp";
+//     int code = mkstemp(template_filename);
 
-    return buffer;
-#elif defined(TARGET_OSX)
-    char template_filename[L_tmpnam] = "rtphone_XXXXXXX.tmp";
-    mktemp(template_filename);
-    return template_filename;
-#endif
-}
+//     return template_filename;
+// #elif defined(TARGET_WIN)
+//     char buffer[L_tmpnam];
+//     tmpnam(buffer);
+
+//     return buffer;
+// #elif defined(TARGET_OSX)
+//     char template_filename[L_tmpnam] = "rtphone_XXXXXXX.tmp";
+//     mktemp(template_filename);
+//     return template_filename;
+// #endif
+// }
 
 bool FileHelper::isAbsolute(const std::string& s)
 {
@@ -64,7 +65,7 @@ std::string FileHelper::getCurrentDir()
     return std::string();
 #endif
 
-#if defined(TARGET_LINUX) || defined(TARGET_OSX)
+#if defined(TARGET_LINUX) || defined(TARGET_OSX) || defined(TARGET_ANDROID)
     char buf[512];
     if (getcwd(buf, sizeof buf) != nullptr)
         return buf;
@@ -109,3 +110,32 @@ size_t FileHelper::getFreespace(const std::string& path)
 #endif
     return r;
 }
+
+std::string FileHelper::expandUserHome(const std::string &path)
+{
+    if (path.empty() || path[0] != '~')
+        return path;  // No expansion needed
+    
+    const char* home_dir = nullptr;
+
+#ifdef TARGET_WIN
+    home_dir = std::getenv("USERPROFILE");
+    if (!home_dir)
+    {
+        home_dir = std::getenv("HOMEDRIVE");
+        const char* homepath = std::getenv("HOMEPATH");
+        if (home_dir && homepath) {
+            std::string fullpath(home_dir);
+            fullpath += homepath;
+            return fullpath + path.substr(1);
+        }
+    }
+#else
+    home_dir = std::getenv("HOME");
+#endif
+    
+    if (!home_dir)
+        throw std::runtime_error("Unable to determine the home directory");
+    
+    return std::string(home_dir) + path.substr(1);
+}

src/engine/helper/HL_File.h

@@ -12,7 +12,7 @@ public:
     static void remove(const std::string& s);
     static void remove(const char* s);
 
-    static std::string gettempname();
+    // static std::string gettempname();
     static bool isAbsolute(const std::string& s);
 
     static std::string getCurrentDir();
@@ -23,6 +23,7 @@ public:
     // Returns free space on volume for path
     // Works for Linux only. For other systems (size_t)-1 is returned (for errors too)
     static size_t getFreespace(const std::string& path);
+    static std::string expandUserHome(const std::string& path);
 };
 
 #endif

src/engine/helper/HL_HepSupport.cpp

@@ -103,8 +103,8 @@ bool Packet::parseV3(const ByteBuffer& packet)
     if (!sourceAddr4.isEmpty())
         mSourceAddress = sourceAddr4;
     else
-        if (!sourceAddr6.isEmpty())
-            mSourceAddress = sourceAddr6;
+    if (!sourceAddr6.isEmpty())
+        mSourceAddress = sourceAddr6;
 
     if (!mSourceAddress.isEmpty())
         mSourceAddress.setPort(sourcePort);
@@ -112,8 +112,8 @@ bool Packet::parseV3(const ByteBuffer& packet)
     if (!destAddr4.isEmpty())
         mDestinationAddress = destAddr4;
     else
-        if (!destAddr6.isEmpty())
-            mDestinationAddress = destAddr6;
+    if (!destAddr6.isEmpty())
+        mDestinationAddress = destAddr6;
 
     if (!mDestinationAddress.isEmpty())
         mDestinationAddress.setPort(destPort);

src/engine/helper/HL_IuUP.cpp

@@ -1208,7 +1208,7 @@ static const uint16_t byte_crc10_table[256] = {
 /* Update the data block's CRC-10 remainder one byte at a time */
 uint16_t update_crc10_by_bytes(uint16_t crc10_accum, const uint8_t *data_blk_ptr, int data_blk_size)
 {
-  register int i;
+  /*register*/ int i;
 
   for (i = 0;  i < data_blk_size; i++) {
     crc10_accum = ((crc10_accum << 8) & 0x3ff)

src/engine/helper/HL_NetworkSocket.cpp

@@ -7,7 +7,7 @@
 # include <asm/ioctls.h>
 #endif
 
-#include "../config.h"
+#include "../engine_config.h"
 #include "HL_NetworkSocket.h"
 
 #if defined(TARGET_OSX) || defined(TARGET_LINUX)
@@ -27,7 +27,7 @@ DatagramSocket::DatagramSocket()
 
 DatagramSocket::~DatagramSocket()
 {
-  closeSocket();
+  internalClose();
 }
 
 void DatagramSocket::open(int family)
@@ -61,7 +61,7 @@ void DatagramSocket::sendDatagram(InternetAddress &dest, const void *packetData,
   if (mHandle == INVALID_SOCKET)
     return;
 
-  int sent = ::sendto(mHandle, (const char*)packetData, packetSize, 0, dest.genericsockaddr(), dest.sockaddrLen());
+  /*int sent = */::sendto(mHandle, (const char*)packetData, packetSize, 0, dest.genericsockaddr(), dest.sockaddrLen());
 }
 
 unsigned DatagramSocket::recvDatagram(InternetAddress &src, void *packetBuffer, unsigned packetCapacity)
@@ -85,7 +85,7 @@ unsigned DatagramSocket::recvDatagram(InternetAddress &src, void *packetBuffer,
     return 0;
 }
 
-void DatagramSocket::closeSocket()
+void DatagramSocket::internalClose()
 {
   if (mHandle != INVALID_SOCKET)
   {
@@ -98,6 +98,11 @@ void DatagramSocket::closeSocket()
   }
 }
 
+void DatagramSocket::closeSocket()
+{
+    internalClose();
+}
+
 bool DatagramSocket::isValid() const
 {
   return mHandle != INVALID_SOCKET;
@@ -163,7 +168,7 @@ unsigned DatagramAgreggator::count()
 bool DatagramAgreggator::hasDataAtIndex(unsigned index)
 {
   PDatagramSocket socket = mSocketVector[index];
-  return (FD_ISSET(socket->mHandle, &mReadSet) != 0);
+  return FD_ISSET(socket->mHandle, &mReadSet);
 }
 
 PDatagramSocket DatagramAgreggator::socketAt(unsigned index)

src/engine/helper/HL_NetworkSocket.h

@@ -36,10 +36,12 @@ public:
   virtual SOCKET    socket() const;
 
   virtual void open(int family);
+
 protected:
   int mFamily;
   SOCKET mHandle;
   int mLocalPort;
+  void internalClose();
 };
 typedef std::shared_ptr<DatagramSocket> PDatagramSocket;
 

src/engine/helper/HL_Process.cpp

@@ -39,7 +39,7 @@ std::string OsProcess::execCommand(const std::string& cmd)
     PROCESS_INFORMATION pi  = { 0 };
 
     char* cmdline = (char*)_alloca(cmd.size()+1);
-    strcpy(cmdline, StringHelper::replace(cmd, "/", "\\").c_str());
+    strcpy(cmdline, strx::replace(cmd, "/", "\\").c_str());
 
     BOOL fSuccess = CreateProcessA( nullptr, cmdline, NULL, NULL, TRUE, CREATE_NEW_CONSOLE, NULL, NULL, &si, &pi);
     if (! fSuccess)
@@ -114,7 +114,7 @@ std::shared_ptr<std::thread> OsProcess::asyncExecCommand(const std::string& cmdl
     memset(&pi, 0, sizeof pi);
 
     char* cmdbuffer = (char*)_alloca(cmdline.size()+1);
-    strcpy(cmdbuffer, StringHelper::replace(cmdline, "/", "\\").c_str());
+    strcpy(cmdbuffer, strx::replace(cmdline, "/", "\\").c_str());
 
 
     BOOL fSuccess = CreateProcessA( nullptr, cmdbuffer, nullptr, nullptr, TRUE,
@@ -160,14 +160,14 @@ std::shared_ptr<std::thread> OsProcess::asyncExecCommand(const std::string& cmdl
                 {
                     std::string line(buf, cr - buf -1);
                     if (callback)
-                        callback(StringHelper::trim(line));
+                        callback(strx::trim(line));
                     memmove(buf, cr + 1, strlen(cr+1) + 1);
                 }
             }
         } //for
 
         if (buf[0])
-            callback(StringHelper::trim(std::string(buf)));
+            callback(strx::trim(std::string(buf)));
 
         char ctrlc = 3;
         //if (finish_flag)
@@ -278,12 +278,12 @@ std::shared_ptr<std::thread> OsProcess::asyncExecCommand(const std::string& cmdl
             }
             while (r == sizeof(buffer) - 1);
 
-            if (lines.find("\n") != std::string::npos && line_callback)
+            if (lines.find('\n') != std::string::npos && line_callback)
             {
                 std::string::size_type p = 0;
                 while (p < lines.size())
                 {
-                    std::string::size_type d = lines.find("\n", p);
+                    std::string::size_type d = lines.find('\n', p);
                     if (d != std::string::npos)
                     {
                         if (line_callback)
@@ -311,6 +311,8 @@ std::shared_ptr<std::thread> OsProcess::asyncExecCommand(const std::string& cmdl
     return t;
 }
 
+#if defined(TARGET_OSX) || defined(TARGET_LINUX)
+
 pid_t OsProcess::findPid(const std::string& cmdline)
 {
     try
@@ -332,5 +334,6 @@ void OsProcess::killByPid(pid_t pid)
         return;
     execSystem("kill -9 " + std::to_string(pid) + " &");
 }
+#endif
 
 #endif

src/engine/helper/HL_Rtp.cpp

@@ -8,6 +8,10 @@
 # include <Windows.h>
 #endif
 
+#if defined(TARGET_LINUX) || defined(TARGET_ANDROID)
+# include <arpa/inet.h>
+#endif
+
 #include "HL_Rtp.h"
 #include "HL_Exception.h"
 #include "HL_String.h"
@@ -26,25 +30,25 @@
 
 struct RtpHeader
 {
-    unsigned char cc:4;	/* CSRC count             */
-    unsigned char x:1;		/* header extension flag  */
-    unsigned char p:1;		/* padding flag           */
-    unsigned char version:2;	/* protocol version       */
-    unsigned char pt:7;	/* payload type           */
-    unsigned char m:1;		/* marker bit             */
-    unsigned short seq;		/* sequence number        */
-    unsigned int ts;		/* timestamp              */
-    unsigned int ssrc;	/* synchronization source */
+    unsigned char cc:4;         /* CSRC count             */
+    unsigned char x:1;          /* header extension flag  */
+    unsigned char p:1;          /* padding flag           */
+    unsigned char version:2;	 /* protocol version       */
+    unsigned char pt:7;	     /* payload type           */
+    unsigned char m:1;		     /* marker bit             */
+    unsigned short seq;		 /* sequence number        */
+    unsigned int ts;		     /* timestamp              */
+    unsigned int ssrc;	         /* synchronization source */
 };
 
 struct RtcpHeader
 {
-    unsigned char rc:5;		/* reception report count */
-    unsigned char p:1;		/* padding flag           */
-    unsigned char version:2;	/* protocol version       */
-    unsigned char pt:8;		/* payload type           */
-    uint16_t len;			/* length                 */
-    uint32_t ssrc;	       	/* synchronization source */
+    unsigned char rc:5;		  /* reception report count */
+    unsigned char p:1;          /* padding flag           */
+    unsigned char version:2;    /* protocol version       */
+    unsigned char pt:8;         /* payload type           */
+    uint16_t len;               /* length                 */
+    uint32_t ssrc;	       	     /* synchronization source */
 };
 
 bool RtpHelper::isRtp(const void* buffer, size_t length)
@@ -52,8 +56,12 @@ bool RtpHelper::isRtp(const void* buffer, size_t length)
     if (length < 12)
         return false;
 
-    unsigned char _type = reinterpret_cast<const RtpHeader*>(buffer)->pt;
-    bool rtp = ( (_type & 0x7F) >= 96 && (_type & 0x7F) <= 127) || ((_type & 0x7F) < 35);
+    const RtpHeader* h = reinterpret_cast<const RtpHeader*>(buffer);
+    if (h->version != 0b10)
+        return false;
+
+    unsigned char pt = h->pt;
+    bool rtp = ( (pt & 0x7F) >= 96 && (pt & 0x7F) <= 127) || ((pt & 0x7F) < 35);
     return rtp;
 }
 
@@ -62,9 +70,8 @@ bool RtpHelper::isRtpOrRtcp(const void* buffer, size_t length)
 {
     if (length < 12)
         return false;
-    unsigned char b = ((const unsigned char*)buffer)[0];
-
-    return (b & 0xC0 ) == 128;
+    const RtcpHeader* h = reinterpret_cast<const RtcpHeader*>(buffer);
+    return h->version == 0b10;
 }
 
 bool RtpHelper::isRtcp(const void* buffer, size_t length)
@@ -75,9 +82,9 @@ bool RtpHelper::isRtcp(const void* buffer, size_t length)
 unsigned RtpHelper::findSsrc(const void* buffer, size_t length)
 {
     if (isRtp(buffer, length))
-        return reinterpret_cast<const RtpHeader*>(buffer)->ssrc;
+        return ntohl(reinterpret_cast<const RtpHeader*>(buffer)->ssrc);
     else
-        return reinterpret_cast<const RtcpHeader*>(buffer)->ssrc;
+        return ntohl(reinterpret_cast<const RtcpHeader*>(buffer)->ssrc);
 }
 
 void RtpHelper::setSsrc(void* buffer, size_t length, uint32_t ssrc)

src/engine/helper/HL_Rtp.h

@@ -1,4 +1,4 @@
-/* Copyright(C) 2007-2017 VoIPobjects (voipobjects.com)
+/* Copyright(C) 2007-2025 VoIPobjects (voipobjects.com)
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -10,11 +10,8 @@
 # include "jrtplib/src/rtppacket.h"
 #endif
 
-#include "HL_Uuid.h"
-#include "HL_InternetAddress.h"
-
-#include <vector>
-#include <string>
+#include <cstdint>
+#include <stdlib.h>
 
 // Class to carry rtp/rtcp socket pair
 template<class T>

src/engine/helper/HL_SocketHeap.cpp

@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "../config.h"
+#include "../engine_config.h"
 #ifdef WIN32
 #include <winsock2.h>
 #include <windows.h>
@@ -127,7 +127,7 @@ PDatagramSocket SocketHeap::allocSocket(int family, SocketSink* sink, int port)
     if (sock == INVALID_SOCKET)
     {
         // Return null socket
-        PDatagramSocket result(new DatagramSocket());
+        auto result = std::make_shared<DatagramSocket>();
         result->mLocalPort = port;
         result->mFamily = family;
         return result;
@@ -170,7 +170,7 @@ PDatagramSocket SocketHeap::allocSocket(int family, SocketSink* sink, int port)
         closesocket(sock);
         throw Exception(ERR_NET_FAILED, WSAGetLastError());
     }
-    PDatagramSocket resultObject(new DatagramSocket());
+    auto resultObject = std::make_shared<DatagramSocket>();
     resultObject->mLocalPort = testport;
     resultObject->mHandle = sock;
     if (!resultObject->setBlocking(false))

src/engine/helper/HL_SocketHeap.h

@@ -6,7 +6,7 @@
 #ifndef __SOCKET_HEAP_H
 #define __SOCKET_HEAP_H
 
-#include "../config.h"
+#include "../engine_config.h"
 #include <map>
 #include <vector>
 #include <algorithm>

src/engine/helper/HL_String.cpp

@@ -93,7 +93,11 @@ int strx::toInt(const char *s, int defaultValue, bool* isOk)
 uint64_t strx::toUint64(const char* s, uint64_t def, bool *isOk)
 {
     uint64_t result = def;
-    if (sscanf(s, "%" SCNu64, &result) != 1)
+#if defined(TARGET_WIN)
+    if (sscanf(s, "%I64d", &result) != 1)
+#else
+    if (sscanf(s, "%llu", &result) != 1)
+#endif
     {
         if (isOk)
             *isOk = false;
@@ -315,10 +319,10 @@ static int hex2code(char s)
     return 0;
 }
 
-static int hex2code(const char* s)
+/*static int hex2code(const char* s)
 {
     return (hex2code(s[0]) << 4) + hex2code(s[1]);
-}
+}*/
 
 std::string strx::fromHex2String(const std::string& s)
 {
@@ -408,3 +412,46 @@ std::string strx::uppercase(const std::string& s)
     std::transform(r.begin(), r.end(), r.begin(), ::toupper);
     return r;
 }
+
+std::string strx::lowercase(const std::string& s)
+{
+    std::string r(s);
+    std::transform(r.begin(), r.end(), r.begin(), ::tolower);
+    return r;
+}
+
+std::string strx::removeQuotes(const std::string& s)
+{
+    std::string r(s);
+    if (s.empty())
+        return s;
+
+    if (r.front() == '"')
+        r = r.substr(1);
+
+    if (r.back() == '"')
+        r = r.substr(0, r.size()-1);
+
+    return r;
+}
+
+#if defined(TARGET_WIN)
+
+// MSVC++ lacks memmem support
+const void *memmem(const void *haystack, size_t haystack_len,
+                   const void * const needle, const size_t needle_len)
+{
+    if (!haystack || !haystack_len || !needle || !needle_len)
+        return nullptr;
+
+    for (const char *h = (const char*)haystack;
+         haystack_len >= needle_len;
+         ++h, --haystack_len) {
+        if (!memcmp(h, needle, needle_len)) {
+            return h;
+        }
+    }
+    return nullptr;
+}
+#endif
+

src/engine/helper/HL_String.h

@@ -9,6 +9,7 @@
 #include <vector>
 #include <string>
 #include <sstream>
+#include <cstdint>
 #include "HL_Types.h"
 
 #ifdef TARGET_OSX
@@ -19,28 +20,29 @@
 class strx
 {
 public:
-    static std::string  makeUtf8(const std::tstring& arg);
-    static std::string  toUtf8(const std::tstring& arg);
+    static std::string extractFilename(const std::string& path);
+    static std::string appendPath(const std::string& s1, const std::string& s2);
+
+    static std::string makeUtf8(const std::tstring& arg);
+    static std::string toUtf8(const std::tstring& arg);
     static std::tstring makeTstring(const std::string& arg);
 
-    static int          toInt(const char* s, int defaultValue, bool* isOk = nullptr);
-    static uint64_t     toUint64(const char* s, uint64_t def, bool *isOk = nullptr);
-    static std::string  toHex(unsigned int value);
-    static std::string  toHex(const void* ptr);
-    static std::string  toHex(const uint8_t* input, size_t inputLength);
-    static std::string  intToString(int value);
-    static std::string  doubleToString(double value, int precision);
-    static int          fromHex2Int(const std::string& s);
-    static std::string  fromHex2String(const std::string& s);
-    static float        toFloat(const std::string& s, float defaultValue = 0.0, bool* isOk = nullptr);
+    static int toInt(const char* s, int defaultValue, bool* isOk = nullptr);
+    static uint64_t toUint64(const char* s, uint64_t def, bool *isOk = nullptr);
+    static std::string toHex(unsigned int value);
+    static std::string toHex(const void* ptr);
+    static std::string toHex(const uint8_t* input, size_t inputLength);
+    static std::string intToString(int value);
+    static std::string prefixLines(const std::string& source, const std::string& prefix);
+    static std::string doubleToString(double value, int precision);
+    static int         fromHex2Int(const std::string& s);
+    static std::string fromHex2String(const std::string& s);
+    static float       toFloat(const std::string& s, float defaultValue = 0.0, bool* isOk = nullptr);
 
-    static std::string  extractFilename(const std::string& path);
-    static std::string  appendPath(const std::string& s1, const std::string& s2);
 
-    static std::string  prefixLines(const std::string& source, const std::string& prefix);
     static const char* findSubstring(const char* buffer, const char* substring, size_t bufferLength);
 
-    static void         split(const std::string& src, std::vector<std::string>& dst, const std::string& delims);
+    static void        split(const std::string& src, std::vector<std::string>& dst, const std::string& delims);
     static std::vector<std::string> split(const std::string& src, const std::string& delims = "\n");
 
     template <typename T>
@@ -49,7 +51,7 @@ public:
         std::ostringstream s;
         for (const auto& i : v)
         {
-            if (&i != &v[0])
+            if (&i != &v.front())
                 s << delimiter;
             s << i;
         }
@@ -58,17 +60,19 @@ public:
 
     static std::pair<std::string, int> parseHost(const std::string& host, int defaultPort);
     static std::pair<std::string, std::string> parseAssignment(const std::string& s, bool trimQuotes = true);
-    static std::string  trim(const std::string& s);
-    static std::string  timeToString(time_t t);
-    static std::string  millisecondsToString(uint64_t t);
-    static std::string  replace(const std::string& s, char f, char r);
-    static std::string  replace(const std::string& s, const std::string& tmpl, const std::string& n);
-    static std::string  decodeUri(const std::string& s);
-    static bool         startsWith(const std::string& s, const std::string& prefix);
-    static bool         endsWith(const std::string& s, const std::string& suffix);
-    static int          stringToDuration(const std::string& s);
-    static std::string  uppercase(const std::string& s);
+    static std::string trim(const std::string& s);
+    static std::string timeToString(time_t t);
+    static std::string millisecondsToString(uint64_t t);
+    static std::string replace(const std::string& s, char f, char r);
+    static std::string replace(const std::string& s, const std::string& tmpl, const std::string& n);
+    static std::string decodeUri(const std::string& s);
+    static bool startsWith(const std::string& s, const std::string& prefix);
+    static bool endsWith(const std::string& s, const std::string& suffix);
+    static int stringToDuration(const std::string& s);
     
+	static std::string  uppercase(const std::string& s);
+    static std::string  lowercase(const std::string& s);
+    static std::string  removeQuotes(const std::string& s);
 };
 
 class XcapHelper
@@ -81,4 +85,11 @@ public:
 };
 
 
+#if defined(TARGET_WIN)
+
+// MSVC++ lacks memmem support
+extern const void *memmem(const void *haystack, size_t haystack_len,
+                          const void * const needle, const size_t needle_len);
+#endif
+
 #endif

src/engine/helper/HL_Sync.cpp

@@ -77,19 +77,21 @@ uint64_t ThreadHelper::getCurrentId()
 // ------------------- TimeHelper ---------------
 using namespace std::chrono;
 
+// Milliseconds starting from the epoch
 static uint64_t TimestampStartPoint = duration_cast<milliseconds>(steady_clock::now().time_since_epoch()).count();
+
+// Seconds starting from the epoch
 static time_t TimestampBase = time(nullptr);
 
-uint64_t TimeHelper::getTimestamp()
+// Returns number of milliseconds starting from 01 Jan 1970 GMT
+uint64_t chronox::getTimestamp()
 {
     time_point<steady_clock> t = steady_clock::now();
-
     uint64_t ms = duration_cast< milliseconds >(t.time_since_epoch()).count();
-
     return ms - TimestampStartPoint + TimestampBase * 1000;
 }
 
-uint64_t TimeHelper::getUptime()
+uint64_t chronox::getUptime()
 {
     time_point<steady_clock> t = steady_clock::now();
 
@@ -98,7 +100,7 @@ uint64_t TimeHelper::getUptime()
     return ms - TimestampStartPoint;
 }
 
-uint32_t TimeHelper::getDelta(uint32_t later, uint32_t earlier)
+uint32_t chronox::getDelta(uint32_t later, uint32_t earlier)
 {
     if (later > earlier)
         return later - earlier;
@@ -109,14 +111,42 @@ uint32_t TimeHelper::getDelta(uint32_t later, uint32_t earlier)
     return 0;
 }
 
-TimeHelper::ExecutionTime::ExecutionTime()
+timespec chronox::toTimespec(uint64_t milliseconds)
 {
-    mStart = TimeHelper::getTimestamp();
+    timespec r;
+    r.tv_sec = milliseconds / 1000;
+    r.tv_nsec = milliseconds % 1000;
+    r.tv_nsec *= 1000 * 1000;
+    return r;
 }
 
-uint64_t TimeHelper::ExecutionTime::getSpentTime() const
+uint64_t chronox::toTimestamp(const timeval& ts)
 {
-    return TimeHelper::getTimestamp() - mStart;
+    return ts.tv_sec * 1000 + ts.tv_usec / 1000;
+}
+
+int64_t chronox::getDelta(const timespec& a, const timespec& b)
+{
+    uint64_t ms_a = a.tv_sec * 1000 + a.tv_nsec / 10000000;
+    uint64_t ms_b = b.tv_sec * 1000 + a.tv_nsec / 10000000;
+    return ms_a - ms_b;
+}
+
+int64_t chronox::getDelta(const timeval& a, const timeval& b)
+{
+    int64_t diff_seconds = a.tv_sec - b.tv_sec;
+    int64_t diff_microseconds = a.tv_usec - b.tv_usec;
+    return diff_seconds * 1000 + diff_microseconds / 1000;
+}
+
+chronox::ExecutionTime::ExecutionTime()
+{
+    mStart = chronox::getTimestamp();
+}
+
+uint64_t chronox::ExecutionTime::getSpentTime() const
+{
+    return chronox::getTimestamp() - mStart;
 }
 
 // --------------- BufferQueue -----------------

src/engine/helper/HL_Sync.h

@@ -14,6 +14,11 @@
 #include <functional>
 #include <assert.h>
 
+#if defined(TARGET_WIN)
+# include <WinSock2.h>
+# include <Windows.h>
+#endif
+
 typedef std::recursive_mutex Mutex;
 typedef std::unique_lock<std::recursive_mutex> Lock;
 
@@ -46,7 +51,7 @@ public:
   static uint64_t getCurrentId();
 };
 
-class TimeHelper
+class chronox
 {
 public:
   // Returns current timestamp in milliseconds
@@ -59,6 +64,14 @@ public:
   // Handles cases when clock is wrapped.
   static uint32_t getDelta(uint32_t later, uint32_t earlier);
 
+  // Converts number of milliseconds starting from Epoch begin to timespec.
+  static timespec toTimespec(uint64_t milliseconds);
+  static uint64_t toTimestamp(const timeval& ts);
+
+  // Returns difference between timestamps in milliseconds
+  static int64_t getDelta(const timespec& a, const timespec& b);
+  static int64_t getDelta(const timeval& a, const timeval& b);
+
   class ExecutionTime
   {
   public:

src/engine/helper/HL_ThreadPool.cpp

@@ -7,7 +7,7 @@ thread_pool::thread_pool(size_t num_of_threads, const std::string& name)
         num_of_threads = std::thread::hardware_concurrency();
 
     for(size_t idx = 0; idx < num_of_threads; idx++)
-        this->workers.push_back(std::thread(&thread_pool::run_worker, this));
+        this->workers.emplace_back(std::thread(&thread_pool::run_worker, this));
 }
 
 // Add new work item to the pool
@@ -20,6 +20,22 @@ void thread_pool::enqueue(const thread_pool::task& t)
     this->condition.notify_one();
 }
 
+void thread_pool::wait(std::chrono::milliseconds interval)
+{
+    while (size() != 0)
+        std::this_thread::sleep_for(interval);
+}
+
+size_t thread_pool::size()
+{
+    std::unique_lock l(this->queue_mutex);
+    return this->tasks.size();
+}
+
+size_t thread_pool::threads()
+{
+    return this->workers.size();
+}
 
 // the destructor joins all threads
 thread_pool::~thread_pool()
@@ -37,7 +53,7 @@ void thread_pool::run_worker()
 {
     ThreadHelper::setName(this->name);
     task t;
-    while(!this->stop)
+    while (!this->stop)
     {
         {
             std::unique_lock<std::mutex> lock(this->queue_mutex);

src/engine/helper/HL_ThreadPool.h

@@ -18,10 +18,13 @@ class thread_pool
 public:
     typedef std::function<void()> task;
 
-    thread_pool(size_t num_of_threads, const std::string&);
+    thread_pool(size_t num_of_threads, const std::string& thread_name);
     ~thread_pool();
 
     void enqueue(const task& task);
+    void wait(std::chrono::milliseconds interval = std::chrono::milliseconds(50));
+    size_t size();
+    size_t threads();
 
 private:
     // need to keep track of threads so we can join them
@@ -33,7 +36,7 @@ private:
     // synchronization
     std::mutex queue_mutex;
     std::condition_variable condition;
-    bool stop = false;
+    std::atomic_bool stop = false;
 
     // thread name prefix for worker threads
     std::string name;

src/engine/helper/HL_Time.cpp

@@ -1,10 +1,53 @@
 #include "HL_Time.h"
 
 #include <time.h>
-
+#include <chrono>
 /* return current time in milliseconds */
-double now_ms(void) {
+double now_ms(void)
+{
+#if defined(TARGET_WIN)
+    auto tp = std::chrono::steady_clock::now();
+    auto result = std::chrono::duration_cast<std::chrono::milliseconds>(tp.time_since_epoch()).count();
+    return result;
+#else
     struct timespec res;
     clock_gettime(CLOCK_MONOTONIC, &res);
     return 1000.0 * res.tv_sec + (double) res.tv_nsec / 1e6;
+#endif
 }
+
+int compare_timespec(const timespec& lhs, const timespec& rhs)
+{
+    if (lhs.tv_sec < rhs.tv_sec)
+        return -1;
+    if (lhs.tv_sec > rhs.tv_sec)
+        return 1;
+
+    if (lhs.tv_nsec < rhs.tv_nsec)
+        return -1;
+    if (lhs.tv_nsec > rhs.tv_nsec)
+        return 1;
+
+    return 0;
+}
+
+bool operator < (const timespec& lhs, const timespec& rhs)
+{
+    return compare_timespec(lhs, rhs) < 0;
+}
+
+bool operator == (const timespec& lhs, const timespec& rhs)
+{
+    return compare_timespec(lhs, rhs) == 0;
+}
+
+bool operator > (const timespec& lhs, const timespec& rhs)
+{
+    return compare_timespec(lhs, rhs) > 0;
+}
+
+bool is_zero(const timespec& ts)
+{
+    return !ts.tv_sec && !ts.tv_nsec;
+}
+

src/engine/helper/HL_Time.h

@@ -1,6 +1,17 @@
 #ifndef __HELPER_TIME_H
 #define __HELPER_TIME_H
 
+#include <time.h>
+
+// Return current monotonic number of milliseconds starting from some point
 extern double now_ms();
 
+// Compare the timespec.
+// Returns -1 if lhs < rhs, 1 if lhs > rhs, 0 if equal
+extern int compare_timespec(const timespec& lhs, const timespec& rhs);
+extern bool operator < (const timespec& lhs, const timespec& rhs);
+extern bool operator == (const timespec& lhs, const timespec& rhs);
+extern bool operator > (const timespec& lhs, const timespec& rhs);
+extern bool is_zero(const timespec& ts);
+
 #endif

src/engine/helper/HL_Types.cpp

@@ -0,0 +1 @@
+#include "HL_Types.h"

src/engine/helper/HL_Types.h

@@ -1,4 +1,4 @@
-/* Copyright(C) 2007-2014 VoIP objects (voipobjects.com)
+/* Copyright(C) 2007-2025 VoIP objects (voipobjects.com)
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -26,4 +26,139 @@ enum SdpDirection
   Sdp_Offer
 };
 
+
+#include <unordered_map>
+#include <utility>
+#include <stdexcept>
+#include <map>
+
+template<
+    class K, class V,
+    class HashK = std::hash<K>, class EqK = std::equal_to<K>,
+    class HashV = std::hash<V>, class EqV = std::equal_to<V>
+>
+class BiMap {
+public:
+    using key_type = K;
+    using mapped_type = V;
+
+    BiMap(const std::map<K,V>& initializers) {
+        for (const auto& item: initializers) {
+            insert(item.first, item.second);
+        }
+    }
+
+    // Insert a new (key, value) pair. Returns false if either key or value already exists.
+    bool insert(const K& k, const V& v) {
+        if (contains_key(k) || contains_value(v)) return false;
+        auto ok = forward_.emplace(k, v);
+        try {
+            auto ov = reverse_.emplace(v, k);
+            if (!ov.second) { // shouldn't happen given the guard above
+                forward_.erase(k);
+                return false;
+            }
+        } catch (...) {
+            forward_.erase(k);
+            throw;
+        }
+        return ok.second;
+    }
+
+    bool insert(K&& k, V&& v) {
+        if (contains_key(k) || contains_value(v)) return false;
+        auto ok = forward_.emplace(std::move(k), std::move(v));
+        try {
+            auto ov = reverse_.emplace(ok.first->second, ok.first->first); // use stored refs
+            if (!ov.second) {
+                forward_.erase(ok.first);
+                return false;
+            }
+        } catch (...) {
+            forward_.erase(ok.first);
+            throw;
+        }
+        return ok.second;
+    }
+
+    // Replace value for existing key (and update reverse map). Returns false if value is already bound elsewhere.
+    bool replace_by_key(const K& k, const V& new_v) {
+        auto it = forward_.find(k);
+        if (it == forward_.end()) return false;
+        if (contains_value(new_v)) return false;
+        // remove old reverse, insert new reverse, then update forward
+        reverse_.erase(it->second);
+        reverse_.emplace(new_v, k);
+        it->second = new_v;
+        return true;
+    }
+
+    // Replace key for existing value (and update forward map). Returns false if key is already bound elsewhere.
+    bool replace_by_value(const V& v, const K& new_k) {
+        auto it = reverse_.find(v);
+        if (it == reverse_.end()) return false;
+        if (contains_key(new_k)) return false;
+        forward_.erase(it->second);
+        forward_.emplace(new_k, v);
+        it->second = new_k;
+        return true;
+    }
+
+    // Erase by key/value. Return number erased (0 or 1).
+    size_t erase_key(const K& k) {
+        auto it = forward_.find(k);
+        if (it == forward_.end()) return 0;
+        reverse_.erase(it->second);
+        forward_.erase(it);
+        return 1;
+    }
+
+    size_t erase_value(const V& v) {
+        auto it = reverse_.find(v);
+        if (it == reverse_.end()) return 0;
+        forward_.erase(it->second);
+        reverse_.erase(it);
+        return 1;
+    }
+
+    // Lookup
+    bool contains_key(const K& k) const { return forward_.find(k) != forward_.end(); }
+    bool contains_value(const V& v) const { return reverse_.find(v) != reverse_.end(); }
+
+    const V* find_by_key(const K& k) const {
+        auto it = forward_.find(k);
+        return (it == forward_.end()) ? nullptr : &it->second;
+    }
+    const K* find_by_value(const V& v) const {
+        auto it = reverse_.find(v);
+        return (it == reverse_.end()) ? nullptr : &it->second;
+    }
+
+    // at() variants throw std::out_of_range on missing entries
+    const V& at_key(const K& k) const { return forward_.at(k); }
+    const K& at_value(const V& v) const { return reverse_.at(v); }
+
+    void clear() noexcept {
+        forward_.clear();
+        reverse_.clear();
+    }
+
+    bool empty() const noexcept { return forward_.empty(); }
+    size_t size() const noexcept { return forward_.size(); }
+
+    // Reserve buckets for performance (optional)
+    void reserve(size_t n) {
+        forward_.reserve(n);
+        reverse_.reserve(n);
+    }
+
+private:
+    std::unordered_map<K, V, HashK, EqK> forward_;
+    std::unordered_map<V, K, HashV, EqV> reverse_;
+};
+
+#include <chrono>
+typedef std::chrono::steady_clock::time_point timepoint_t;
+typedef std::chrono::steady_clock             monoclock_t;
+
 #endif

src/engine/helper/HL_Uuid.cpp

@@ -1,77 +1,57 @@
 #include "HL_Uuid.h"
 #include <memory.h>
+#include <random>
+#include <span>
+
+#if defined(TARGET_LINUX)
+#define UUID_SYSTEM_GENERATOR
+#endif
+
+#include "uuid.h"
 
 Uuid::Uuid()
 {
-#if defined(TARGET_WIN) || defined(TARGET_LINUX) || defined(TARGET_OSX)
     memset(&mUuid, 0, sizeof mUuid);
-#endif
 }
 
 Uuid Uuid::generateOne()
 {
     Uuid result;
-#if !defined(USE_NULL_UUID)
-#if defined(TARGET_LINUX) || defined(TARGET_OSX)
-    uuid_generate(result.mUuid);
-#endif
-#if defined(TARGET_WIN)
-    UuidCreate(&result.mUuid);
-#endif
-#endif
+// #if defined(TARGET_LINUX)
+//     auto id = uuids::uuid_system_generator{}();
+// #else
+    std::random_device rd;
+    auto seed_data = std::array<int, std::mt19937::state_size> {};
+    std::generate(std::begin(seed_data), std::end(seed_data), std::ref(rd));
+    std::seed_seq seq(std::begin(seed_data), std::end(seed_data));
+    std::mt19937 generator(seq);
+    uuids::uuid_random_generator gen{generator};
+
+    auto id = gen();
+// #endif
+    memcpy(result.mUuid, id.as_bytes().data(), id.as_bytes().size_bytes());
     return result;
 }
 
 Uuid Uuid::parse(const std::string &s)
 {
     Uuid result;
-#if !defined(USE_NULL_UUID)
-#if defined(TARGET_LINUX) || defined(TARGET_OSX)
-    uuid_parse(s.c_str(), result.mUuid);
-#endif
+    auto id = uuids::uuid::from_string(s);
+    if (id)
+        memcpy(result.mUuid, id->as_bytes().data(), id->as_bytes().size_bytes());
 
-#if defined(TARGET_WIN)
-    UuidFromStringA((RPC_CSTR)s.c_str(), &result.mUuid);
-#endif
-#endif
     return result;
 }
 
 std::string Uuid::toString() const
 {
-#if defined(USE_NULL_UUID)
-    return "UUID_disabled";
-#else
-    char buf[64];
-
-#if defined(TARGET_LINUX) || defined(TARGET_OSX)
-    uuid_unparse_lower(mUuid, buf);
-#endif
-
-#if defined(TARGET_WIN)
-    RPC_CSTR s = nullptr;
-    UuidToStringA(&mUuid, &s);
-    if (s)
-    {
-        strcpy(buf, (const char*)s);
-        RpcStringFreeA(&s);
-        s = nullptr;
-    }
-#endif
-
-    return buf;
-#endif
+    auto s = std::span<uuids::uuid::value_type, 16>{(uuids::uuid::value_type*)mUuid, 16};
+    uuids::uuid id(s);
+    return uuids::to_string(id);
 }
 
 bool Uuid::operator < (const Uuid& right) const
 {
-#if defined(TARGET_LINUX) || defined(TARGET_OSX)
     return memcmp(mUuid, right.mUuid, sizeof(mUuid)) < 0;
-#endif
-
-#if defined(TARGET_WIN)
-    return memcmp(&mUuid, &right.mUuid, sizeof(mUuid)) < 0;
-#endif
-
     return false;
 }

src/engine/helper/HL_Uuid.h

@@ -2,39 +2,19 @@
 #define __HL_UUID_H
 
 #include <string>
-
-#if (defined(TARGET_LINUX) || defined(TARGET_OSX)) && !defined(USE_NULL_UUID)
-// Please do not forget "sudo apt install uuid-dev" on Ubuntu
-# include <uuid/uuid.h>
-#endif
-#if defined(TARGET_WIN)
-# include <rpc.h>
-#endif
+#include <stdint.h>
 
 class Uuid
 {
 public:
-  Uuid();
-  static Uuid generateOne();
-  static Uuid parse(const std::string& s);
-  std::string toString() const;
-  bool operator < (const Uuid& right) const;
+    Uuid();
+    static Uuid generateOne();
+    static Uuid parse(const std::string& s);
+    std::string toString() const;
+    bool operator < (const Uuid& right) const;
 
 protected:
-#if defined(USE_NULL_UUID)
-  unsigned char mUuid[16];
-#else
-
-#if defined(TARGET_LINUX) || defined(TARGET_OSX)
-  uuid_t mUuid;
-#endif
-#if defined(TARGET_WIN)
-  UUID mUuid;
-#endif
-#if defined(TARGET_ANDROID)
-  // Stub only
-#endif
-#endif
+    uint8_t mUuid[16];
 };
 
 

src/engine/media/CMakeLists.txt

@@ -1,12 +1,15 @@
 project (media_lib)
 
-# Rely on C++ 11
-set (CMAKE_CXX_STANDARD 11)
+if (NOT DEFINED LIB_PLATFORM)
+    message(FATAL_ERROR media_lib project requires LIB_PLATFORM to be set - it uses libraries from that directory)
+endif()
+
+# Rely on C++ 20
+set (CMAKE_CXX_STANDARD 20)
 set (CMAKE_CXX_STANDARD_REQUIRED ON)
 
 # Produce PIC code always
 set (CMAKE_POSITION_INDEPENDENT_CODE ON)
-option (USE_RESIP_INTEGRATION "Use some resiprocate specific routines" OFF)
 
 set (SOURCES
     MT_Statistics.cpp
@@ -23,6 +26,8 @@ set (SOURCES
     MT_AudioReceiver.cpp
     MT_AudioCodec.cpp
     MT_CngHelper.cpp
+    MT_AmrCodec.cpp
+    MT_EvsCodec.cpp
 
     MT_Statistics.h
     MT_WebRtc.h
@@ -38,48 +43,48 @@ set (SOURCES
     MT_AudioReceiver.h
     MT_AudioCodec.h
     MT_CngHelper.h
+    MT_AmrCodec.h
+    MT_EvsCodec.h
     )
 
+add_library(media_lib ${SOURCES})
+set (LIBS_CODEC)
+
 if (USE_AMR_CODEC)
+    include (${LIB_PLATFORM}/platform_libs.cmake)
     message("Media: AMR NB and WB codecs will be included.")
-    add_definitions(-DUSE_AMR_CODEC)
-    set (SOURCES ${SOURCES} MT_AmrCodec.cpp MT_AmrCodec.h)
-    set (LIBS_CODEC)
+    target_compile_definitions(media_lib PUBLIC USE_AMR_CODEC)
+    list (APPEND LIBS_CODEC ${OPENCORE_AMRNB} ${OPENCORE_AMRWB})
 endif()
 
 if (USE_EVS_CODEC)
     message("Media: EVS codec will be included.")
-    add_definitions (-DUSE_EVS_CODEC)
-    set (SOURCES ${SOURCES} MT_EvsCodec.cpp MT_EvsCodec.h)
-    set (LIBS_CODEC evs_codec)
+    target_compile_definitions (media_lib PUBLIC USE_EVS_CODEC)
+    list (APPEND LIBS_CODEC evs_codec)
 endif()
 
 if (USE_OPUS_CODEC)
     message("Media: Opus codec will be included.")
-    add_definitions(-DUSE_OPUS_CODEC)
+    target_compile_definitions(media_lib PUBLIC USE_OPUS_CODEC)
+    list (APPEND LIBS_CODEC opus)
 endif()
 
-
-if(CMAKE_SYSTEM MATCHES "Linux*")
-    add_definitions(-DHAVE_NETINET_IN_H)
+if(CMAKE_SYSTEM MATCHES "Linux*" OR CMAKE_SYSTEM MATCHES "Darwin*")
+    target_compile_definitions(media_lib PUBLIC HAVE_NETINET_IN_H)
 endif()
 
-if(CMAKE_SYSTEM MATCHES "Darwin*")
-    # OS X Specific flags
-    add_definitions(-DHAVE_NETINET_IN_H)
-endif()
 
 if (CMAKE_SYSTEM MATCHES "Windows*")
     # Windows Specific flags - MSVC expected
-    add_definitions(
-        -D_CRT_SECURE_NO_WARNINGS
-        -DHAVE_WINSOCK2_H
-        -D_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS
-        -DUNICODE
-        -D_UNICODE )
+    target_compile_definitions(media_lib PRIVATE
+        _CRT_SECURE_NO_WARNINGS
+        HAVE_WINSOCK2_H
+        _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS
+        UNICODE
+        _UNICODE )
 endif()
 
-add_library(media_lib ${SOURCES})
+
 
 # Dependency on ice_stack - Linux build requires it
 # Codec libraries as well
@@ -94,9 +99,9 @@ target_include_directories(media_lib
             ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/srtp/include
             ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/srtp/crypto/include
             ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/webrtc
-            ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/opus/include/
             ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/resiprocate/
-            ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/libevs/
+            ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/libevs
+            ${LIB_PLATFORM}/opus/include
             )
 
 target_include_directories(media_lib
@@ -107,8 +112,4 @@ target_include_directories(media_lib
             ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/libevs/basic_math
 )
 
-if (USE_RESIP_INTEGRATION)
-    message("USE_RESIP_INTEGRATION is turned on!")
-    target_compile_definitions(media_lib PUBLIC -DUSE_RESIP_INTEGRATION)
-endif()
 

src/engine/media/MT_AmrCodec.cpp

@@ -5,85 +5,30 @@
 #include "../helper/HL_ByteBuffer.h"
 #include "../helper/HL_Log.h"
 #include "../helper/HL_IuUP.h"
+#include "../helper/HL_Exception.h"
+
+#include <iostream>
 
 #define LOG_SUBSYSTEM "AmrCodec"
 using namespace MT;
 
 
-static const uint8_t amr_block_size[16]={ 13, 14, 16, 18, 20, 21, 27, 32,
-                                          6 , 0 , 0 , 0 , 0 , 0 , 0 , 1  };
+// Constant of AMR-NB frame lengths in bytes.
+const uint8_t amrnb_framelen[9] =
+    {12,  13,  15,  17,  19,  20,  26,  31,  5};
 
-
-/**
- * Constant of AMR-NB frame lengths in bytes.
- */
-const uint8_t amrnb_framelen[16] =
-{12, 13, 15, 17, 19, 20, 26, 31, 5, 0, 0, 0, 0, 0, 0, 0};
-
-/**
- * Constant of AMR-NB frame lengths in bits.
- */
 const uint16_t amrnb_framelenbits[9] =
-{95, 103, 118, 134, 148, 159, 204, 244, 39};
+    {95, 103, 118, 134, 148, 159, 204, 244, 39};
 
-/**
- * Constant of AMR-NB bitrates.
- */
-const uint16_t amrnb_bitrates[8] =
-{4750, 5150, 5900, 6700, 7400, 7950, 10200, 12200};
 
-/**
- * Constant of AMR-WB frame lengths in bytes.
- */
-const uint8_t  amrwb_framelen[16] =
-{17, 23, 32, 37, 40, 46, 50, 58, 60, 5, 0, 0, 0, 0, 0, 0};
-
-/**
- * Constant of AMR-WB frame lengths in bits.
- */
+// Constant of AMR-WB frame lengths in bytes.
+const uint8_t  amrwb_framelen[10] =
+    {17,   23,  32,  37,  40,  46,  50,  58,  60,  5 /* SID packet */};
 const uint16_t amrwb_framelenbits[10] =
-{132, 177, 253, 285, 317, 365, 397, 461, 477, 40};
-
-/**
- * Constant of AMR-WB bitrates.
- */
-const uint16_t amrwb_bitrates[9] =
-{6600, 8850, 12650, 14250, 15850, 18250, 19850, 23050, 23850};
-
+    {132, 177, 253, 285, 317, 365, 397, 461, 477, 40 /* SID packet */};
 
 // Helper routines
 
-/*static int8_t bitrateToMode(uint16_t bitrate)
-{
-  int8_t mode = -1;
-
-  switch (bitrate)
-  {
-  // AMR NB
-  case 4750:    mode = 0; break;
-  case 5150:    mode = 1; break;
-  case 5900:    mode = 2; break;
-  case 6700:    mode = 3; break;
-  case 7400:    mode = 4; break;
-  case 7950:    mode = 5; break;
-  case 10200:   mode = 6; break;
-  case 12200:   mode = 7; break;
-
-  // AMRWB
-  case 6600:    mode = 0; break;
-  case 8850:    mode = 1; break;
-  case 12650:   mode = 2; break;
-  case 14250:   mode = 3; break;
-  case 15850:   mode = 4; break;
-  case 18250:   mode = 5; break;
-  case 19850:   mode = 6; break;
-  case 23050:   mode = 7; break;
-  case 23850:   mode = 8; break;
-  }
-
-  return mode;
-}*/
-
 struct AmrPayloadInfo
 {
     const uint8_t*  mPayload;
@@ -119,12 +64,13 @@ struct AmrPayload
 static AmrPayload parseAmrPayload(AmrPayloadInfo& input)
 {
     AmrPayload result;
+
     // Do not skip packet by default; I suppose packet is good enough by default.
     result.mDiscardPacket = false;
 
     // Wrap incoming data with ByteArray to make bit dequeuing easy
-    ByteBuffer dataIn(input.mPayload, static_cast<size_t>(input.mPayloadLength));
-    BitReader br(input.mPayload, static_cast<size_t>(input.mPayloadLength));
+    ByteBuffer byte_reader(input.mPayload, static_cast<size_t>(input.mPayloadLength));
+    BitReader  bit_reader (input.mPayload, static_cast<size_t>(input.mPayloadLength));
 
     // In bandwidth-efficient mode, the payload header simply consists of a
     //   4-bit codec mode request:
@@ -135,16 +81,15 @@ static AmrPayload parseAmrPayload(AmrPayloadInfo& input)
     //      AMR, as defined in Table 1a in [2], or 0-8 for AMR-WB, as defined
     //      in Table 1a in [4].  CMR value 15 indicates that no mode request
     //      is present, and other values are for future use.
-    result.mCodeModeRequest = static_cast<uint8_t>(br.readBits(4));
-    //ICELogMedia(<< "CMR: " << result.mCodeModeRequest);
+    result.mCodeModeRequest = static_cast<uint8_t>(bit_reader.readBits(4));
 
     // Consume extra 4 bits for octet aligned profile
     if (input.mOctetAligned)
-        br.readBits(4);
+        bit_reader.readBits(4);
 
     // Skip interleaving flags for now for octet aligned mode
     if (input.mInterleaving && input.mOctetAligned)
-        br.readBits(8);
+        bit_reader.readBits(8);
 
     // Silence codec mode constant (it differs for wideband and narrowband codecs)
     uint8_t SID_FT = input.mWideband ? 9 : 8;
@@ -158,105 +103,121 @@ static AmrPayload parseAmrPayload(AmrPayloadInfo& input)
         //    F (1 bit): If set to 1, indicates that this frame is followed by
         // another speech frame in this payload; if set to 0, indicates that
         // this frame is the last frame in this payload.
-        F = br.readBit();
+        F = bit_reader.readBit();
 
         //    FT (4 bits): Frame type index, indicating either the AMR or AMR-WB
         // speech coding mode or comfort noise (SID) mode of the
         // corresponding frame carried in this payload.
-        FT = static_cast<uint8_t>(br.readBits(4));
+        FT = static_cast<uint8_t>(bit_reader.readBits(4));
 
         //   Q (1 bit): Frame quality indicator.  If set to 0, indicates the
         // corresponding frame is severely damaged, and the receiver should
         // set the RX_TYPE (see [6]) to either SPEECH_BAD or SID_BAD
         // depending on the frame type (FT).
-        Q = br.readBit();
+        Q = bit_reader.readBit();
+
+        // Handle padding for octet alignment
+        if (input.mOctetAligned)
+            bit_reader.readBits(2);
+
+        AmrFrame frame;
+        frame.mFrameType = FT;
+        frame.mSTI = 0;
+        frame.mMode = FT < SID_FT ? FT : 0xFF;
+        frame.mGoodQuality = Q == 1;
+        frame.mTimestamp = input.mCurrentTimestamp;
+        result.mFrames.push_back(frame);
+        input.mCurrentTimestamp += input.mWideband ? 320 : 160;
+    }
+    while (F != 0);
+
+    for (size_t frameIndex=0; frameIndex < result.mFrames.size() && !result.mDiscardPacket; frameIndex++)
+    {
+        AmrFrame& f = result.mFrames[frameIndex];
 
         // If receiving a ToC entry with a FT value in the range 9-14 for AMR or
         //   10-13 for AMR-WB, the whole packet SHOULD be discarded.  This is to
         //   avoid the loss of data synchronization in the depacketization
         //   process, which can result in a huge degradation in speech quality.
-        if ((input.mWideband && (FT >= 10 && FT <= 13)) ||
-            (!input.mWideband && (FT >= 9 && FT <= 14)))
+        bool discard = input.mWideband ? (f.mFrameType >= 10 && f.mFrameType <= 13) : (f.mFrameType >= 9 && f.mFrameType <= 14);
+        // discard |= input.mWideband ? f.mFrameType >= 14 : f.mFrameType >= 15;
+        if (discard)
         {
-            ICELogMedia(<< "Discard corrupted packet");
-            // Discard bad packet
             result.mDiscardPacket = true;
-            return result;
+            continue;
         }
 
-        // Handle padding for octet alignment
-        if (input.mOctetAligned)
-            br.readBits(2);
+        if (input.mWideband && f.mFrameType == 15)
+        {
+            // DTX, no sense to decode the data
+            continue;
+        }
 
-        AmrFrame frame;
-        frame.mFrameType = FT;
+        if (input.mWideband && f.mFrameType == 14)
+        {
+            // Speech lost code only
+            continue;
+        }
 
-        frame.mMode = FT < SID_FT ? FT : 0xFF;
-        frame.mGoodQuality = Q == 1;
-        frame.mTimestamp = input.mCurrentTimestamp;
+        if (!f.mGoodQuality)
+        {
+            // Bad quality, frame is damaged
+            continue;
+        }
 
-        result.mFrames.push_back(frame);
-
-        input.mCurrentTimestamp += input.mWideband ? 320 : 160;
-    }
-    while (F != 0);
-
-    for (size_t frameIndex=0; frameIndex < result.mFrames.size(); frameIndex++)
-    {
-        AmrFrame& frame = result.mFrames[frameIndex];
-        size_t bitsLength = input.mWideband ? amrwb_framelenbits[frame.mFrameType] : amrnb_framelenbits[frame.mFrameType];
-        size_t byteLength = input.mWideband ? amrwb_framelen[frame.mFrameType] : amrnb_framelen[frame.mFrameType];
-        ICELogMedia(<< "New AMR speech frame: frame type = " << FT <<
-                    ", mode = " << frame.mMode <<
-                    ", timestamp = " << static_cast<int>(frame.mTimestamp) <<
-                    ", bits length = " << static_cast<int>(bitsLength) <<
-                    ", byte length =" << static_cast<int>(byteLength) <<
-                    ", remaining packet length = " << static_cast<int>(dataIn.size()));
+        size_t bitsLength = input.mWideband ? amrwb_framelenbits[f.mFrameType] : amrnb_framelenbits[f.mFrameType];
+        size_t byteLength = input.mWideband ? amrwb_framelen[f.mFrameType] : amrnb_framelen[f.mFrameType];
 
         if (bitsLength > 0)
         {
             if (input.mOctetAligned)
             {
-                if (dataIn.size() < byteLength)
-                    frame.mGoodQuality = false;
+                if (byte_reader.size() < byteLength)
+                    f.mGoodQuality = false;
                 else
                 {
                     // It is octet aligned scheme, so we are on byte boundary now
-                    size_t byteOffset = br.count() / 8;
+                    size_t byteOffset = bit_reader.position() / 8;
 
                     // Copy data of AMR frame
-                    frame.mData = std::make_shared<ByteBuffer>(input.mPayload + byteOffset, byteLength);
+                    if (byteOffset + byteLength <= input.mPayloadLength)
+                    {
+                        f.mData = std::make_shared<ByteBuffer>();
+                        f.mData->resize(byteLength + 1); // payload + header
+                        memcpy(f.mData->mutableData() + 1, input.mPayload + byteOffset, byteLength);
+
+                        // Add header for decoder
+                        f.mData->mutableData()[0] = (f.mFrameType << 3) | (1 << 2);
+                    }
+                    else
+                    {
+                        ICELogError(<< "Problem parsing AMR header: octet-aligned is set, available " << int(input.mPayloadLength - byteOffset)
+                                    << " bytes but requested " << (int)byteLength);
+                        result.mDiscardPacket = true;
+                        continue;
+                    }
                 }
             }
             else
             {
                 // Allocate place for copying
-                frame.mData = std::make_shared<ByteBuffer>();
-                frame.mData->resize(bitsLength / 8 + ((bitsLength % 8) ? 1 : 0) + 1);
+                f.mData = std::make_shared<ByteBuffer>();
+                f.mData->resize(bitsLength / 8 + ((bitsLength % 8) ? 1 : 0) + 1);
 
                 // Add header for decoder
-                frame.mData->mutableData()[0] = (frame.mFrameType << 3) | (1 << 2);
+                f.mData->mutableData()[0] = (f.mFrameType << 3) | (1 << 2);
 
                 // Read bits
-                if (br.readBits(frame.mData->mutableData() + 1, bitsLength /*+ bitsLength*/ ) < (size_t)bitsLength)
-                    frame.mGoodQuality = false;
+                if (bit_reader.readBits(f.mData->mutableData() + 1, bitsLength /*+ bitsLength*/ ) < (size_t)bitsLength)
+                    f.mGoodQuality = false;
             }
         }
     }
+
     // Padding bits are skipped
-
-    /*if (br.count() / 8 != br.position() / 8 &&
-            br.count() / 8 != br.position() / 8 + 1)
-        throw std::runtime_error("Failed to parse AMR frame");*/
-
     return result;
 }
 
-/*static void predecodeAmrFrame(AmrFrame& frame, ByteBuffer& data)
-{
-  // Data are already moved into
-}*/
-
 AmrNbCodec::CodecFactory::CodecFactory(const AmrCodecConfig& config)
     :mConfig(config)
 {
@@ -278,12 +239,9 @@ int AmrNbCodec::CodecFactory::payloadType()
     return mConfig.mPayloadType;
 }
 
-#ifdef USE_RESIP_INTEGRATION
 
 void AmrNbCodec::CodecFactory::updateSdp(resip::SdpContents::Session::Medium::CodecContainer& codecs, SdpDirection direction)
-{
-
-}
+{}
 
 int AmrNbCodec::CodecFactory::processSdp(const resip::SdpContents::Session::Medium::CodecContainer& codecs, SdpDirection direction)
 {
@@ -295,7 +253,6 @@ void AmrNbCodec::CodecFactory::create(CodecMap& codecs)
     codecs[payloadType()] = std::shared_ptr<Codec>(new AmrNbCodec(mConfig));
 }
 
-#endif
 PCodec AmrNbCodec::CodecFactory::create()
 {
     return PCodec(new AmrNbCodec(mConfig));
@@ -378,6 +335,9 @@ int AmrNbCodec::encode(const void* input, int inputBytes, void* output, int outp
 #define AMR_BITRATE_DTX 15
 int AmrNbCodec::decode(const void* input, int inputBytes, void* output, int outputCapacity)
 {
+    if (mConfig.mOctetAligned)
+        return 0;
+
     if (mConfig.mIuUP)
     {
         // Try to parse IuUP frame
@@ -485,7 +445,7 @@ int AmrNbCodec::plc(int lostFrames, void* output, int outputCapacity)
 
     for (int i=0; i < lostFrames; i++)
     {
-        unsigned char buffer[32];
+        uint8_t buffer[32];
         buffer[0] = (AMR_BITRATE_DTX << 3)|4;
         Decoder_Interface_Decode(mDecoderCtx, buffer, dataOut, 0); // Handle missing data
         dataOut += L_FRAME;
@@ -519,12 +479,8 @@ int AmrWbCodec::CodecFactory::payloadType()
     return mConfig.mPayloadType;
 }
 
-#ifdef USE_RESIP_INTEGRATION
-
 void AmrWbCodec::CodecFactory::updateSdp(resip::SdpContents::Session::Medium::CodecContainer& codecs, SdpDirection direction)
-{
-
-}
+{}
 
 int AmrWbCodec::CodecFactory::processSdp(const resip::SdpContents::Session::Medium::CodecContainer& codecs, SdpDirection direction)
 {
@@ -536,19 +492,17 @@ void AmrWbCodec::CodecFactory::create(CodecMap& codecs)
     codecs[payloadType()] = std::shared_ptr<Codec>(new AmrWbCodec(mConfig));
 }
 
-#endif
-
 PCodec AmrWbCodec::CodecFactory::create()
 {
     return PCodec(new AmrWbCodec(mConfig));
 }
 
+AmrWbStatistics MT::GAmrWbStatistics;
 
 AmrWbCodec::AmrWbCodec(const AmrCodecConfig& config)
     :mEncoderCtx(nullptr), mDecoderCtx(nullptr), mConfig(config),
       mSwitchCounter(0), mPreviousPacketLength(0)
 {
-    //mEncoderCtx = E_IF_init();
     mDecoderCtx = D_IF_init();
     mCurrentDecoderTimestamp = 0;
 }
@@ -595,110 +549,104 @@ int AmrWbCodec::samplerate()
 
 int AmrWbCodec::encode(const void* input, int inputBytes, void* output, int outputCapacity)
 {
-    if (inputBytes % pcmLength())
-        return 0;
-
-    // Declare the data input pointer
-    const short *dataIn = (const short *)input;
-
-    // Declare the data output pointer
-    unsigned char *dataOut = (unsigned char *)output;
-
-    // Find how much RTP frames will be generated
-    unsigned int frames = inputBytes / pcmLength();
-
-    // Generate frames
-    for (unsigned int i = 0; i < frames; i++)
-    {
-        //  dataOut += Encoder_Interface_Encode(mEncoderCtx, Mode::MRDTX, dataIn, dataOut, 1);
-        //  dataIn += pcmLength() / 2;
-    }
-
-    return frames * rtpLength();
+    throw Exception(ERR_NOT_IMPLEMENTED);
 }
 
 #define L_FRAME 160
 #define AMR_BITRATE_DTX 15
+
+int AmrWbCodec::decodeIuup(std::span<const uint8_t> input, std::span<uint8_t> output)
+{
+    IuUP::Frame frame;
+    if (!IuUP::parse2(input.data(), input.size(), frame))
+        return 0;
+
+    if (!frame.mHeaderCrcOk || !frame.mPayloadCrcOk)
+    {
+        ICELogInfo(<< "CRC check failed.");
+        return 0;
+    }
+
+    // Reserve space
+    ByteBuffer dataToDecode;
+    dataToDecode.resize(1 + frame.mPayloadSize);
+
+    // Copy AMR data
+    memmove(dataToDecode.mutableData() + 1, frame.mPayload, frame.mPayloadSize);
+    uint8_t frameType = 0xFF;
+    for (uint8_t ftIndex = 0; ftIndex <= 9 && frameType == 0xFF; ftIndex++)
+        if (amrwb_framelen[ftIndex] == frame.mPayloadSize)
+            frameType = ftIndex;
+
+    if (frameType == 0xFF)
+        return 0;
+
+    dataToDecode.mutableData()[0] = (frameType << 3) | (1 << 2);
+
+    D_IF_decode(mDecoderCtx, (const unsigned char*)dataToDecode.data(), (short*)output.data(), 0);
+    return pcmLength();
+}
+
+int AmrWbCodec::decodePlain(std::span<const uint8_t> input, std::span<uint8_t> output)
+{
+    AmrPayloadInfo info;
+    info.mCurrentTimestamp = mCurrentDecoderTimestamp;
+    info.mOctetAligned = mConfig.mOctetAligned;
+    info.mPayload = input.data();
+    info.mPayloadLength = input.size();
+    info.mWideband = true;
+    info.mInterleaving = false;
+
+    AmrPayload ap;
+    try
+    {
+        ap = parseAmrPayload(info);
+    }
+    catch(...)
+    {
+        GAmrWbStatistics.mNonParsed++;
+        ICELogDebug(<< "Failed to decode AMR payload");
+        return 0;
+    }
+    // Save current timestamp
+    mCurrentDecoderTimestamp = info.mCurrentTimestamp;
+
+    // Check if packet is corrupted
+    if (ap.mDiscardPacket)
+    {
+        GAmrWbStatistics.mDiscarded++;
+        return 0;
+    }
+
+    // Check for output buffer capacity
+    if (output.size() < (int)ap.mFrames.size() * pcmLength())
+        return 0;
+
+    short* dataOut = (short*)output.data();
+    size_t dataOutSizeInBytes = 0;
+    for (AmrFrame& frame: ap.mFrames)
+    {
+        memset(dataOut, 0, static_cast<size_t>(pcmLength()));
+
+        if (frame.mData)
+        {
+            D_IF_decode(mDecoderCtx, (const unsigned char*)frame.mData->data(), (short*)dataOut, 0);
+            dataOut += pcmLength() / 2;
+            dataOutSizeInBytes += pcmLength();
+        }
+    }
+    return dataOutSizeInBytes;
+}
+
 int AmrWbCodec::decode(const void* input, int inputBytes, void* output, int outputCapacity)
 {
+    auto inputBuffer = std::span<const uint8_t>((uint8_t*)input, (size_t)inputBytes);
+    auto outputBuffer = std::span<uint8_t>((uint8_t*)output, (size_t)outputCapacity);
+
     if (mConfig.mIuUP)
-    {
-        IuUP::Frame frame;
-        if (!IuUP::parse2((const uint8_t*)input, inputBytes, frame))
-            return 0;
-
-        if (!frame.mHeaderCrcOk || !frame.mPayloadCrcOk)
-        {
-            ICELogInfo(<< "CRC check failed.");
-            return 0;
-        }
-
-        // Build first byte to help decoder
-        //ICELogDebug(<< "Decoding AMR frame length = " << frame.mPayloadSize);
-
-        // Reserve space
-        ByteBuffer dataToDecode;
-        dataToDecode.resize(1 + frame.mPayloadSize);
-
-        // Copy AMR data
-        memmove(dataToDecode.mutableData() + 1, frame.mPayload, frame.mPayloadSize);
-        uint8_t frameType = 0xFF;
-        for (uint8_t ftIndex = 0; ftIndex <= 9 && frameType == 0xFF; ftIndex++)
-            if (amrwb_framelen[ftIndex] == frame.mPayloadSize)
-                frameType = ftIndex;
-
-        if (frameType == 0xFF)
-            return 0;
-
-        dataToDecode.mutableData()[0] = (frameType << 3) | (1 << 2);
-
-        D_IF_decode(mDecoderCtx, (const unsigned char*)dataToDecode.data(), (short*)output, 0);
-        return pcmLength();
-    }
+        return decodeIuup(inputBuffer, outputBuffer);
     else
-    {
-        AmrPayloadInfo info;
-        info.mCurrentTimestamp = mCurrentDecoderTimestamp;
-        info.mOctetAligned = mConfig.mOctetAligned;
-        info.mPayload = (const uint8_t*)input;
-        info.mPayloadLength = inputBytes;
-        info.mWideband = true;
-        info.mInterleaving = false;
-
-        AmrPayload ap;
-        try
-        {
-            ap = parseAmrPayload(info);
-        }
-        catch(...)
-        {
-            ICELogDebug(<< "Failed to decode AMR payload");
-            return 0;
-        }
-        // Save current timestamp
-        mCurrentDecoderTimestamp = info.mCurrentTimestamp;
-
-        // Check if packet is corrupted
-        if (ap.mDiscardPacket)
-            return 0;
-
-        // Check for output buffer capacity
-        if (outputCapacity < (int)ap.mFrames.size() * pcmLength())
-            return 0;
-
-        short* dataOut = (short*)output;
-        for (AmrFrame& frame: ap.mFrames)
-        {
-            memset(dataOut, 0, static_cast<size_t>(pcmLength()));
-
-            if (frame.mData)
-            {
-                D_IF_decode(mDecoderCtx, (const unsigned char*)frame.mData->data(), (short*)dataOut, 0);
-                dataOut += pcmLength() / 2;
-            }
-        }
-        return pcmLength() * ap.mFrames.size();
-    }
+        return decodePlain(inputBuffer, outputBuffer);
 
     return 0;
 }
@@ -750,8 +698,6 @@ int GsmEfrCodec::GsmEfrFactory::payloadType()
     return mPayloadType;
 }
 
-#ifdef USE_RESIP_INTEGRATION
-
 void GsmEfrCodec::GsmEfrFactory::updateSdp(resip::SdpContents::Session::Medium::CodecContainer& codecs, SdpDirection direction)
 {
 
@@ -767,8 +713,6 @@ void GsmEfrCodec::GsmEfrFactory::create(CodecMap& codecs)
     codecs[payloadType()] = std::shared_ptr<Codec>(new GsmEfrCodec(mIuUP));
 }
 
-#endif
-
 PCodec GsmEfrCodec::GsmEfrFactory::create()
 {
     return PCodec(new GsmEfrCodec(mIuUP));

src/engine/media/MT_AmrCodec.h

@@ -1,8 +1,10 @@
 #ifndef MT_AMRCODEC_H
 #define MT_AMRCODEC_H
 
-#include "../config.h"
+#include "../engine_config.h"
 #include <map>
+#include <span>
+
 #include "MT_Codec.h"
 #include "../helper/HL_Pointer.h"
 
@@ -14,16 +16,16 @@
 
 namespace MT
 {
-  struct AmrCodecConfig
-  {
-    bool mIuUP;
-    bool mOctetAligned;
-    int mPayloadType;
-  };
+struct AmrCodecConfig
+{
+    bool    mIuUP = false;
+    bool    mOctetAligned = false;
+    int     mPayloadType = -1;
+};
 
-  class AmrNbCodec : public Codec
-  {
-  protected:
+class AmrNbCodec : public Codec
+{
+protected:
     void* mEncoderCtx;
     void* mDecoderCtx;
     AmrCodecConfig mConfig;
@@ -31,25 +33,24 @@ namespace MT
     int mSwitchCounter;
     int mPreviousPacketLength;
 
-  public:
+public:
     class CodecFactory: public Factory
     {
     public:
-      CodecFactory(const AmrCodecConfig& config);
+        CodecFactory(const AmrCodecConfig& config);
 
-      const char* name() override;
-      int samplerate() override;
-      int payloadType() override;
+        const char* name() override;
+        int samplerate() override;
+        int payloadType() override;
 
-#ifdef USE_RESIP_INTEGRATION
-      void updateSdp(resip::SdpContents::Session::Medium::CodecContainer& codecs, SdpDirection direction) override;
-      int processSdp(const resip::SdpContents::Session::Medium::CodecContainer& codecs, SdpDirection direction) override;
-      void create(CodecMap& codecs) override;
-#endif
-      PCodec create() override;
+        void updateSdp(resip::SdpContents::Session::Medium::CodecContainer& codecs, SdpDirection direction) override;
+        int processSdp(const resip::SdpContents::Session::Medium::CodecContainer& codecs, SdpDirection direction) override;
+        void create(CodecMap& codecs) override;
+
+        PCodec create() override;
 
     protected:
-      AmrCodecConfig mConfig;
+        AmrCodecConfig mConfig;
     };
 
     AmrNbCodec(const AmrCodecConfig& config);
@@ -64,11 +65,18 @@ namespace MT
     int decode(const void* input, int inputBytes, void* output, int outputCapacity) override;
     int plc(int lostFrames, void* output, int outputCapacity) override;
     int getSwitchCounter() const;
-  };
+};
 
-  class AmrWbCodec : public Codec
-  {
-  protected:
+struct AmrWbStatistics
+{
+    int mDiscarded = 0;
+    int mNonParsed = 0;
+};
+extern AmrWbStatistics GAmrWbStatistics;
+
+class AmrWbCodec : public Codec
+{
+protected:
     void* mEncoderCtx;
     void* mDecoderCtx;
     AmrCodecConfig mConfig;
@@ -76,25 +84,27 @@ namespace MT
     int mSwitchCounter;
     int mPreviousPacketLength;
 
-  public:
+    int decodeIuup(std::span<const uint8_t> input, std::span<uint8_t> output);
+    int decodePlain(std::span<const uint8_t> input, std::span<uint8_t> output);
+
+public:
     class CodecFactory: public Factory
     {
     public:
-      CodecFactory(const AmrCodecConfig& config);
+        CodecFactory(const AmrCodecConfig& config);
 
-      const char* name() override;
-      int samplerate() override;
-      int payloadType() override;
+        const char* name() override;
+        int samplerate() override;
+        int payloadType() override;
 
-#ifdef USE_RESIP_INTEGRATION
-      void updateSdp(resip::SdpContents::Session::Medium::CodecContainer& codecs, SdpDirection direction) override;
-      int processSdp(const resip::SdpContents::Session::Medium::CodecContainer& codecs, SdpDirection direction) override;
-      void create(CodecMap& codecs) override;
-#endif
-      PCodec create() override;
+        void updateSdp(resip::SdpContents::Session::Medium::CodecContainer& codecs, SdpDirection direction) override;
+        int processSdp(const resip::SdpContents::Session::Medium::CodecContainer& codecs, SdpDirection direction) override;
+        void create(CodecMap& codecs) override;
+
+        PCodec create() override;
 
     protected:
-      AmrCodecConfig mConfig;
+        AmrCodecConfig mConfig;
     };
 
     AmrWbCodec(const AmrCodecConfig& config);
@@ -109,35 +119,34 @@ namespace MT
     int decode(const void* input, int inputBytes, void* output, int outputCapacity) override;
     int plc(int lostFrames, void* output, int outputCapacity) override;
     int getSwitchCounter() const;
-  };
+};
 
-  class GsmEfrCodec : public Codec
-  {
-  protected:
+class GsmEfrCodec : public Codec
+{
+protected:
     void* mEncoderCtx;
     void* mDecoderCtx;
     bool mIuUP;
 
-  public:
+public:
     class GsmEfrFactory: public Factory
     {
     public:
-      GsmEfrFactory(bool iuup, int ptype);
+        GsmEfrFactory(bool iuup, int ptype);
 
-      const char* name() override;
-      int samplerate() override;
-      int payloadType() override;
+        const char* name() override;
+        int samplerate() override;
+        int payloadType() override;
 
-#ifdef USE_RESIP_INTEGRATION
-      void updateSdp(resip::SdpContents::Session::Medium::CodecContainer& codecs, SdpDirection direction) override;
-      int processSdp(const resip::SdpContents::Session::Medium::CodecContainer& codecs, SdpDirection direction) override;
-      void create(CodecMap& codecs) override;
-#endif
-      PCodec create() override;
+        void updateSdp(resip::SdpContents::Session::Medium::CodecContainer& codecs, SdpDirection direction) override;
+        int processSdp(const resip::SdpContents::Session::Medium::CodecContainer& codecs, SdpDirection direction) override;
+        void create(CodecMap& codecs) override;
+
+        PCodec create() override;
 
     protected:
-      bool mIuUP;
-      int mPayloadType;
+        bool mIuUP;
+        int mPayloadType;
     };
 
     GsmEfrCodec(bool iuup = false);
@@ -151,7 +160,7 @@ namespace MT
     int encode(const void* input, int inputBytes, void* output, int outputCapacity) override;
     int decode(const void* input, int inputBytes, void* output, int outputCapacity) override;
     int plc(int lostFrames, void* output, int outputCapacity) override;
-  };
+};
 
 } // End of MT namespace
 

src/engine/media/MT_AudioCodec.h

@@ -6,7 +6,7 @@
 #ifndef __AUDIO_CODEC_H
 #define __AUDIO_CODEC_H
 
-#include "../config.h"
+#include "../engine_config.h"
 #include <map>
 #include "MT_Codec.h"
 #include "../audio/Audio_Resampler.h"
@@ -46,10 +46,9 @@ public:
         int samplerate() override;
         int payloadType() override;
 
-#if defined(USE_RESIP_INTEGRATION)
         void updateSdp(resip::SdpContents::Session::Medium::CodecContainer& codecs, SdpDirection direction) override;
         int processSdp(const resip::SdpContents::Session::Medium::CodecContainer& codecs, SdpDirection direction) override;
-#endif
+
         PCodec create() override;
     };
     G729Codec();
@@ -73,7 +72,8 @@ protected:
     OpusEncoder        *mEncoderCtx;
     OpusDecoder        *mDecoderCtx;
     int mPTime, mSamplerate, mChannels;
-    Audio::SpeexResampler mDecodeResampler;
+    // Audio::SpeexResampler mDecodeResampler;
+    int mDecoderChannels;
 public:
     struct Params
     {
@@ -81,10 +81,8 @@ public:
         int mPtime, mTargetBitrate, mExpectedPacketLoss;
 
         Params();
-#if defined(USE_RESIP_INTEGRATION)
         resip::Data toString() const;
         void parse(const resip::Data& params);
-#endif
     };
 
     class OpusFactory: public Factory
@@ -102,10 +100,8 @@ public:
         int channels() override;
         int samplerate() override;
         int payloadType() override;
-#if defined(USE_RESIP_INTEGRATION)
         void updateSdp(resip::SdpContents::Session::Medium::CodecContainer& codecs, SdpDirection direction) override;
         int processSdp(const resip::SdpContents::Session::Medium::CodecContainer& codecs, SdpDirection direction) override;
-#endif
         PCodec create() override;
     };
 
@@ -145,11 +141,9 @@ public:
         const char* name();
         int samplerate();
         int payloadType();
-#if defined(USE_RESIP_INTEGRATION)
         void updateSdp(resip::SdpContents::Session::Medium::CodecContainer& codecs, SdpDirection direction);
         int processSdp(const resip::SdpContents::Session::Medium::CodecContainer& codecs, SdpDirection direction);
         void create(CodecMap& codecs);
-#endif
         PCodec create();
     };
 

src/engine/media/MT_AudioReceiver.cpp

@@ -3,9 +3,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#define NOMINMAX
+#if defined(TARGET_WIN) && !defined(NOMINMAX)
+#  define NOMINMAX
+#endif
 
-#include "../config.h"
+#include "../engine_config.h"
 #include "MT_AudioReceiver.h"
 #include "MT_AudioCodec.h"
 #include "MT_CngHelper.h"
@@ -14,6 +16,7 @@
 #include "../audio/Audio_Interface.h"
 #include "../audio/Audio_Resampler.h"
 #include <cmath>
+#include <iostream>
 
 #if !defined(TARGET_ANDROID) && !defined(TARGET_OPENWRT) && !defined(TARGET_WIN) && !defined(TARGET_RPI) && defined(USE_AMR_CODEC)
 # include "MT_AmrCodec.h"
@@ -62,6 +65,8 @@ std::vector<short>& RtpBuffer::Packet::pcm()
 RtpBuffer::RtpBuffer(Statistics& stat)
     :mStat(stat)
 {
+    if (mStat.mPacketLoss)
+        std::cout << "Warning: packet loss is not zero" << std::endl;
 }
 
 RtpBuffer::~RtpBuffer()
@@ -117,7 +122,6 @@ std::shared_ptr<RtpBuffer::Packet> RtpBuffer::add(std::shared_ptr<jrtplib::RTPPa
 
     Lock l(mGuard);
 
-
     // Update statistics
     if (mLastAddTime == 0.0)
         mLastAddTime = now_ms();
@@ -197,13 +201,14 @@ RtpBuffer::FetchResult RtpBuffer::fetch(ResultList& rl)
     // See if there is enough information in buffer
     int total = findTimelength();
 
-    while (total > mHigh && mPacketList.size())
+    while (total > mHigh && mPacketList.size() && 0 != mHigh)
     {
         ICELogMedia( << "Dropping RTP packets from jitter buffer");
         total -= mPacketList.front()->timelength();
 
         // Save it as last packet however - to not confuse loss packet counter
         mFetchedPacket = mPacketList.front();
+        mLastSeqno = mPacketList.front()->rtp()->GetExtendedSequenceNumber();
 
         // Erase from packet list
         mPacketList.erase(mPacketList.begin());
@@ -213,47 +218,48 @@ RtpBuffer::FetchResult RtpBuffer::fetch(ResultList& rl)
     }
 
     if (total < mLow)
+    {
+        // Still not prebuffered
         result = FetchResult::NoPacket;
+    }
     else
     {
+        // Did we fetch any packet before ?
         bool is_fetched_packet = mFetchedPacket.get() != nullptr;
         if (is_fetched_packet)
             is_fetched_packet &= mFetchedPacket->rtp().get() != nullptr;
 
-        if (is_fetched_packet)
+        if (mLastSeqno.has_value())
         {
             if (mPacketList.empty())
             {
                 result = FetchResult::NoPacket;
-                mStat.mPacketLoss++;
+                // Don't increase counter of lost packets here; maybe it is DTX
             }
             else
             {
                 // Current sequence number ?
-                unsigned seqno = mPacketList.front()->rtp()->GetExtendedSequenceNumber();
+                uint32_t seqno = mPacketList.front()->rtp()->GetExtendedSequenceNumber();
 
                 // Gap between new packet and previous on
-                int gap = (int64_t)seqno - (int64_t)mFetchedPacket->rtp()->GetExtendedSequenceNumber() - 1;
+                int gap = (int64_t)seqno - (int64_t)*mLastSeqno - 1;
                 gap = std::min(gap, 127);
-                if (gap > 0 && mPacketList.empty())
+                if (gap > 0)
                 {
+                    // std::cout << "Increase the packet loss for SSRC " << std::hex << mSsrc << std::endl;
+                    mStat.mPacketLoss++;
+                    //mStat.mLoss[gap]++;
+                    mLastSeqno = *mLastSeqno + 1;
                     result = FetchResult::Gap;
-                    mStat.mPacketLoss += gap;
-                    mStat.mLoss[gap]++;
                 }
                 else
                 {
-                    if (gap > 0)
-                    {
-                        mStat.mPacketLoss += gap;
-                        mStat.mLoss[gap]++;
-                    }
-
                     result = FetchResult::RegularPacket;
                     rl.push_back(mPacketList.front());
 
                     // Save last returned normal packet
                     mFetchedPacket = mPacketList.front();
+                    mLastSeqno = mPacketList.front()->rtp()->GetExtendedSequenceNumber();
 
                     // Remove returned packet from the list
                     mPacketList.erase(mPacketList.begin());
@@ -263,7 +269,7 @@ RtpBuffer::FetchResult RtpBuffer::fetch(ResultList& rl)
         else
         {
             // See if prebuffer limit is reached
-            if (findTimelength() >= mPrebuffer)
+            if (findTimelength() >= mPrebuffer && !mPacketList.empty())
             {
                 // Normal packet will be returned
                 result = FetchResult::RegularPacket;
@@ -273,6 +279,7 @@ RtpBuffer::FetchResult RtpBuffer::fetch(ResultList& rl)
 
                 // Remember returned packet
                 mFetchedPacket = mPacketList.front();
+                mLastSeqno = mPacketList.front()->rtp()->GetExtendedSequenceNumber();
 
                 // Remove returned packet from buffer list
                 mPacketList.erase(mPacketList.begin());
@@ -331,6 +338,7 @@ AudioReceiver::AudioReceiver(const CodecList::Settings& settings, MT::Statistics
     mResampler48.start(AUDIO_CHANNELS, 48000, AUDIO_SAMPLERATE);
 
     // Init codecs
+    mCodecList.setSettings(settings);
     mCodecList.fillCodecMap(mCodecMap);
 
 #if defined(DUMP_DECODED)
@@ -341,12 +349,6 @@ AudioReceiver::AudioReceiver(const CodecList::Settings& settings, MT::Statistics
 
 AudioReceiver::~AudioReceiver()
 {
-#if defined(USE_PVQA_LIBRARY) && defined(PVQA_IN_RECEIVER)
-    if (mPVQA && mPvqaBuffer)
-    {
-        mStat.mPvqaMos = calculatePvqaMos(AUDIO_SAMPLERATE, mStat.mPvqaReport);
-    }
-#endif
     mResampler8.stop();
     mResampler16.stop();
     mResampler32.stop();
@@ -361,11 +363,17 @@ void AudioReceiver::setCodecSettings(const CodecList::Settings& codecSettings)
         return;
 
     mCodecSettings = codecSettings;
-    mCodecMap.clear();
-    mCodecList.setSettings(mCodecSettings);
+    mCodecList.setSettings(mCodecSettings); // This builds factory list with proper payload types according to payload types in settings
+
+    // Rebuild codec map from factory list
     mCodecList.fillCodecMap(mCodecMap);
 }
 
+CodecList::Settings& AudioReceiver::getCodecSettings()
+{
+    return mCodecSettings;
+}
+
 size_t decode_packet(Codec& codec, RTPPacket& p, void* output_buffer, size_t output_capacity)
 {
     // How much data was produced
@@ -402,73 +410,86 @@ size_t decode_packet(Codec& codec, RTPPacket& p, void* output_buffer, size_t out
     return result;
 }
 
-bool AudioReceiver::add(const std::shared_ptr<jrtplib::RTPPacket>& p, Codec** codec)
+bool AudioReceiver::add(const std::shared_ptr<jrtplib::RTPPacket>& p, Codec** detectedCodec)
 {
+    // Estimate time length
+    int time_length = 0,
+        samplerate = 8000,
+        payloadLength = p->GetPayloadLength(),
+        ptype = p->GetPayloadType();
+
     // ICELogInfo(<< "Adding packet No " << p->GetSequenceNumber());
     // Increase codec counter
-    mStat.mCodecCount[p->GetPayloadType()]++;
+    mStat.mCodecCount[ptype]++;
 
     // Check if codec can be handled
-    CodecMap::iterator codecIter = mCodecMap.find(p->GetPayloadType());
+    Codec* codec = nullptr;
+    CodecMap::iterator codecIter = mCodecMap.find(ptype);
     if (codecIter == mCodecMap.end())
     {
-        ICELogMedia(<< "Cannot find codec in available codecs");
-        return false; // Reject packet with unknown payload type
+        time_length = 10;
     }
-
-    // Check if codec is created actually
-    if (!codecIter->second)
-    {
-        // Look for ptype
-        for (int codecIndex = 0; codecIndex < mCodecList.count(); codecIndex++)
-            if (mCodecList.codecAt(codecIndex).payloadType() == p->GetPayloadType())
-                codecIter->second = mCodecList.codecAt(codecIndex).create();
-    }
-
-    // Return pointer to codec if needed.get()
-    if (codec)
-        *codec = codecIter->second.get();
-
-    if (mStat.mCodecName.empty())
-        mStat.mCodecName = codecIter->second->name();
-
-    // Estimate time length
-    int time_length = 0, payloadLength = p->GetPayloadLength(), ptype = p->GetPayloadType();
-
-    if (!codecIter->second->rtpLength())
-        time_length = codecIter->second->frameTime();
     else
-        time_length = lround(double(payloadLength) / codecIter->second->rtpLength() * codecIter->second->frameTime());
+    {
+        // Check if codec is creating lazily
+        if (!codecIter->second)
+        {
+            codecIter->second = mCodecList.createCodecByPayloadType(ptype);
+        }
+        codec = codecIter->second.get();
+
+        // Return pointer to codec if needed.get()
+        if (detectedCodec)
+            *detectedCodec = codec;
+
+        if (mStat.mCodecName.empty() && codec)
+            mStat.mCodecName = codec->name();
+
+
+        if (!codec)
+            time_length = 10;
+        else
+        if (!codec->rtpLength())
+            time_length = codec->frameTime();
+        else
+            time_length = lround(double(payloadLength) / codec->rtpLength() * codec->frameTime());
+
+        if (codec)
+            samplerate = codec->samplerate();
+    }
 
     // Process jitter
-    mJitterStats.process(p.get(), codecIter->second->samplerate());
+    mJitterStats.process(p.get(), samplerate);
     mStat.mJitter = static_cast<float>(mJitterStats.get());
 
     // Check if packet is CNG
     if (payloadLength >= 1 && payloadLength <= 6 && (ptype == 0 || ptype == 8))
         time_length = mLastPacketTimeLength ? mLastPacketTimeLength : 20;
     else
-        // Check if packet is too short from time length side
-        if (time_length < 2)
-        {
-            // It will cause statistics to report about bad RTP packet
-            // I have to replay last packet payload here to avoid report about lost packet
-            mBuffer.add(p, time_length, codecIter->second->samplerate());
-            return false;
-        }
+    // Check if packet is too short from time length side
+    if (time_length < 2)
+    {
+        // It will cause statistics to report about bad RTP packet
+        // I have to replay last packet payload here to avoid report about lost packet
+        mBuffer.add(p, time_length, samplerate);
+        return false;
+    }
 
     // Queue packet to buffer
-    auto packet = mBuffer.add(p, time_length, codecIter->second->samplerate()).get();
+    auto packet = mBuffer.add(p, time_length, samplerate).get();
 
     if (packet)
     {
         // Check if early decoding configured
-        if (mEarlyDecode && *codec)
+        if (mEarlyDecode && codec)
         {
             // Move data to packet buffer
-            size_t available = decode_packet(**codec, *p, mDecodedFrame, sizeof mDecodedFrame);
-            packet->pcm().resize(available / 2);
-            memcpy(packet->pcm().data(), mDecodedFrame, available / 2);
+            size_t available = decode_packet(*codec, *p, mDecodedFrame, sizeof mDecodedFrame);
+            if (available > 0)
+            {
+                packet->pcm().resize(available / 2);
+                memcpy(packet->pcm().data(), mDecodedFrame, available / 2);
+            }
         }
         return true;
     }
@@ -487,11 +508,6 @@ void AudioReceiver::processDecoded(Audio::DataWindow& output, int options)
     makeMonoAndResample(resample ? mCodec->samplerate() : 0,
                         mCodec->channels());
 
-    // Update PVQA with stats
-#if defined(USE_PVQA_LIBRARY) && defined(PVQA_IN_RECEIVER)
-    updatePvqa(mResampledFrame, mResampledLength);
-#endif
-
     // Send to output
     output.add(mResampledFrame, mResampledLength);
 }
@@ -524,7 +540,17 @@ AudioReceiver::DecodeResult AudioReceiver::getAudio(Audio::DataWindow& output, i
             if (options & DecodeOptions_SkipDecode)
                 mDecodedLength = 0;
             else
+            {
                 mDecodedLength = mCodec->plc(mFrameCount, mDecodedFrame, sizeof mDecodedFrame);
+                if (!mDecodedLength)
+                {
+                    // PLC is not support or failed
+                    // So substitute the silence
+                    size_t nr_of_samples = mCodec->frameTime() * mCodec->samplerate() / 1000 * sizeof(short);
+                    mDecodedLength = nr_of_samples * sizeof(short);
+                    memset(mDecodedFrame, 0, mDecodedLength);
+                }
+            }
         }
 
         if (mDecodedLength)
@@ -537,15 +563,10 @@ AudioReceiver::DecodeResult AudioReceiver::getAudio(Audio::DataWindow& output, i
     case RtpBuffer::FetchResult::NoPacket:
         ICELogDebug(<< "No packet available in jitter buffer");
         mFailedCount++;
-#if defined(USE_PVQA_LIBRARY) && defined(PVQA_IN_RECEIVER)
-        if (mResampledLength > 0)
-            updatePvqa(nullptr, mResampledLength);
-#endif
         break;
 
     case RtpBuffer::FetchResult::RegularPacket:
         mFailedCount = 0;
-
         for (std::shared_ptr<RtpBuffer::Packet>& p: rl)
         {
             assert(p);
@@ -652,8 +673,7 @@ AudioReceiver::DecodeResult AudioReceiver::getAudio(Audio::DataWindow& output, i
                                     // Decode frame by frame
                                     mDecodedLength = mCodec->decode(p->rtp()->GetPayloadData() + i * mCodec->rtpLength(),
                                                                     frameLength, mDecodedFrame, sizeof mDecodedFrame);
-                                    // mDecodedLength = 3840; // Opus 20 ms stereo
-                                    if (mDecodedLength)
+                                    if (mDecodedLength > 0)
                                         processDecoded(output, options);
                                 }
                             }
@@ -734,70 +754,6 @@ Codec* AudioReceiver::findCodec(int payloadType)
     return codecIter->second.get();
 }
 
-#if defined(USE_PVQA_LIBRARY) && defined(PVQA_IN_RECEIVER)
-void AudioReceiver::initPvqa()
-{
-    // Allocate space for 20 seconds audio
-    if (!mPvqaBuffer)
-    {
-        mPvqaBuffer = std::make_shared<Audio::DataWindow>();
-        mPvqaBuffer->setCapacity(Audio::Format().sizeFromTime(30000));
-    }
-
-    // Instantiate & open PVQA analyzer
-    if (!mPVQA)
-    {
-        mPVQA = std::make_shared<sevana::pvqa>();
-        bool is_opened = mPVQA->open(AUDIO_SAMPLERATE, 1, PVQA_INTERVAL);
-        if (!is_opened)
-        {
-            //
-        }
-    }
-}
-
-void AudioReceiver::updatePvqa(const void *data, int size)
-{
-    if (!mPVQA)
-        initPvqa();
-
-    if (mPVQA)
-    {
-        if (data)
-            mPvqaBuffer->add(data, size);
-        else
-            mPvqaBuffer->addZero(size);
-
-        Audio::Format fmt;
-        int frames = static_cast<int>(fmt.timeFromSize(mPvqaBuffer->filled())) / (PVQA_INTERVAL * 1000);
-        if (frames > 0)
-        {
-            int time4pvqa = (int)(frames * PVQA_INTERVAL * 1000);
-            int size4pvqa = (int)fmt.sizeFromTime(time4pvqa);
-            ICELogDebug(<< "PVQA buffer has " << time4pvqa << " milliseconds of audio.");
-            bool update_result = mPVQA->update(mPvqaBuffer->data(), size4pvqa);
-            if (!update_result)
-            {
-                //
-            }
-            mPvqaBuffer->erase(size4pvqa);
-        }
-    }
-}
-
-float AudioReceiver::calculatePvqaMos(int rate, std::string& report)
-{
-    if (mPVQA && mPvqaBuffer)
-    {
-        sevana::pvqa::result result;
-        if (mPVQA->get_result(result)) {
-            report = result.mReport;
-            return result.mMos;
-        }
-    }
-    return 0.0f;
-}
-#endif
 
 void AudioReceiver::processStatisticsWithAmrCodec(Codec* c)
 {

src/engine/media/MT_AudioReceiver.h

@@ -1,4 +1,4 @@
-/* Copyright(C) 2007-2017 VoIPobjects (voipobjects.com)
+/* Copyright(C) 2007-2025 VoIPobjects (voipobjects.com)
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -8,25 +8,16 @@
 
 #include "MT_Stream.h"
 #include "MT_CodecList.h"
-#include "MT_AudioCodec.h"
 #include "MT_CngHelper.h"
-#include "../helper/HL_Pointer.h"
+
 #include "../helper/HL_Sync.h"
-#include "../helper/HL_Optional.hpp"
 
 #include "jrtplib/src/rtppacket.h"
-#include "jrtplib/src/rtcppacket.h"
 #include "jrtplib/src/rtpsourcedata.h"
 #include "../audio/Audio_DataWindow.h"
 #include "../audio/Audio_Resampler.h"
 
-/*#if defined(USE_PVQA_LIBRARY)
-# include "pvqa++.h"
-#endif*/
-
-#include <map>
-
-// #define DUMP_DECODED
+#include <optional>
 
 namespace MT
 {
@@ -104,6 +95,7 @@ namespace MT
     bool mFirstPacketWillGo = true;
     jrtplib::RTPSourceStats mRtpStats;
     std::shared_ptr<Packet> mFetchedPacket;
+    std::optional<uint32_t> mLastSeqno;
 
     // To calculate average interval between packet add. It is close to jitter but more useful in debugging.
     float mLastAddTime = 0.0;
@@ -127,7 +119,7 @@ namespace MT
     
     // Update codec settings
     void setCodecSettings(const CodecList::Settings& codecSettings);
-
+    CodecList::Settings& getCodecSettings();
     // Returns false when packet is rejected as illegal. codec parameter will show codec which will be used for decoding.
     // Lifetime of pointer to codec is limited by lifetime of AudioReceiver (it is container).
     bool add(const std::shared_ptr<jrtplib::RTPPacket>& p, Codec** codec = nullptr);
@@ -209,16 +201,6 @@ namespace MT
     // Resamples, sends to analysis, writes to dump and queues to output decoded frames from mDecodedFrame
     void processDecoded(Audio::DataWindow& output, int options);
 
-/*
-#if defined(USE_PVQA_LIBRARY) && defined(PVQA_IN_RECEIVER)
-    std::shared_ptr<sevana::pvqa> mPVQA;
-    void initPvqa();
-    void updatePvqa(const void* data, int size);
-    float calculatePvqaMos(int rate, std::string& report);
-
-    std::shared_ptr<Audio::DataWindow> mPvqaBuffer;
-#endif
-*/
     void processStatisticsWithAmrCodec(Codec* c);
   };
   

src/engine/media/MT_AudioStream.cpp

@@ -306,18 +306,22 @@ void AudioStream::dataArrived(PDatagramSocket s, const void* buffer, int length,
     int receiveLength = length;
     memcpy(mReceiveBuffer, buffer, length);
 
-    bool srtpResult;
     if (mSrtpSession.active())
     {
+        bool srtpResult;
+        size_t srcLength = length; size_t dstLength = sizeof mSrtpDecodeBuffer;
         if (RtpHelper::isRtp(mReceiveBuffer, receiveLength))
-            srtpResult = mSrtpSession.unprotectRtp(mReceiveBuffer, &receiveLength);
+            srtpResult = mSrtpSession.unprotectRtp(mReceiveBuffer, srcLength, mSrtpDecodeBuffer, &dstLength);
         else
-            srtpResult = mSrtpSession.unprotectRtcp(mReceiveBuffer, &receiveLength);
+            srtpResult = mSrtpSession.unprotectRtcp(mReceiveBuffer, srcLength, mSrtpDecodeBuffer, &dstLength);
         if (!srtpResult)
         {
             ICELogError(<<"Cannot decrypt SRTP packet.");
             return;
         }
+
+        memcpy(mReceiveBuffer, mSrtpDecodeBuffer, dstLength);
+        receiveLength = dstLength;
     }
 
     switch (source.family())
@@ -343,8 +347,8 @@ void AudioStream::dataArrived(PDatagramSocket s, const void* buffer, int length,
     mStat.mReceived += length;
     if (RtpHelper::isRtp(mReceiveBuffer, receiveLength))
     {
-        if (!mStat.mFirstRtpTime.is_initialized())
-            mStat.mFirstRtpTime = std::chrono::system_clock::now();
+        if (!mStat.mFirstRtpTime)
+            mStat.mFirstRtpTime = std::chrono::steady_clock::now();
         mStat.mReceivedRtp++;
     }
     else

src/engine/media/MT_AudioStream.h

@@ -6,7 +6,7 @@
 #ifndef __MT_AUDIOSTREAM_H
 #define __MT_AUDIOSTREAM_H
 
-#include "../config.h"
+#include "../engine_config.h"
 #include "MT_Stream.h"
 #include "MT_NativeRtpSender.h"
 #include "MT_SingleAudioStream.h"
@@ -87,7 +87,8 @@ protected:
     mCaptureResampler32,
     mCaptureResampler48;
     DtmfContext mDtmfContext;
-    char mReceiveBuffer[MAX_VALID_UDPPACKET_SIZE];
+    char mReceiveBuffer[MAX_VALID_UDPPACKET_SIZE],
+         mSrtpDecodeBuffer[MAX_VALID_UDPPACKET_SIZE];
 
     struct
     {

src/engine/media/MT_CngHelper.cpp

@@ -1,4 +1,4 @@
-#include "../config.h"
+#include "../engine_config.h"
 
 #include "MT_CngHelper.h"
 #include <stdlib.h>

src/engine/media/MT_Codec.cpp

@@ -11,8 +11,6 @@ int Codec::Factory::channels()
 {
   return 1;
 }
-
-#if defined(USE_RESIP_INTEGRATION)
 void Codec::Factory::create(CodecMap& codecs)
 {
   codecs[payloadType()] = std::shared_ptr<Codec>(create());
@@ -38,4 +36,4 @@ int Codec::Factory::processSdp(const resip::SdpContents::Session::Medium::CodecC
   }
   return -1;
 }
-#endif
+

src/engine/media/MT_Codec.h

@@ -6,9 +6,7 @@
 #ifndef __MT_CODEC_H
 #define __MT_CODEC_H
 
-#if defined(USE_RESIP_INTEGRATION)
-# include "resiprocate/resip/stack/SdpContents.hxx"
-#endif
+#include "resiprocate/resip/stack/SdpContents.hxx"
 #include "../helper/HL_Types.h"
 #include <map>
 #include "../helper/HL_Pointer.h"
@@ -36,14 +34,12 @@ public:
         virtual PCodec create() = 0;
 
         virtual int channels();
-#if defined(USE_RESIP_INTEGRATION)
         typedef std::map<int, PCodec > CodecMap;
         virtual void create(CodecMap& codecs);
         virtual void updateSdp(resip::SdpContents::Session::Medium::CodecContainer& codecs, SdpDirection direction);
         // Returns payload type from chosen codec if success. -1 is returned for negative result.
         virtual int processSdp(const resip::SdpContents::Session::Medium::CodecContainer& codecs, SdpDirection direction);
         resip::Codec resipCodec();
-#endif
     };
     virtual ~Codec() {}
     virtual const char* name() = 0;

src/engine/media/MT_CodecList.cpp

@@ -1,10 +1,11 @@
-/* Copyright(C) 2007-2022 VoIPobjects (voipobjects.com)
+/* Copyright(C) 2007-2025 VoIPobjects (voipobjects.com)
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include <algorithm>
+#include <list>
 
-#include "../config.h"
+#include "../engine_config.h"
 #include "MT_CodecList.h"
 #include "MT_AudioCodec.h"
 
@@ -24,33 +25,95 @@ using namespace MT;
 
 using strx = strx;
 
-// ---------------- EvsSpec ---------------
+
+bool CodecList::Settings::contains(int ptype) const
+{
+    if (ptype >= 0 && ptype < 96)
+        return true;
+
+    if (mAmrNbOctetPayloadType.contains(ptype))
+        return true;
+    if (mAmrNbPayloadType.contains(ptype))
+        return true;
+    if (mAmrWbOctetPayloadType.contains(ptype))
+        return true;
+    if (mAmrWbPayloadType.contains(ptype))
+        return true;
+    for (const auto& s: mOpusSpec)
+        if (s.mPayloadType == ptype)
+            return true;
+    for (const auto& s: mEvsSpec)
+        if (s.mPayloadType == ptype)
+            return true;
+
+    if (mIsac16KPayloadType == ptype || mIsac32KPayloadType == ptype)
+        return true;
+
+    if (mIlbc20PayloadType == ptype || mIlbc30PayloadType == ptype)
+        return true;
+
+    if (mGsmEfrPayloadType == ptype || mGsmFrPayloadType == ptype || mGsmHrPayloadType == ptype)
+        return true;
+
+    return false;
+}
 
 std::string CodecList::Settings::toString() const
 {
     std::ostringstream oss;
-    oss << "wrap IuUP:    " << mWrapIuUP << std::endl
-        << "skip decode:  " << mSkipDecode << std::endl;
-    for (int ptype: mAmrWbPayloadType)
-        oss << "AMR WB ptype: " << ptype << std::endl;
-    for (int ptype: mAmrWbOctetPayloadType)
-        oss << "AMR WB octet-aligned ptype: " << ptype << std::endl;
-    for (int ptype: mAmrNbPayloadType)
-        oss << "AMR NB ptype: " << ptype << std::endl;
-    for (int ptype: mAmrNbOctetPayloadType)
-        oss << "AMR NB octet-aligned ptype:" << ptype << std::endl;
+    // oss << "wrap IuUP:    " << mWrapIuUP << std::endl
+    //     << "skip decode:  " << mSkipDecode << std::endl;
 
-    oss << "ISAC 16Khz ptype: " << mIsac16KPayloadType << std::endl
-        << "ISAC 32Khz ptype: " << mIsac32KPayloadType << std::endl
-        << "iLBC 20ms ptype: " << mIlbc20PayloadType << std::endl
-        << "iLBC 30ms ptype: " << mIlbc30PayloadType << std::endl
-        << "GSM FR ptype: " << mGsmFrPayloadType << ", GSM FR plength: " << mGsmFrPayloadLength << std::endl
-        << "GSM HR ptype: " << mGsmHrPayloadType << std::endl
-        << "GSM EFR ptype: " << mGsmEfrPayloadType << std::endl;
+    if (!mAmrWbPayloadType.empty())
+    {
+        oss << "AMR WB ptype: ";
+        for (int ptype: mAmrWbPayloadType)
+            oss << ptype << " ";
+    }
+    if (!mAmrWbOctetPayloadType.empty())
+    {
+        oss << "AMR WB octet ptype: ";
+        for (int ptype: mAmrWbOctetPayloadType)
+            oss << ptype << " ";
+    }
+
+    if (!mAmrNbPayloadType.empty())
+    {
+        oss << "AMR ptype: ";
+        for (int ptype: mAmrNbPayloadType)
+            oss << ptype << " ";
+    }
+
+    if (!mAmrNbOctetPayloadType.empty())
+    {
+        oss << "AMR octet ptype: ";
+        for (int ptype: mAmrNbOctetPayloadType)
+            oss << ptype << " ";
+    }
+    if (mIsac16KPayloadType != -1)
+        oss << "ISAC 16Khz ptype: " << mIsac16KPayloadType << " ";
+
+    if (mIsac32KPayloadType != -1)
+        oss << "ISAC 32Khz ptype: " << mIsac32KPayloadType << " ";
+
+    if (mIlbc20PayloadType != -1)
+        oss << "iLBC 20ms ptype: " << mIlbc20PayloadType << " ";
+
+    if (mIlbc30PayloadType != -1)
+        oss << "iLBC 30ms ptype: " << mIlbc30PayloadType << " ";
+
+    if (mGsmFrPayloadType != -1)
+        oss << "GSM FR ptype: " << mGsmFrPayloadType << ", GSM FR plength: " << mGsmFrPayloadLength << " ";
+
+    if (mGsmHrPayloadType != -1)
+        oss << "GSM HR ptype: " << mGsmHrPayloadType << " ";
+
+    if (mGsmEfrPayloadType != -1)
+        oss << "GSM EFR ptype: " << mGsmEfrPayloadType << " ";
 
     for (auto& spec: mEvsSpec)
     {
-        oss << "EVS ptype: " << spec.mPayloadType << ", bw: " << spec.mBandwidth << ", enc: " << (spec.mEncodingType == EvsSpec::Encoding_MIME ? "mime" : "g192") << std::endl;
+        oss << "EVS ptype: " << spec.mPayloadType << ", bw: " << spec.mBandwidth << ", enc: " << (spec.mEncodingType == EvsSpec::Encoding_MIME ? "mime" : "g192") << " ";
     }
 
     for (auto& spec: mOpusSpec)
@@ -61,6 +124,24 @@ std::string CodecList::Settings::toString() const
     return oss.str();
 }
 
+void CodecList::Settings::clear()
+{
+    // Remove all dynamic payload type assignments
+    mEvsSpec.clear();
+    mOpusSpec.clear();
+    mAmrNbOctetPayloadType.clear();
+    mAmrNbPayloadType.clear();
+    mAmrWbOctetPayloadType.clear();
+    mAmrWbPayloadType.clear();
+    mIsac16KPayloadType = -1;
+    mIsac32KPayloadType = -1;
+    mIlbc20PayloadType = -1;
+    mIlbc30PayloadType = -1;
+    mGsmEfrPayloadType = -1;
+    mGsmFrPayloadType = -1;
+    mGsmHrPayloadType = -1;
+}
+
 bool CodecList::Settings::EvsSpec::isValid() const
 {
     return mPayloadType >= 96 && mPayloadType <= 127;
@@ -70,7 +151,7 @@ CodecList::Settings::EvsSpec CodecList::Settings::EvsSpec::parse(const std::stri
 {
     EvsSpec result;
 
-    auto parts = strx::split(spec, "-/");
+    auto parts = strx::split(spec, "-/ ,:");
     if (parts.size() == 3)
     {
         // Payload type number
@@ -115,7 +196,7 @@ CodecList::Settings::OpusSpec CodecList::Settings::OpusSpec::parse(const std::st
 {
     OpusSpec result;
 
-    auto parts = strx::split(spec, "-");
+    auto parts = strx::split(spec, "-/ ,:");
     if (parts.size() == 3)
     {
         result.mPayloadType = strx::toInt(strx::trim(parts.front()).c_str(), -1);
@@ -125,6 +206,21 @@ CodecList::Settings::OpusSpec CodecList::Settings::OpusSpec::parse(const std::st
     return result;
 }
 
+static int findOctetMode(const char* line)
+{
+    const char* param_name = "octet-align=";
+    auto p = strstr(line, param_name);
+    if (!p)
+        return 0;
+
+    p += strlen(param_name);
+    char int_buf[8] = {0};
+    size_t int_buf_offset = 0;
+    while (*p && isdigit(*p) && int_buf_offset < sizeof(int_buf))
+        int_buf[int_buf_offset++] = *p++;
+    return atoi(int_buf);
+}
+
 CodecList::Settings CodecList::Settings::parseSdp(const std::list<resip::Codec>& codeclist)
 {
     CodecList::Settings r{DefaultSettings};
@@ -135,15 +231,47 @@ CodecList::Settings CodecList::Settings::parseSdp(const std::list<resip::Codec>&
         int samplerate = c.getRate();
         int ptype = c.payloadType();
 
+        auto enc_params = c.encodingParameters(); // This must channels number for Opus codec
+        auto params = c.parameters();
+
         // Dynamic payload type codecs only - ISAC / iLBC / Speex / etc.
         if (codec_name == "OPUS")
         {
             // Check the parameters
-            auto enc_params = c.encodingParameters(); // This must channels number for Opus codec
-            auto params = c.parameters();
             int channels = strx::toInt(enc_params.c_str(), 1);
             r.mOpusSpec.push_back({ptype, samplerate, channels});
         }
+        else
+        if (codec_name == "AMR-WB")
+        {
+            int octet_mode = findOctetMode(params.c_str());
+            if (octet_mode != -1)
+            {
+                if (octet_mode == 0)
+                    r.mAmrWbPayloadType.insert(ptype);
+                else
+                if (octet_mode == 1)
+                    r.mAmrWbOctetPayloadType.insert(ptype);
+            }
+        }
+        else
+        if (codec_name == "AMR" || codec_name == "AMR-NB")
+        {
+            int octet_mode = findOctetMode(params.c_str());
+            if (octet_mode != -1)
+            {
+                if (octet_mode == 0)
+                    r.mAmrNbPayloadType.insert(ptype);
+                else
+                if (octet_mode == 1)
+                    r.mAmrNbOctetPayloadType.insert(ptype);
+            }
+        }
+        else
+        if (codec_name == "EVS")
+        {
+            r.mEvsSpec.push_back({ptype});
+        }
     }
     return r;
 }
@@ -151,7 +279,7 @@ CodecList::Settings CodecList::Settings::parseSdp(const std::list<resip::Codec>&
 bool CodecList::Settings::operator == (const Settings& rhs) const
 {
     if (std::tie(mWrapIuUP, mSkipDecode, mIsac16KPayloadType, mIsac32KPayloadType, mIlbc20PayloadType, mIlbc30PayloadType, mGsmFrPayloadType, mGsmFrPayloadLength, mGsmEfrPayloadType, mGsmHrPayloadType) !=
-            std::tie(rhs.mWrapIuUP, rhs.mSkipDecode, rhs.mIsac16KPayloadType, rhs.mIsac32KPayloadType, rhs.mIlbc20PayloadType, rhs.mIlbc30PayloadType, rhs.mGsmFrPayloadType, rhs.mGsmFrPayloadLength, rhs.mGsmEfrPayloadType, rhs.mGsmHrPayloadType))
+        std::tie(rhs.mWrapIuUP, rhs.mSkipDecode, rhs.mIsac16KPayloadType, rhs.mIsac32KPayloadType, rhs.mIlbc20PayloadType, rhs.mIlbc30PayloadType, rhs.mGsmFrPayloadType, rhs.mGsmFrPayloadLength, rhs.mGsmEfrPayloadType, rhs.mGsmHrPayloadType))
         return false;
 
     if (mAmrNbOctetPayloadType != rhs.mAmrNbOctetPayloadType)
@@ -189,172 +317,168 @@ bool CodecList::Settings::operator == (const Settings& rhs) const
 CodecList::Settings CodecList::Settings::DefaultSettings;
 
 CodecList::CodecList(const Settings& settings)
-  :mSettings(settings)
+    :mSettings(settings)
 {
     init(mSettings);
 }
 
 void CodecList::init(const Settings& settings)
 {
-  for (auto f: mFactoryList)
-      delete f;
-  mFactoryList.clear();
-
+    mFactoryList.clear();
+    mSettings = settings;
 #if defined(USE_OPUS_CODEC)
-  if (settings.mOpusSpec.empty())
-  {
-    mFactoryList.push_back(new OpusCodec::OpusFactory(48000, 2, MT_OPUS_CODEC_PT));
-  }
-  else
-  {
     for (auto spec: settings.mOpusSpec)
     {
-      mFactoryList.push_back(new OpusCodec::OpusFactory(spec.mRate, spec.mChannels, spec.mPayloadType));
+        mFactoryList.push_back(std::make_shared<OpusCodec::OpusFactory>(spec.mRate, spec.mChannels, spec.mPayloadType));
     }
-  }
 #endif
 
 
 #if !defined(TARGET_ANDROID) && !defined(TARGET_OPENWRT) && !defined(TARGET_RPI)
 #if defined(USE_AMR_CODEC)
-  for (int pt: mSettings.mAmrWbPayloadType)
-    mFactoryList.push_back(new AmrWbCodec::CodecFactory({mSettings.mWrapIuUP, false, pt}));
-  for (int pt: mSettings.mAmrWbOctetPayloadType)
-    mFactoryList.push_back(new AmrWbCodec::CodecFactory({mSettings.mWrapIuUP, true, pt}));
+    for (int pt: mSettings.mAmrWbPayloadType)
+        mFactoryList.push_back(std::make_shared<AmrWbCodec::CodecFactory>(AmrCodecConfig{mSettings.mWrapIuUP, false, pt}));
+    for (int pt: mSettings.mAmrWbOctetPayloadType)
+        mFactoryList.push_back(std::make_shared<AmrWbCodec::CodecFactory>(AmrCodecConfig{mSettings.mWrapIuUP, true, pt}));
 
-  for (int pt: mSettings.mAmrNbPayloadType)
-    mFactoryList.push_back(new AmrNbCodec::CodecFactory({mSettings.mWrapIuUP, false, pt}));
-  for (int pt: mSettings.mAmrNbOctetPayloadType)
-    mFactoryList.push_back(new AmrNbCodec::CodecFactory({mSettings.mWrapIuUP, true, pt}));
+    for (int pt: mSettings.mAmrNbPayloadType)
+        mFactoryList.push_back(std::make_shared<AmrNbCodec::CodecFactory>(AmrCodecConfig{mSettings.mWrapIuUP, false, pt}));
+    for (int pt: mSettings.mAmrNbOctetPayloadType)
+        mFactoryList.push_back(std::make_shared<AmrNbCodec::CodecFactory>(AmrCodecConfig{mSettings.mWrapIuUP, true, pt}));
 
-  mFactoryList.push_back(new GsmEfrCodec::GsmEfrFactory(mSettings.mWrapIuUP, mSettings.mGsmEfrPayloadType));
+    if (mSettings.mGsmEfrPayloadType != -1)
+        mFactoryList.push_back(std::make_shared<GsmEfrCodec::GsmEfrFactory>(mSettings.mWrapIuUP, mSettings.mGsmEfrPayloadType));
 #endif
 #endif
-  // mFactoryList.push_back(new IsacCodec::IsacFactory16K(mSettings.mIsac16KPayloadType));
-  // mFactoryList.push_back(new IlbcCodec::IlbcFactory(mSettings.mIlbc20PayloadType, mSettings.mIlbc30PayloadType));
-  mFactoryList.push_back(new G711Codec::AlawFactory());
-  mFactoryList.push_back(new G711Codec::UlawFactory());
+    mFactoryList.push_back(std::make_shared<G711Codec::AlawFactory>());
+    mFactoryList.push_back(std::make_shared<G711Codec::UlawFactory>());
 
-  mFactoryList.push_back(new GsmCodec::GsmFactory(mSettings.mGsmFrPayloadLength == 32 ? GsmCodec::Type::Bytes_32 : GsmCodec::Type::Bytes_33, mSettings.mGsmFrPayloadType));
-  // mFactoryList.push_back(new G722Codec::G722Factory());
-  // mFactoryList.push_back(new G729Codec::G729Factory());
+    if (mSettings.mGsmFrPayloadType != -1)
+        mFactoryList.push_back(std::make_shared<GsmCodec::GsmFactory>(mSettings.mGsmFrPayloadLength == 32 ? GsmCodec::Type::Bytes_32 : GsmCodec::Type::Bytes_33, mSettings.mGsmFrPayloadType));
+    mFactoryList.push_back(std::make_shared<G722Codec::G722Factory>());
+    mFactoryList.push_back(std::make_shared<G729Codec::G729Factory>());
 #ifndef TARGET_ANDROID
-  mFactoryList.push_back(new GsmHrCodec::GsmHrFactory(mSettings.mGsmHrPayloadType));
+    if (mSettings.mGsmHrPayloadType != -1)
+        mFactoryList.push_back(std::make_shared<GsmHrCodec::GsmHrFactory>(mSettings.mGsmHrPayloadType));
 #endif
 
 #if !defined(TARGET_ANDROID) && defined(USE_EVS_CODEC)
-  for (auto& spec: settings.mEvsSpec)
-  {
-    EVSCodec::StreamParameters evs_params;
-    evs_params.mime = spec.mEncodingType == Settings::EvsSpec::Encoding_MIME;
-    evs_params.bw = (int)spec.mBandwidth;
-    evs_params.ptime = 20;
-    evs_params.ptype = spec.mPayloadType;
+    for (auto& spec: settings.mEvsSpec)
+    {
+        EVSCodec::StreamParameters evs_params;
+        evs_params.mime = spec.mEncodingType == Settings::EvsSpec::Encoding_MIME;
+        evs_params.bw = (int)spec.mBandwidth;
+        evs_params.ptime = 20;
+        evs_params.ptype = spec.mPayloadType;
 
-    mFactoryList.push_back(new EVSCodec::EVSFactory(evs_params));
-  }
+        mFactoryList.push_back(std::make_shared<EVSCodec::EVSFactory>(evs_params));
+    }
 #endif
 }
 
 CodecList::~CodecList()
 {
-  for (auto f: mFactoryList)
-    delete f;
+    mFactoryList.clear();
 }
 
 int CodecList::count() const
 {
-  return static_cast<int>(mFactoryList.size());
+    return static_cast<int>(mFactoryList.size());
 }
 
 Codec::Factory& CodecList::codecAt(int index) const
 {
-  return *mFactoryList[static_cast<size_t>(index)];
+    return *mFactoryList[static_cast<size_t>(index)];
 }
 
 int CodecList::findCodec(const std::string &name) const
 {
-  for (int i=0; i<count(); i++)
-  {
-    if (codecAt(i).name() == name)
-      return i;
-  }
-  return -1;
+    for (int i=0; i<count(); i++)
+    {
+        if (codecAt(i).name() == name)
+            return i;
+    }
+    return -1;
 }
 
 void CodecList::fillCodecMap(CodecMap& cm)
 {
-  cm.clear();
-  for (auto& factory: mFactoryList)
-  {
-    // Create codec here. Although they are not needed right now - they can be needed to find codec's info.
-    PCodec c = factory->create();
-    cm.insert({factory->payloadType(), c});
-  }
+    cm.clear();
+    for (auto& factory: mFactoryList)
+    {
+        // Create codec here. Although they are not needed right now - they can be needed to find codec's info.
+        // PCodec c = factory->create();
+        cm.insert({factory->payloadType(), PCodec()});
+    }
 }
 
+PCodec CodecList::createCodecByPayloadType(int payloadType)
+{
+    for (auto& factory: mFactoryList)
+    {
+        if (factory->payloadType() == payloadType)
+            return factory->create();
+    }
+    return {};
+}
 
 CodecListPriority::CodecListPriority()
-{
-
-}
+{}
 
 CodecListPriority::~CodecListPriority()
-{
-
-}
+{}
 
 bool CodecListPriority::isNegativePriority(const CodecListPriority::Item& item)
 {
-  return item.mPriority < 0;
+    return item.mPriority < 0;
 }
 
 bool CodecListPriority::compare(const Item& item1, const Item& item2)
 {
-  return item1.mPriority < item2.mPriority;
+    return item1.mPriority < item2.mPriority;
 }
 
 void CodecListPriority::setupFrom(PVariantMap vmap)
 {
-  CodecList::Settings settings;
-  CodecList cl(settings);
-  //mPriorityList.resize(cl.count());
-  bool emptyVmap = vmap ? vmap->empty() : true;
+    CodecList::Settings settings;
+    CodecList cl(settings);
+    //mPriorityList.resize(cl.count());
+    bool emptyVmap = vmap ? vmap->empty() : true;
 
-  if (emptyVmap)
-  {
-    for (int i=0; i<cl.count(); i++)
+    if (emptyVmap)
     {
-      Item item;
-      item.mCodecIndex = i;
-      item.mPriority = i;
-      mPriorityList.push_back(item);
+        for (int i=0; i<cl.count(); i++)
+        {
+            Item item;
+            item.mCodecIndex = i;
+            item.mPriority = i;
+            mPriorityList.push_back(item);
+        }
     }
-  }
-  else
-  {
-    for (int i=0; i<cl.count(); i++)
+    else
     {
-      Item item;
-      item.mCodecIndex = i;
-      item.mPriority = vmap->exists(i) ? vmap->at(i).asInt() : 1000; // Non listed codecs will get lower priority
-      mPriorityList.push_back(item);
+        for (int i=0; i<cl.count(); i++)
+        {
+            Item item;
+            item.mCodecIndex = i;
+            item.mPriority = vmap->exists(i) ? vmap->at(i).asInt() : 1000; // Non listed codecs will get lower priority
+            mPriorityList.push_back(item);
+        }
+
+        // Remove -1 records
+        mPriorityList.erase(std::remove_if(mPriorityList.begin(), mPriorityList.end(), isNegativePriority), mPriorityList.end());
+
+        // Sort by priority
+        std::sort(mPriorityList.begin(), mPriorityList.end(), compare);
     }
-
-    // Remove -1 records
-    mPriorityList.erase(std::remove_if(mPriorityList.begin(), mPriorityList.end(), isNegativePriority), mPriorityList.end());
-
-    // Sort by priority
-    std::sort(mPriorityList.begin(), mPriorityList.end(), compare);
-  }
 }
 
 int CodecListPriority::count(const CodecList & /*cl*/) const
 {
-  return static_cast<int>(mPriorityList.size());
+    return static_cast<int>(mPriorityList.size());
 }
 
 Codec::Factory& CodecListPriority::codecAt(const CodecList& cl, int index) const
 {
-  return cl.codecAt(mPriorityList[static_cast<size_t>(index)].mCodecIndex);
+    return cl.codecAt(mPriorityList[static_cast<size_t>(index)].mCodecIndex);
 }

src/engine/media/MT_CodecList.h

@@ -6,11 +6,9 @@
 #ifndef __MT_CODEC_LIST_H
 #define __MT_CODEC_LIST_H
 
-#include "../config.h"
+#include "../engine_config.h"
 
-#if defined(USE_RESIP_INTEGRATION)
-# include "resiprocate/resip/stack/SdpContents.hxx"
-#endif
+#include "resiprocate/resip/stack/SdpContents.hxx"
 
 #include "MT_Codec.h"
 #include <vector>
@@ -31,22 +29,22 @@ public:
         bool mSkipDecode            = false;
 
         // AMR payload types
-        std::set<int> mAmrWbPayloadType       = { MT_AMRWB_PAYLOADTYPE };
-        std::set<int> mAmrNbPayloadType       = { MT_AMRNB_PAYLOADTYPE };
-        std::set<int> mAmrWbOctetPayloadType  = { MT_AMRWB_OCTET_PAYLOADTYPE };
-        std::set<int> mAmrNbOctetPayloadType  = { MT_AMRNB_OCTET_PAYLOADTYPE };
+        std::set<int64_t> mAmrWbPayloadType       = { };
+        std::set<int64_t> mAmrNbPayloadType       = { };
+        std::set<int64_t> mAmrWbOctetPayloadType  = { };
+        std::set<int64_t> mAmrNbOctetPayloadType  = { };
 
         bool isAmrWb(int ptype) const { return mAmrWbOctetPayloadType.count(ptype) > 0 || mAmrWbPayloadType.count(ptype) > 0; }
         bool isAmrNb(int ptype) const { return mAmrNbOctetPayloadType.count(ptype) > 0 || mAmrNbPayloadType.count(ptype) > 0; }
 
-        int mIsac16KPayloadType     = MT_ISAC16K_PAYLOADTYPE;
-        int mIsac32KPayloadType     = MT_ISAC32K_PAYLOADTYPE;
-        int mIlbc20PayloadType      = MT_ILBC20_PAYLOADTYPE;
-        int mIlbc30PayloadType      = MT_ILBC30_PAYLOADTYPE;
-        int mGsmFrPayloadType       = 3; // GSM is codec with fixed payload type. But sometimes it has to be overwritten.
+        int mIsac16KPayloadType     = -1;
+        int mIsac32KPayloadType     = -1;
+        int mIlbc20PayloadType      = -1;
+        int mIlbc30PayloadType      = -1;
+        int mGsmFrPayloadType       = -1; // GSM is codec with fixed payload type. But sometimes it has to be overwritten.
         int mGsmFrPayloadLength     = 33; // Expected GSM payload length
-        int mGsmHrPayloadType       = MT_GSMHR_PAYLOADTYPE;
-        int mGsmEfrPayloadType      = MT_GSMEFR_PAYLOADTYPE;
+        int mGsmHrPayloadType       = -1;
+        int mGsmEfrPayloadType      = -1;
 
         struct EvsSpec
         {
@@ -59,7 +57,7 @@ public:
                 Bandwidth_FB
             };
 
-            Bandwidth mBandwidth = Bandwidth_NB;
+            Bandwidth mBandwidth = Bandwidth_FB;
 
             enum Encoding
             {
@@ -72,7 +70,7 @@ public:
             static EvsSpec parse(const std::string& spec);
 
             bool operator == (const EvsSpec& rhs) const { return std::tie(mPayloadType, mBandwidth, mEncodingType) == std::tie(rhs.mPayloadType, rhs.mBandwidth, rhs.mEncodingType);}
-            bool operator != (const EvsSpec& rhs) const { return ! (operator ==) (rhs);};
+            bool operator != (const EvsSpec& rhs) const { return ! (operator ==) (rhs);}
 
         };
 
@@ -90,35 +88,42 @@ public:
 
             bool isValid() const;
             bool operator == (const OpusSpec& rhs) const { return std::tie(mPayloadType, mRate, mChannels) == std::tie(rhs.mPayloadType, rhs.mRate, rhs.mChannels);}
-            bool operator != (const OpusSpec& rhs) const { return ! (operator ==) (rhs);};
+            bool operator != (const OpusSpec& rhs) const { return ! (operator ==) (rhs);}
 
             static OpusSpec parse(const std::string& spec);
         };
         std::vector<OpusSpec> mOpusSpec;
 
+        // Payload type
+        bool        contains(int ptype) const;
+
         // Textual representation - used in logging
         std::string toString() const;
+        void        clear();
 
         static Settings DefaultSettings;
 
-        #if defined(USE_RESIP_INTEGRATION)
         static Settings parseSdp(const std::list<resip::Codec>& codeclist);
-        #endif
+
         bool operator == (const Settings& rhs) const;
     };
 
     CodecList(const Settings& settings);
     ~CodecList();
-    void setSettings(const Settings& settings) { init(settings); }
+    void setSettings(const Settings& settings)
+    {
+        init(settings);
+    }
 
-    int count() const;
+    int             count() const;
     Codec::Factory& codecAt(int index) const;
-    int findCodec(const std::string& name) const;
-    void fillCodecMap(CodecMap& cm);
-
+    int             findCodec(const std::string& name) const;
+    void            fillCodecMap(CodecMap& cm);
+    PCodec          createCodecByPayloadType(int payloadType);
+    void            clear();
 
 protected:
-    typedef std::vector<Codec::Factory*> FactoryList;
+    typedef std::vector<std::shared_ptr<Codec::Factory>> FactoryList;
     FactoryList mFactoryList;
     Settings mSettings;
 

src/engine/media/MT_Dtmf.cpp

@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "../config.h"
+#include "../engine_config.h"
 #include "MT_Dtmf.h"
 
 

src/engine/media/MT_Dtmf.h

@@ -6,7 +6,7 @@
 #ifndef MT_DTMF
 #define MT_DTMF
 
-#include "../config.h"
+#include "../engine_config.h"
 #include <vector>
 #include <string>
 #include "../helper/HL_ByteBuffer.h"

src/engine/media/MT_EvsCodec.cpp

@@ -146,8 +146,7 @@ PCodec EVSCodec::EVSFactory::create()
 }
 
 EVSCodec::EVSCodec(): EVSCodec(StreamParameters())
-{
-}
+{}
 
 EVSCodec::EVSCodec(const StreamParameters &sp)
 {
@@ -227,8 +226,7 @@ int EVSCodec::decode(const void* input, int input_length, void* output, int outp
         else
             buffer = std::string(reinterpret_cast<const char*>(input), input_length);
     }
-    else
-        // Skip CMR byte
+    else // Skip CMR byte
         buffer = std::string(reinterpret_cast<const char*>(input) + 1, input_length-1);
 
 

src/engine/media/MT_EvsCodec.h

@@ -1,5 +1,7 @@
-#pragma once
+#ifndef __MT_EVS_CODEC_H
+#define __MT_EVS_CODEC_H
 
+#include "../engine_config.h"
 #include <set>
 #include <map>
 #include <memory>
@@ -10,7 +12,6 @@
 #include <assert.h>
 #include <sstream>
 
-#include "config.h"
 #include "MT_Codec.h"
 
 #include "libevs/lib_com/prot.h"
@@ -40,7 +41,7 @@ public:
 
     public:
         EVSFactory(StreamParameters& sp);
-        const char* name() { return MT_EVS_CODECNAME; };
+        const char* name() { return MT_EVS_CODECNAME; }
         int samplerate();
         int payloadType();
         PCodec create();
@@ -51,7 +52,7 @@ public:
     EVSCodec(const StreamParameters& sp);
     ~EVSCodec() override;
 
-    const char* name() override { return MT_EVS_CODECNAME; } ;
+    const char* name() override { return MT_EVS_CODECNAME; }
     int samplerate() override;
     int pcmLength() override;
     int frameTime() override;
@@ -68,3 +69,5 @@ private:
 };
 
 } // End of namespace
+
+#endif

src/engine/media/MT_NativeRtpSender.h

@@ -6,9 +6,9 @@
 #ifndef __MT_NATIVE_RTP_SENDER_H
 #define __MT_NATIVE_RTP_SENDER_H
 
-#include "../config.h"
+#include "../engine_config.h"
 #include "jrtplib/src/rtpexternaltransmitter.h"
-#include "srtp/include/srtp.h"
+#include "libsrtp/include/srtp.h"
 #include "../helper/HL_NetworkSocket.h"
 #include "../helper/HL_InternetAddress.h"
 #include "../helper/HL_Rtp.h"

src/engine/media/MT_SrtpHelper.cpp

@@ -1,59 +1,110 @@
-/* Copyright(C) 2007-2016 VoIP objects (voipobjects.com)
+/* Copyright(C) 2007-2025 VoIP objects (voipobjects.com)
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#include "../engine_config.h"
 #include "MT_SrtpHelper.h"
 #include "../helper/HL_Log.h"
 #include "../helper/HL_Exception.h"
 #include "../helper/HL_Rtp.h"
+#include <openssl/rand.h>
 #include <assert.h>
+#include <format>
+
+struct SrtpSuiteAndName
+{
+    SrtpSuite mSuite;
+    std::string mName, mAltName;
+};
+
+std::vector<SrtpSuiteAndName> SrtpSuiteList {
+    { SRTP_AES_256_AUTH_80,     "AES_CM_256_HMAC_SHA1_80", "AES_256_CM_HMAC_SHA1_80" },
+    { SRTP_AES_128_AUTH_80,     "AES_CM_128_HMAC_SHA1_80", "AES_128_CM_HMAC_SHA1_80" },
+    { SRTP_AES_192_AUTH_80,     "AES_CM_192_HMAC_SHA1_80", "AES_192_CM_HMAC_SHA1_80" },
+    { SRTP_AES_256_AUTH_32,     "AES_CM_256_HMAC_SHA1_32", "AES_256_CM_HMAC_SHA1_32" },
+    { SRTP_AES_192_AUTH_32,     "AES_CM_192_HMAC_SHA1_32", "AES_192_CM_HMAC_SHA1_32" },
+    { SRTP_AES_128_AUTH_32,     "AES_CM_128_HMAC_SHA1_32", "AES_128_CM_HMAC_SHA1_32" },
+    { SRTP_AES_128_AUTH_NULL,   "AES_CM_128_NULL_AUTH", "AES_128_CM_NULL_AUTH"},
+    { SRTP_AED_AES_256_GCM,     "AEAD_AES_256_GCM"},
+    { SRTP_AED_AES_128_GCM,     "AEAD_AES_128_GCM"}
+};
+
+extern SrtpSuite   toSrtpSuite(const std::string_view& s)
+{
+    for (const auto& suite: SrtpSuiteList)
+        if (s == suite.mName || s == suite.mAltName)
+            return suite.mSuite;
+
+    return SRTP_NONE;
+}
+
+extern std::string_view toString(SrtpSuite suite)
+{
+    for (const auto& item: SrtpSuiteList)
+        if (item.mSuite == suite)
+            return item.mName;
+
+    return {};
+}
+
+typedef void (*set_srtp_policy_function) (srtp_crypto_policy_t*);
+
+set_srtp_policy_function findPolicyFunction(SrtpSuite suite)
+{
+    switch (suite)
+    {
+    case SRTP_AES_128_AUTH_80:      return &srtp_crypto_policy_set_rtp_default; break;
+    case SRTP_AES_192_AUTH_80:      return &srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80; break;
+    case SRTP_AES_256_AUTH_80:      return &srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80; break;
+    case SRTP_AES_128_AUTH_32:      return &srtp_crypto_policy_set_aes_cm_128_hmac_sha1_32; break;
+    case SRTP_AES_192_AUTH_32:      return &srtp_crypto_policy_set_aes_cm_192_hmac_sha1_32; break;
+    case SRTP_AES_256_AUTH_32:      return &srtp_crypto_policy_set_aes_cm_256_hmac_sha1_32; break;
+    case SRTP_AES_128_AUTH_NULL:    return &srtp_crypto_policy_set_aes_cm_128_null_auth; break;
+    case SRTP_AED_AES_256_GCM:      return &srtp_crypto_policy_set_aes_gcm_256_16_auth; break;
+    case SRTP_AED_AES_128_GCM:      return &srtp_crypto_policy_set_aes_gcm_128_16_auth; break;
+    case SRTP_NONE:                 return nullptr;
+    }
+
+    return nullptr;
+}
 
 // --- SrtpStream ---
-void initSrtpStream(SrtpStream& s, unsigned ssrc, SrtpSuite suite)
+static void configureSrtpStream(SrtpStream& s, uint16_t ssrc, SrtpSuite suite)
 {
-  s.second.ssrc.type = ssrc_specific;
-  s.second.ssrc.value = ntohl(ssrc);
-  s.second.next = NULL;
-  switch (suite)
-  {
-  case SRTP_AES_128_AUTH_80:
-    crypto_policy_set_aes_cm_128_hmac_sha1_80(&s.second.rtp);
-    crypto_policy_set_aes_cm_128_hmac_sha1_80(&s.second.rtcp);
-    break;
-
-  case SRTP_AES_256_AUTH_80:
-    crypto_policy_set_aes_cm_256_hmac_sha1_80(&s.second.rtp);
-    crypto_policy_set_aes_cm_256_hmac_sha1_80(&s.second.rtcp);
-    break;
-
-  default:
-    assert(0);
-  }
+    s.second.ssrc.type = ssrc_specific;
+    s.second.ssrc.value = ntohl(ssrc);
+    s.second.next = nullptr;
+    set_srtp_policy_function func = findPolicyFunction(suite);
+    if (!func)
+        throw std::runtime_error(std::format("SRTP suite {} is not supported", toString(suite)));
+    func(&s.second.rtp);
+    func(&s.second.rtcp);
 }
 
 SrtpSession::SrtpSession()
-:mInboundSession(NULL), mOutboundSession(NULL)
+    :mInboundSession(nullptr), mOutboundSession(nullptr)
 {
-  mInboundSession = NULL;
-  mOutboundSession = NULL;
-  mSuite = SRTP_NONE;
+    mSuite = SRTP_NONE;
 
-  memset(&mInboundPolicy, 0, sizeof mInboundPolicy);  
-  mInboundPolicy.ssrc.type  = ssrc_specific;
+    memset(&mInboundPolicy, 0, sizeof mInboundPolicy);
+    mInboundPolicy.ssrc.type  = ssrc_specific;
 
-  memset(&mOutboundPolicy, 0, sizeof mOutboundPolicy);
-  mOutboundPolicy.ssrc.type = ssrc_specific;
+    memset(&mOutboundPolicy, 0, sizeof mOutboundPolicy);
+    mOutboundPolicy.ssrc.type = ssrc_specific;
 
-  // Generate outgoing keys
-
-  mOutgoingKey[SRTP_AES_128_AUTH_80-1].first = PByteBuffer(new ByteBuffer());
-  mOutgoingKey[SRTP_AES_128_AUTH_80-1].first->resize(30);
-  crypto_get_random((unsigned char*)mOutgoingKey[SRTP_AES_128_AUTH_80-1].first->mutableData(), 30);
-
-  mOutgoingKey[SRTP_AES_256_AUTH_80-1].first = PByteBuffer(new ByteBuffer());
-  mOutgoingKey[SRTP_AES_256_AUTH_80-1].first->resize(46);
-  crypto_get_random((unsigned char*)mOutgoingKey[SRTP_AES_256_AUTH_80-1].first->mutableData(), 46);
+    // Generate outgoing keys for all ciphers
+    auto putKey = [this](SrtpSuite suite, size_t length){
+        auto key = std::make_shared<ByteBuffer>();
+        key->resize(length);
+        RAND_bytes(key->mutableData(), key->size());
+        mOutgoingKey[suite].first = key;
+    };
+    putKey(SRTP_AES_128_AUTH_80, 30); putKey(SRTP_AES_128_AUTH_32, 30);
+    putKey(SRTP_AES_192_AUTH_80, 38); putKey(SRTP_AES_192_AUTH_32, 38);
+    putKey(SRTP_AES_256_AUTH_80, 46); putKey(SRTP_AES_256_AUTH_32, 46);
+    putKey(SRTP_AED_AES_128_GCM, 28);
+    putKey(SRTP_AED_AES_256_GCM, 44);
 
 }
 
@@ -61,171 +112,190 @@ SrtpSession::~SrtpSession()
 {
 }
 
-void SrtpSession::addSsrc(unsigned ssrc, SsrcDirection d)
+/*void SrtpSession::addSsrc(unsigned ssrc, SsrcDirection d)
 {
-  Lock l(mGuard);
-  assert(mSuite != SRTP_NONE);
+    Lock l(mGuard);
+    assert(mSuite != SRTP_NONE);
 
-  // Look in map - if the srtp stream for this ssrc is created already
-  SrtpStreamMap::iterator streamIter;
-  SrtpStream s;
-  switch (d)
-  {
-  case sdIncoming:
-    streamIter = mIncomingMap.find(ssrc);
-    if (streamIter != mIncomingMap.end())
-      return;
+    // Look in map - if the srtp stream for this ssrc is created already
+    SrtpStreamMap::iterator streamIter;
+    SrtpStream s;
+    switch (d)
+    {
+    case sdIncoming:
+        streamIter = mIncomingMap.find(ssrc);
+        if (streamIter != mIncomingMap.end())
+            return;
 
-    initSrtpStream(s, ssrc, mSuite);
-    s.second.key = (unsigned char*)mIncomingKey.first->mutableData();
-    mIncomingMap[ssrc] = s;
-    srtp_add_stream(mInboundSession, &s.second);
-    return;
+        configureSrtpStream(s, ssrc, mSuite);
+        s.second.key = (unsigned char*)mIncomingKey.first->mutableData();
+        mIncomingMap[ssrc] = s;
+        srtp_add_stream(mInboundSession, &s.second);
+        return;
 
-  case sdOutgoing:
-    streamIter = mOutgoingMap.find(ssrc);
-    if (streamIter != mOutgoingMap.end())
-      return;
-    initSrtpStream(s, ssrc, mSuite);
-    s.second.key = (unsigned char*)mOutgoingKey[int(mSuite)-1].first->mutableData();
-    mOutgoingMap[ssrc] = s;
-    srtp_add_stream(mOutboundSession, &s.second);
-    return;
-  }
-}
+    case sdOutgoing:
+        streamIter = mOutgoingMap.find(ssrc);
+        if (streamIter != mOutgoingMap.end())
+            return;
+        configureSrtpStream(s, ssrc, mSuite);
+        s.second.key = (unsigned char*)mOutgoingKey[int(mSuite)-1].first->mutableData();
+        mOutgoingMap[ssrc] = s;
+        srtp_add_stream(mOutboundSession, &s.second);
+        return;
+    }
+}*/
 
 void SrtpSession::open(ByteBuffer& incomingKey, SrtpSuite suite)
 {
-  Lock l(mGuard);
+    Lock l(mGuard);
 
-  // Check if session is here already
-  if (mInboundSession || mOutboundSession)
-    return;
+    // Check if session is here already
+    if (mInboundSession || mOutboundSession)
+        return;
 
-  // Save used SRTP suite
-  mSuite = suite;
+    // Save used SRTP suite
+    mSuite = suite;
 
-  // Save key
-  mIncomingKey.first = PByteBuffer(new ByteBuffer(incomingKey));
+    // Save key
+    mIncomingKey.first = std::make_shared<ByteBuffer>(incomingKey);
 
-  // Update policy
-  switch (suite)
-  {
-  case SRTP_AES_128_AUTH_80:
-    crypto_policy_set_aes_cm_128_hmac_sha1_80(&mInboundPolicy.rtp);
-    crypto_policy_set_aes_cm_128_hmac_sha1_80(&mInboundPolicy.rtcp);
-    crypto_policy_set_aes_cm_128_hmac_sha1_80(&mOutboundPolicy.rtp);
-    crypto_policy_set_aes_cm_128_hmac_sha1_80(&mOutboundPolicy.rtcp);
-    break;
+    auto policyFunction = findPolicyFunction(suite);
+    if (!policyFunction)
+        throw std::runtime_error(std::format("SRTP suite {} not found", toString(suite)));
 
-  case SRTP_AES_256_AUTH_80:
-    crypto_policy_set_aes_cm_256_hmac_sha1_80(&mInboundPolicy.rtp);
-    crypto_policy_set_aes_cm_256_hmac_sha1_80(&mInboundPolicy.rtcp);
-    crypto_policy_set_aes_cm_256_hmac_sha1_80(&mOutboundPolicy.rtp);
-    crypto_policy_set_aes_cm_256_hmac_sha1_80(&mOutboundPolicy.rtcp);
-    break;
+    // Configure policies
+    policyFunction(&mInboundPolicy.rtp);
+    policyFunction(&mInboundPolicy.rtcp);
+    policyFunction(&mOutboundPolicy.rtp);
+    policyFunction(&mOutboundPolicy.rtcp);
 
-  case SRTP_NONE:
-    break;
-  }
-  mOutboundPolicy.key = (unsigned char*)mOutgoingKey[int(suite)-1].first->mutableData();
-  mInboundPolicy.key = (unsigned char*)mIncomingKey.first->mutableData();
+    mOutboundPolicy.key = (unsigned char*)mOutgoingKey[int(suite)].first->mutableData();
+    mOutboundPolicy.ssrc.type = ssrc_any_outbound;
 
-  // Create SRTP session
-  err_status_t err;
+    mInboundPolicy.key =  (unsigned char*)mIncomingKey.first->mutableData();
+    mInboundPolicy.ssrc.type = ssrc_any_inbound;
 
-  err = srtp_create(&mOutboundSession, &mOutboundPolicy);
-  if (err)
-    throw Exception(ERR_SRTP, err);
+    // Create SRTP session
+    srtp_err_status_t err;
 
-  err = srtp_create(&mInboundSession, &mInboundPolicy);
-  if (err)
-    throw Exception(ERR_SRTP, err);
+    err = srtp_create(&mOutboundSession, &mOutboundPolicy);
+    if (err)
+        throw Exception(ERR_SRTP, err);
+
+    err = srtp_create(&mInboundSession, &mInboundPolicy);
+    if (err)
+        throw Exception(ERR_SRTP, err);
 }
 
 bool SrtpSession::active()
 {
-  Lock l(mGuard);
-  return mInboundSession != 0 && mOutboundSession != 0;
+    Lock l(mGuard);
+    return mInboundSession != 0 && mOutboundSession != 0;
 }
 
 void SrtpSession::close()
 {
-  Lock l(mGuard);
+    Lock l(mGuard);
 
-  if (mOutboundSession)
-  {
-    srtp_dealloc(mOutboundSession);
-    mOutboundSession = NULL;
-  }
+    if (mOutboundSession)
+    {
+        srtp_dealloc(mOutboundSession);
+        mOutboundSession = nullptr;
+    }
 
-  if (mInboundSession)
-  {
-    srtp_dealloc(mInboundSession);
-    mInboundSession = NULL;
-  }
+    if (mInboundSession)
+    {
+        srtp_dealloc(mInboundSession);
+        mInboundSession = nullptr;
+    }
 }
 
 SrtpKeySalt& SrtpSession::outgoingKey(SrtpSuite suite)
 {
-  Lock l(mGuard);
-  assert(suite > SRTP_NONE && suite <= SRTP_LAST);
-  return mOutgoingKey[int(suite)-1];
+    Lock l(mGuard);
+    assert(suite > SRTP_NONE && suite <= SRTP_LAST);
+    return mOutgoingKey[int(suite)-1];
 }
 
 bool SrtpSession::protectRtp(void* buffer, int* length)
 {
-  addSsrc(RtpHelper::findSsrc(buffer, *length), sdOutgoing);
+    // addSsrc(RtpHelper::findSsrc(buffer, *length), sdOutgoing);
 
-  Lock l(mGuard);
-  if (mOutboundSession)
-    return srtp_protect(mOutboundSession, buffer, length) == 0;
-  else
-    return false;
+    Lock l(mGuard);
+    if (mOutboundSession)
+    {
+        size_t srtp_len = MAX_VALID_UDPPACKET_SIZE;
+        auto code = srtp_protect(mOutboundSession,
+                                 (const uint8_t*)buffer, (size_t)*length,
+                                 (uint8_t*)buffer, &srtp_len,
+                                 0 /* mki_index, non-used */);
+        *length = srtp_len;
+        return code == 0;
+    }
+    else
+        return false;
 }
 
 bool SrtpSession::protectRtcp(void* buffer, int* length)
 {
-  addSsrc(RtpHelper::findSsrc(buffer, *length), sdOutgoing);
+    //addSsrc(RtpHelper::findSsrc(buffer, *length), sdOutgoing);
 
-  Lock l(mGuard);
-  if (mOutboundSession)
-    return srtp_protect_rtcp(mOutboundSession, buffer, length) == 0;
-  else
-    return false;
+    Lock l(mGuard);
+    if (mOutboundSession)
+    {
+        size_t srtp_len = MAX_VALID_UDPPACKET_SIZE;
+        auto code = srtp_protect_rtcp(mOutboundSession,
+                                      (const uint8_t*)buffer, (size_t)*length,
+                                      (uint8_t*)buffer, &srtp_len,
+                                      0 /* mki_index, non-used */);
+        *length = srtp_len;
+        return code == 0;
+    }
+    else
+        return false;
 }
 
-bool SrtpSession::unprotectRtp(void* buffer, int* length)
+bool SrtpSession::unprotectRtp(const void* src, size_t srcLength, void* dst, size_t* dstLength)
 {
-  addSsrc(RtpHelper::findSsrc(buffer, *length), sdIncoming);
+    //addSsrc(RtpHelper::findSsrc(buffer, *length), sdIncoming);
 
-  Lock l(mGuard);
-  if (mInboundSession)
-    return srtp_unprotect(mInboundSession, buffer, length) == 0;
-  else
-    return false;
+    Lock l(mGuard);
+    if (mInboundSession)
+    {
+        auto code = srtp_unprotect(mInboundSession,
+                                   (const uint8_t*)src, srcLength,
+                                   (uint8_t*)dst, dstLength);
+        return code == 0;
+    }
+    else
+        return false;
 }
 
-bool SrtpSession::unprotectRtcp(void* buffer, int* length)
+bool SrtpSession::unprotectRtcp(const void* src, size_t srcLength, void* dst, size_t* dstLength)
 {
-  addSsrc(RtpHelper::findSsrc(buffer, *length), sdIncoming);
+    //addSsrc(RtpHelper::findSsrc(buffer, *length), sdIncoming);
 
-  Lock l(mGuard);
-  if (mInboundSession)
-    return srtp_unprotect_rtcp(mInboundSession, buffer, (int*)length) == 0;
-  else
-    return false;
+    Lock l(mGuard);
+    if (mInboundSession)
+    {
+        auto code = srtp_unprotect_rtcp(mInboundSession,
+                                        (const uint8_t*)src, srcLength,
+                                        (uint8_t*)dst, dstLength);
+        return code == 0;
+    }
+    else
+        return false;
 }
 
 static bool GSrtpInitialized = false;
 void SrtpSession::initSrtp()
 {
-  if (GSrtpInitialized)
-    return;
+    if (GSrtpInitialized)
+        return;
 
-  err_status_t err = srtp_init();
+    auto err = srtp_init();
 
-  if (err != err_status_ok) 
-    throw Exception(ERR_SRTP, err);
-  GSrtpInitialized = true;
+    if (err != srtp_err_status_ok)
+        throw Exception(ERR_SRTP, err);
+    GSrtpInitialized = true;
 }

src/engine/media/MT_SrtpHelper.h

@@ -10,64 +10,78 @@
 #include <vector>
 #include <map>
 
-#include "srtp/include/srtp.h"
-#include "../helper/HL_Sync.h"
-#include "../helper/HL_ByteBuffer.h"
+#include "libsrtp/include/srtp.h"
+#include "HL_Sync.h"
+#include "HL_ByteBuffer.h"
+#include "HL_Types.h"
 
-#define SRTP_SUITE_NAME_2 "AES_CM_256_HMAC_SHA1_80"
-#define SRTP_SUITE_NAME_1 "AES_CM_128_HMAC_SHA1_80"
+#define NAME_SRTP_AES_256_AUTH_80 "AES_CM_256_HMAC_SHA1_80"
+#define NAME_SRTP_AES_128_AUTH_80 "AES_CM_128_HMAC_SHA1_80"
 
 enum SrtpSuite
 {
-  SRTP_NONE,
-  SRTP_AES_128_AUTH_80,
-  SRTP_AES_256_AUTH_80,
-  SRTP_LAST = SRTP_AES_256_AUTH_80
+    SRTP_NONE,
+    SRTP_AES_128_AUTH_80,
+    SRTP_AES_256_AUTH_80,
+    SRTP_AES_192_AUTH_80,
+    SRTP_AES_128_AUTH_32,
+    SRTP_AES_256_AUTH_32,
+    SRTP_AES_192_AUTH_32,
+    SRTP_AES_128_AUTH_NULL,
+    SRTP_AED_AES_256_GCM,
+    SRTP_AED_AES_128_GCM,
+    SRTP_LAST = SRTP_AED_AES_128_GCM
+    // ToDo:
+    // a=crypto:1 AEAD_AES_256_GCM_8 inline:tN2A0vRjFBimpQsW2GasuJuPe7hKE26gki30APC8DVuySqCOYTs8lYBPR5I=
+    // a=crypto:3 AEAD_AES_128_GCM_8 inline:Ok7VL8SmBHSbZLw4dK6iQgpliYKGdY9BHLJcRw==
 };
 
+extern SrtpSuite        toSrtpSuite(const std::string_view& s);
+extern std::string_view toString(SrtpSuite suite);
+
 typedef std::pair<PByteBuffer, PByteBuffer> SrtpKeySalt;
 typedef std::pair<unsigned, srtp_policy_t> SrtpStream;
 
 class SrtpSession
 {
 public:
-  SrtpSession();
-  ~SrtpSession();
+    SrtpSession();
+    ~SrtpSession();
 
-  enum SsrcDirection
-  {
-    sdIncoming,
-    sdOutgoing
-  };
-  SrtpKeySalt&     outgoingKey(SrtpSuite suite);
+    enum SsrcDirection
+    {
+        sdIncoming,
+        sdOutgoing
+    };
+    SrtpKeySalt&     outgoingKey(SrtpSuite suite);
 
-  void open(ByteBuffer& incomingKey, SrtpSuite suite);
-  void close();
-  bool active();
+    void open(ByteBuffer& incomingKey, SrtpSuite suite);
+    void close();
+    bool active();
 
-  /* bufferPtr is RTP packet data i.e. header + payload. Buffer must be big enough to hold encrypted data. */
-  bool protectRtp(void* buffer, int* length);
-  bool protectRtcp(void* buffer, int* length);
-  bool unprotectRtp(void* buffer, int* length);
-  bool unprotectRtcp(void* buffer, int* length);
+    /* bufferPtr is RTP packet data i.e. header + payload. Buffer must be big enough to hold encrypted data. */
+    bool protectRtp(void* buffer, int* length);
+    bool protectRtcp(void* buffer, int* length);
+    bool unprotectRtp(const void* src, size_t srcLength, void* dst, size_t* dstLength);
+    bool unprotectRtcp(const void* src, size_t srcLength, void* dst, size_t* dstLength);
 
 
-  static void initSrtp();
+    static void initSrtp();
 protected:
-  srtp_t          mInboundSession,
-                  mOutboundSession;
+    srtp_t          mInboundSession,
+    mOutboundSession;
 
-  SrtpKeySalt     mIncomingKey,
-                  mOutgoingKey[SRTP_LAST];
-  srtp_policy_t   mInboundPolicy;
-  srtp_policy_t   mOutboundPolicy;
-  SrtpSuite       mSuite;
+    SrtpKeySalt     mIncomingKey,
+                    mOutgoingKey[SRTP_LAST];
+    srtp_policy_t   mInboundPolicy;
+    srtp_policy_t   mOutboundPolicy;
+    SrtpSuite       mSuite;
 
-  typedef std::map<unsigned, SrtpStream> SrtpStreamMap;
-  SrtpStreamMap mIncomingMap, mOutgoingMap;
-  Mutex mGuard;
+    typedef std::map<unsigned, SrtpStream> SrtpStreamMap;
+    SrtpStreamMap mIncomingMap, mOutgoingMap;
+    Mutex mGuard;
 
-  void addSsrc(unsigned ssrc, SsrcDirection d);
+    void addSsrc(unsigned ssrc, SsrcDirection d);
 };
 
 #endif

src/engine/media/MT_Statistics.cpp

@@ -1,8 +1,7 @@
-#include <math.h>
+#include <cmath>
+#include <iostream>
 
 #include "MT_Statistics.h"
-#include "audio/Audio_Interface.h"
-#include "helper/HL_Log.h"
 #define LOG_SUBSYSTEM "Statistics"
 
 using namespace MT;
@@ -13,7 +12,7 @@ void JitterStatistics::process(jrtplib::RTPPacket* packet, int rate)
     uint32_t timestamp = packet->GetTimestamp();
     jrtplib::RTPTime receiveTime = packet->GetReceiveTime();
 
-    if (!mLastJitter.is_initialized())
+    if (!mLastJitter)
     {
         // First packet
         mReceiveTime = receiveTime;
@@ -55,8 +54,11 @@ void JitterStatistics::process(jrtplib::RTPPacket* packet, int rate)
         mReceiveTime = receiveTime;
         mReceiveTimestamp = timestamp;
 
-        // And mJitter are in seconds again
-        mJitter.process(mLastJitter.value() / float(rate));
+        // And mJitter are in milliseconds again
+        float jitter_s = mLastJitter.value() / (float(rate));
+        // std::cout << "Jitter (in seconds): " << std::dec << jitter_s << std::endl;
+
+        mJitter.process(jitter_s);
     }
 }
 
@@ -65,40 +67,10 @@ void JitterStatistics::process(jrtplib::RTPPacket* packet, int rate)
 
 
 Statistics::Statistics()
-    :mReceived(0), mSent(0), mReceivedRtp(0), mSentRtp(0),
-      mReceivedRtcp(0), mSentRtcp(0), mDuplicatedRtp(0), mOldRtp(0), mIllegalRtp(0),
-      mPacketLoss(0), mJitter(0.0), mAudioTime(0), mDecodedSize(0), mSsrc(0), mPacketDropped(0)
-{
-    mBitrateSwitchCounter = 0;
-    memset(mLoss, 0, sizeof mLoss);
-
-    // It is to keep track of statistics instance via grep | wc -l
-    //ICELogDebug(<< "Create statistics instance.");
-}
+{}
 
 Statistics::~Statistics()
-{
-}
-
-void Statistics::reset()
-{
-    mReceived = 0;
-    mSent = 0;
-    mReceivedRtp = 0;
-    mSentRtp = 0;
-    mReceivedRtcp = 0;
-    mSentRtcp = 0;
-    mDuplicatedRtp = 0;
-    mOldRtp = 0;
-    mPacketLoss = 0;
-    mIllegalRtp = 0;
-    mJitter = 0.0;
-    mAudioTime = 0;
-    mPacketDropped = 0;
-    mDecodedSize = 0;
-
-    memset(mLoss, 0, sizeof mLoss);
-}
+{}
 
 void Statistics::calculateBurstr(double* burstr, double* lossr) const
 {
@@ -127,7 +99,7 @@ void Statistics::calculateBurstr(double* burstr, double* lossr) const
     }
     else
         *burstr = 0;
-    //printf("total loss: %d\n", lost);
+
     if (mReceivedRtp > 0)
         *lossr = (double)((double)lost / (double)mReceivedRtp);
     else
@@ -169,17 +141,17 @@ double Statistics::calculateMos(double maximalMos) const
 
 Statistics& Statistics::operator += (const Statistics& src)
 {
-    mReceived += src.mReceived;
-    mSent += src.mSent;
-    mReceivedRtp += src.mReceivedRtp;
-    mSentRtp += src.mSentRtp;
-    mReceivedRtcp += src.mReceivedRtcp;
-    mSentRtcp += src.mSentRtcp;
-    mDuplicatedRtp += src.mDuplicatedRtp;
-    mOldRtp += src.mOldRtp;
-    mPacketLoss += src.mPacketLoss;
-    mPacketDropped += src.mPacketDropped;
-    mAudioTime += src.mAudioTime;
+    mReceived       += src.mReceived;
+    mSent           += src.mSent;
+    mReceivedRtp    += src.mReceivedRtp;
+    mSentRtp        += src.mSentRtp;
+    mReceivedRtcp   += src.mReceivedRtcp;
+    mSentRtcp       += src.mSentRtcp;
+    mDuplicatedRtp  += src.mDuplicatedRtp;
+    mOldRtp         += src.mOldRtp;
+    mPacketLoss     += src.mPacketLoss;
+    mPacketDropped  += src.mPacketDropped;
+    mAudioTime      += src.mAudioTime;
 
 
     for (auto codecStat: src.mCodecCount)
@@ -190,49 +162,49 @@ Statistics& Statistics::operator += (const Statistics& src)
             mCodecCount[codecStat.first] += codecStat.second;
     }
 
-    mJitter = src.mJitter;
-    mRttDelay = src.mRttDelay;
-    mDecodingInterval = src.mDecodingInterval;
-    mDecodeRequested = src.mDecodeRequested;
+    mJitter             = src.mJitter;
+    mRttDelay           = src.mRttDelay;
+    mDecodingInterval   = src.mDecodingInterval;
+    mDecodeRequested    = src.mDecodeRequested;
 
     if (!src.mCodecName.empty())
         mCodecName = src.mCodecName;
 
     // Find minimal
-    if (mFirstRtpTime.is_initialized())
+    if (mFirstRtpTime)
     {
-        if (src.mFirstRtpTime.is_initialized())
+        if (src.mFirstRtpTime)
         {
             if (mFirstRtpTime.value() > src.mFirstRtpTime.value())
                 mFirstRtpTime = src.mFirstRtpTime;
         }
     }
     else
-        if (src.mFirstRtpTime.is_initialized())
-            mFirstRtpTime = src.mFirstRtpTime;
+    if (src.mFirstRtpTime)
+        mFirstRtpTime = src.mFirstRtpTime;
 
-    mBitrateSwitchCounter += src.mBitrateSwitchCounter;
-    mRemotePeer = src.mRemotePeer;
-    mSsrc = src.mSsrc;
+    mBitrateSwitchCounter   += src.mBitrateSwitchCounter;
+    mRemotePeer             = src.mRemotePeer;
+    mSsrc                   = src.mSsrc;
 
     return *this;
 }
 
 Statistics& Statistics::operator -= (const Statistics& src)
 {
-    mReceived -= src.mReceived;
-    mSent -= src.mSent;
-    mReceivedRtp -= src.mReceivedRtp;
-    mIllegalRtp -= src.mIllegalRtp;
-    mSentRtp -= src.mSentRtp;
-    mReceivedRtcp -= src.mReceivedRtcp;
-    mSentRtcp -= src.mSentRtcp;
-    mDuplicatedRtp -= src.mDuplicatedRtp;
-    mOldRtp -= src.mOldRtp;
-    mPacketLoss -= src.mPacketLoss;
-    mPacketDropped -= src.mPacketDropped;
+    mReceived           -= src.mReceived;
+    mSent               -= src.mSent;
+    mReceivedRtp        -= src.mReceivedRtp;
+    mIllegalRtp         -= src.mIllegalRtp;
+    mSentRtp            -= src.mSentRtp;
+    mReceivedRtcp       -= src.mReceivedRtcp;
+    mSentRtcp           -= src.mSentRtcp;
+    mDuplicatedRtp      -= src.mDuplicatedRtp;
+    mOldRtp             -= src.mOldRtp;
+    mPacketLoss         -= src.mPacketLoss;
+    mPacketDropped      -= src.mPacketDropped;
+    mAudioTime          -= src.mAudioTime;
 
-    mAudioTime -= src.mAudioTime;
     for (auto codecStat: src.mCodecCount)
     {
         if (mCodecCount.find(codecStat.first) != mCodecCount.end())
@@ -246,13 +218,13 @@ Statistics& Statistics::operator -= (const Statistics& src)
 std::string Statistics::toString() const
 {
     std::ostringstream oss;
-    oss << "Received: "     << mReceivedRtp
-        << ", lost: "       << mPacketLoss
-        << ", dropped: "    << mPacketDropped
-        << ", sent: "       << mSentRtp
-        << ", decoding interval: " << mDecodingInterval.average()
-        << ", decode requested: " << mDecodeRequested.average()
-        << ", packet interval: " << mPacketInterval.average();
+    oss << "Received: "             << mReceivedRtp
+        << ", lost: "               << mPacketLoss
+        << ", dropped: "            << mPacketDropped
+        << ", sent: "               << mSentRtp
+        << ", decoding interval: "  << mDecodingInterval.average()
+        << ", decode requested: "   << mDecodeRequested.average()
+        << ", packet interval: "    << mPacketInterval.average();
 
     return oss.str();
 }

src/engine/media/MT_Statistics.h

@@ -3,15 +3,17 @@
 
 #include <chrono>
 #include <map>
+#include <optional>
+#include <array>
 
 #include "audio/Audio_DataWindow.h"
 #include "helper/HL_Optional.hpp"
 #include "helper/HL_Statistics.h"
+#include "helper/HL_Types.h"
 
 #include "jrtplib/src/rtptimeutilities.h"
 #include "jrtplib/src/rtppacket.h"
 
-using std::experimental::optional;
 
 namespace MT
 {
@@ -33,59 +35,56 @@ public:
 
 protected:
     // Jitter calculation
-    jrtplib::RTPTime mReceiveTime = jrtplib::RTPTime(0,0);
+    jrtplib::RTPTime        mReceiveTime = jrtplib::RTPTime(0,0);
 
     // Last timestamp from packet in units
-    uint32_t mReceiveTimestamp = 0;
+    uint32_t                mReceiveTimestamp = 0;
 
     // It is classic jitter value in units
-    optional<float> mLastJitter;
+    std::optional<float>    mLastJitter;
 
     // Some statistics for jitter value in seconds
-    TestResult<float> mJitter;
+    TestResult<float>       mJitter;
 
     // Maximal delta in seconds
-    float mMaxDelta = 0.0f;
+    float                   mMaxDelta = 0.0f;
 };
 
 class Statistics
 {
 public:
-    size_t      mReceived,        // Received traffic in bytes
-                mSent,            // Sent traffic in bytes
-                mReceivedRtp,     // Number of received rtp packets
-                mSentRtp,         // Number of sent rtp packets
-                mReceivedRtcp,    // Number of received rtcp packets
-                mSentRtcp,        // Number of sent rtcp packets
-                mDuplicatedRtp,   // Number of received duplicated rtp packets
-                mOldRtp,          // Number of late rtp packets
-                mPacketLoss,      // Number of lost packets
-                mPacketDropped,   // Number of dropped packets (due to time unsync when playing)б
-                mIllegalRtp;      // Number of rtp packets with bad payload type
+    size_t                      mReceived = 0,        // Received traffic in bytes
+                                mSent = 0,            // Sent traffic in bytes
+                                mReceivedRtp = 0,     // Number of received rtp packets
+                                mSentRtp = 0,         // Number of sent rtp packets
+                                mReceivedRtcp = 0,    // Number of received rtcp packets
+                                mSentRtcp = 0,        // Number of sent rtcp packets
+                                mDuplicatedRtp = 0,   // Number of received duplicated rtp packets
+                                mOldRtp = 0,          // Number of late rtp packets
+                                mPacketLoss = 0,      // Number of lost packets
+                                mPacketDropped = 0,   // Number of dropped packets (due to time unsync when playing)б
+                                mIllegalRtp = 0;      // Number of rtp packets with bad payload type
 
-    TestResult<float> mDecodingInterval, // Average interval on call to packet decode
-                      mDecodeRequested,  // Average amount of requested audio frames to play
-                      mPacketInterval;   // Average interval between packet adding to jitter buffer
+    TestResult<float>           mDecodingInterval,      // Average interval on call to packet decode
+                                mDecodeRequested,       // Average amount of requested audio frames to play
+                                mPacketInterval;        // Average interval between packet adding to jitter buffer
 
-    int         mLoss[128];       // Every item is number of loss of corresping length
-    size_t      mAudioTime;       // Decoded/found time in milliseconds
-    size_t      mDecodedSize;     // Number of decoded bytes
-    uint16_t    mSsrc;            // Last known SSRC ID in a RTP stream
-    ice::NetworkAddress mRemotePeer; // Last known remote RTP address
+    std::array<float, 128>      mLoss = {0};            // Every item is number of loss of corresping length
+    size_t                      mAudioTime = 0;         // Decoded/found time in milliseconds
+    size_t                      mDecodedSize = 0;       // Number of decoded bytes
+    uint16_t                    mSsrc = 0;              // Last known SSRC ID in a RTP stream
+    ice::NetworkAddress         mRemotePeer;            // Last known remote RTP address
 
     // AMR codec bitrate switch counter
-    int       mBitrateSwitchCounter;
-
-    std::string mCodecName;
-
-    float     mJitter;          // Jitter
-
-    TestResult<float> mRttDelay; // RTT delay
+    int                         mBitrateSwitchCounter = 0;
+    std::string                 mCodecName;
+    float                       mJitter = 0.0f;          // Jitter
+    TestResult<float>           mRttDelay; // RTT delay
 
     // Timestamp when first RTP packet has arrived
-    optional<std::chrono::system_clock::time_point> mFirstRtpTime;
+    std::optional<timepoint_t>  mFirstRtpTime;
 
-    std::map<int, int> mCodecCount;          // Stats on used codecs
+    std::map<int, int>          mCodecCount;          // Stats on used codecs
 
     // It is to calculate network MOS
     void calculateBurstr(double* burstr, double* loss) const;
@@ -98,11 +97,7 @@ public:
     Statistics& operator += (const Statistics& src);
     Statistics& operator -= (const Statistics& src);
 
-    float mNetworkMos = 0.0;
-#if defined(USE_PVQA_LIBRARY) && !defined(PVQA_SERVER)
-    float mPvqaMos = 0.0;
-    std::string mPvqaReport;
-#endif
+    float mNetworkMos = 0.0f;
 
     std::string toString() const;
 };

src/engine/media/MT_WebRtc.cpp

@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "../config.h"
+#include "../engine_config.h"
 #include "MT_WebRtc.h"
 #include "../helper/HL_Exception.h"
 

src/libs/fmt/.clang-format

@@ -0,0 +1,8 @@
+# Run manually to reformat a file:
+# clang-format -i --style=file <file>
+Language: Cpp
+BasedOnStyle: Google
+IndentPPDirectives: AfterHash
+IndentCaseLabels: false
+AlwaysBreakTemplateDeclarations: false
+DerivePointerAlignment: false

src/libs/fmt/.github/issue_template.md

@@ -0,0 +1,6 @@
+<!--
+Please make sure that the problem reproduces on the current master before
+submitting an issue.
+If possible please provide a repro on Compiler Explorer:
+https://godbolt.org/z/fxccbh53W.
+-->

src/libs/fmt/.github/pull_request_template.md

@@ -0,0 +1,6 @@
+<!--
+Please read the contribution guidelines before submitting a pull request:
+https://github.com/fmtlib/fmt/blob/master/CONTRIBUTING.md.
+By submitting this pull request, you agree that your contributions are licensed
+under the {fmt} license, and agree to future changes to the licensing.
+-->

src/libs/fmt/.github/workflows/doc.yml

@@ -0,0 +1,27 @@
+name: doc
+
+on: [push, pull_request]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    # Use Ubuntu 20.04 because doxygen 1.8.13 from Ubuntu 18.04 is broken.
+    runs-on: ubuntu-20.04
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Create Build Environment
+      run: |
+        sudo apt update
+        sudo apt install doxygen python3-virtualenv
+        sudo npm install -g less clean-css
+        cmake -E make_directory ${{runner.workspace}}/build
+
+    - name: Build
+      working-directory: ${{runner.workspace}}/build
+      env:
+        KEY: ${{secrets.KEY}}
+      run: $GITHUB_WORKSPACE/support/build-docs.py

src/libs/fmt/.github/workflows/linux.yml

@@ -0,0 +1,94 @@
+name: linux
+
+on: [push, pull_request]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        cxx: [g++-4.8, g++-10, clang++-9]
+        build_type: [Debug, Release]
+        std: [11]
+        os: [ubuntu-18.04]
+        include:
+          - cxx: g++-4.8
+            install: sudo apt install g++-4.8
+            os: ubuntu-18.04
+          - cxx: g++-8
+            build_type: Debug
+            std: 14
+            install: sudo apt install g++-8
+            os: ubuntu-18.04
+          - cxx: g++-8
+            build_type: Debug
+            std: 17
+            install: sudo apt install g++-8
+            os: ubuntu-18.04
+          - cxx: g++-10
+            build_type: Debug
+            std: 17
+            os: ubuntu-18.04
+          - cxx: g++-11
+            build_type: Debug
+            std: 20
+            os: ubuntu-20.04
+            install: sudo apt install g++-11
+          - cxx: clang++-8
+            build_type: Debug
+            std: 17
+            cxxflags: -stdlib=libc++
+            os: ubuntu-18.04
+            install: sudo apt install clang-8 libc++-8-dev libc++abi-8-dev
+          - cxx: clang++-9
+            build_type: Debug
+            fuzz: -DFMT_FUZZ=ON -DFMT_FUZZ_LINKMAIN=ON
+            std: 17
+            os: ubuntu-18.04
+          - cxx: clang++-11
+            build_type: Debug
+            std: 20
+            os: ubuntu-20.04
+          - cxx: clang++-11
+            build_type: Debug
+            std: 20
+            cxxflags: -stdlib=libc++
+            os: ubuntu-20.04
+            install: sudo apt install libc++-11-dev libc++abi-11-dev
+          - shared: -DBUILD_SHARED_LIBS=ON
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Create Build Environment
+      run: |
+        ${{matrix.install}}
+        sudo apt update
+        sudo apt install locales-all
+        cmake -E make_directory ${{runner.workspace}}/build
+
+    - name: Configure
+      working-directory: ${{runner.workspace}}/build
+      env:
+        CXX: ${{matrix.cxx}}
+        CXXFLAGS: ${{matrix.cxxflags}}
+      run: |
+        cmake -DCMAKE_BUILD_TYPE=${{matrix.build_type}} ${{matrix.fuzz}} ${{matrix.shared}} \
+              -DCMAKE_CXX_STANDARD=${{matrix.std}} -DFMT_DOC=OFF \
+              -DCMAKE_CXX_VISIBILITY_PRESET=hidden -DCMAKE_VISIBILITY_INLINES_HIDDEN=ON \
+              -DFMT_PEDANTIC=ON -DFMT_WERROR=ON $GITHUB_WORKSPACE
+
+    - name: Build
+      working-directory: ${{runner.workspace}}/build
+      run: |
+        threads=`nproc`
+        cmake --build . --config ${{matrix.build_type}} --parallel $threads
+
+    - name: Test
+      working-directory: ${{runner.workspace}}/build
+      run: ctest -C ${{matrix.build_type}}
+      env:
+        CTEST_OUTPUT_ON_FAILURE: True