- optimize audio file reading

# Conflicts:
#	src/CMakeLists.txt

.gitlab-ci.yml

@@ -1,8 +0,0 @@
-build_exe:
-    script:
-        - mkdir -p build
-        - cd build
-        - git clone https://gitlab.com/dmytro.bogovych/libraries.git
-        - cmake -D LIB_PLATFORM=libraries ../src
-        - cmake --build .
-        

.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}')

run_ci.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+SEND_MSG="/var/ci/conformance_ci/send_telegram_message.py"
+
+mkdir -p build
+cd build
+
+# Configure
+cmake ../src
+if [ $? -ne 0 ]; then
+   /usr/bin/python3 $SEND_MSG "rtphone cmake failed. $BUILD_URL"
+   exit 1
+fi
+
+# Build
+make -j2
+
+if [ $? -ne 0 ]; then
+    /usr/bin/python3 $SEND_MSG "rtphone build failed. $BUILD_URL"
+    exit 1
+fi
+
+/usr/bin/python3 $SEND_MSG "rtphone builds ok. $BUILD_URL"

src/CMakeLists.txt

@@ -1,215 +1,361 @@
+cmake_minimum_required(VERSION 3.20)
 project(rtphone)
 
-cmake_minimum_required(VERSION 3.0)
+# Rely on C++ 20
- 
+set (CMAKE_CXX_STANDARD 20)
-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)
 set (CMAKE_CXX_STANDARD_REQUIRED ON)
 
-set (rtphone_libs libs)
+set (L libs)
-set (rtphone_engine engine)
+set (E engine)
 
-set (USE_AMR_CODEC       OFF CACHE BOOL "Use AMR codec. Requires libraries.")
+option (USE_AMR_CODEC   "Use AMR codec. Requires libraries."    ON)
-set (USE_EVS_CODEC       OFF CACHE BOOL "Use EVS codec."                    )
+option (USE_EVS_CODEC   "Use EVS codec."                        ON)
-set (USE_OPUS_CODEC      OFF CACHE BOOL "Use Opus codec."                   )
+option (USE_OPUS_CODEC  "Use Opus codec."                       ON)
-set (USE_PVQA_LIB        OFF CACHE BOOL "Build with Sevana PVQA library"    )
+option (USE_MUSL        "Build with MUSL library"               OFF)
-set (USE_AQUA_LIB        OFF CACHE BOOL "Build with Sevana AQuA library"    )
 
 # 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 (USE_AQUA_LIB)
+# 
-    message("Use AQuA library")
+if (CMAKE_SYSTEM MATCHES "Android")
-    add_definitions( -DUSE_AQUA_LIBRARY )
+    message("Adding the Oboe library")
-    include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libs/pvqa/include)
+    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_PVQA_LIBRARY)
+if (USE_MUSL)
-    message("Use PVQA libraries")
+    set (DEFINES ${DEFINES} -DTARGET_MUSL)
-    add_definitions( -DUSE_PVQA_LIBRARY )
+    set (TARGET_MUSL ON)
-    include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libs/pvqa/include)
 endif()
 
 set (RTPHONE_SOURCES
-    ${rtphone_engine}/media/MT_Statistics.cpp
+    ${E}/engine_config.h
-    ${rtphone_engine}/media/MT_WebRtc.cpp
+    ${E}/media/MT_Statistics.cpp
-    ${rtphone_engine}/media/MT_Stream.cpp
+    ${E}/media/MT_WebRtc.cpp
-    ${rtphone_engine}/media/MT_SrtpHelper.cpp
+    ${E}/media/MT_Stream.cpp
-    ${rtphone_engine}/media/MT_SingleAudioStream.cpp
+    ${E}/media/MT_SrtpHelper.cpp
-    ${rtphone_engine}/media/MT_NativeRtpSender.cpp
+    ${E}/media/MT_SingleAudioStream.cpp
-    ${rtphone_engine}/media/MT_Dtmf.cpp
+    ${E}/media/MT_NativeRtpSender.cpp
-    ${rtphone_engine}/media/MT_CodecList.cpp
+    ${E}/media/MT_Dtmf.cpp
-    ${rtphone_engine}/media/MT_Codec.cpp
+    ${E}/media/MT_CodecList.cpp
-    ${rtphone_engine}/media/MT_Box.cpp
+    ${E}/media/MT_Codec.cpp
-    ${rtphone_engine}/media/MT_AudioStream.cpp
+    ${E}/media/MT_Box.cpp
-    ${rtphone_engine}/media/MT_AudioReceiver.cpp
+    ${E}/media/MT_AudioStream.cpp
-    ${rtphone_engine}/media/MT_AudioCodec.cpp
+    ${E}/media/MT_AudioReceiver.cpp
-    ${rtphone_engine}/media/MT_CngHelper.cpp
+    ${E}/media/MT_AudioCodec.cpp
-    ${rtphone_engine}/agent/Agent_Impl.cpp
+    ${E}/media/MT_CngHelper.cpp
-    ${rtphone_engine}/agent/Agent_AudioManager.cpp
+    ${E}/agent/Agent_Impl.cpp
-    ${rtphone_engine}/endpoint/EP_Account.cpp
+    ${E}/agent/Agent_Impl.h
-    ${rtphone_engine}/endpoint/EP_AudioProvider.cpp
+    ${E}/agent/Agent_AudioManager.cpp
-    ${rtphone_engine}/endpoint/EP_DataProvider.cpp
+    ${E}/agent/Agent_AudioManager.h
-    ${rtphone_engine}/endpoint/EP_Engine.cpp
+    ${E}/endpoint/EP_Account.cpp
-    ${rtphone_engine}/endpoint/EP_NetworkQueue.cpp
+    ${E}/endpoint/EP_Account.h
-    ${rtphone_engine}/endpoint/EP_Observer.cpp
+    ${E}/endpoint/EP_AudioProvider.cpp
-    ${rtphone_engine}/endpoint/EP_Session.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
+    ${E}/media/MT_Statistics.h
-    ${rtphone_engine}/media/MT_WebRtc.h
+    ${E}/media/MT_WebRtc.h
-    ${rtphone_engine}/media/MT_Stream.h
+    ${E}/media/MT_Stream.h
-    ${rtphone_engine}/media/MT_SrtpHelper.h
+    ${E}/media/MT_SrtpHelper.h
-    ${rtphone_engine}/media/MT_SingleAudioStream.h
+    ${E}/media/MT_SingleAudioStream.h
-    ${rtphone_engine}/media/MT_NativeRtpSender.h
+    ${E}/media/MT_NativeRtpSender.h
-    ${rtphone_engine}/media/MT_Dtmf.h
+    ${E}/media/MT_Dtmf.h
-    ${rtphone_engine}/media/MT_CodecList.h
+    ${E}/media/MT_CodecList.h
-    ${rtphone_engine}/media/MT_Codec.h
+    ${E}/media/MT_Codec.h
-    ${rtphone_engine}/media/MT_Box.h
+    ${E}/media/MT_Box.h
-    ${rtphone_engine}/media/MT_AudioStream.h
+    ${E}/media/MT_AudioStream.h
-    ${rtphone_engine}/media/MT_AudioReceiver.h
+    ${E}/media/MT_AudioReceiver.h
-    ${rtphone_engine}/media/MT_AudioCodec.h
+    ${E}/media/MT_AudioCodec.h
+    ${E}/media/MT_CngHelper.h
     
-    ${rtphone_engine}/media/MT_CngHelper.h
+    ${E}/media/MT_Statistics.cpp
-    ${rtphone_engine}/agent/Agent_Impl.h
+    ${E}/media/MT_WebRtc.cpp
-    ${rtphone_engine}/agent/Agent_AudioManager.h
+    ${E}/media/MT_Stream.cpp
-    ${rtphone_engine}/endpoint/EP_Account.h
+    ${E}/media/MT_SrtpHelper.cpp
-    ${rtphone_engine}/endpoint/EP_AudioProvider.h
+    ${E}/media/MT_SingleAudioStream.cpp
-    ${rtphone_engine}/endpoint/EP_DataProvider.h
+    ${E}/media/MT_NativeRtpSender.cpp
-    ${rtphone_engine}/endpoint/EP_Engine.h
+    ${E}/media/MT_Dtmf.cpp
-    ${rtphone_engine}/endpoint/EP_NetworkQueue.h
+    ${E}/media/MT_CodecList.cpp
-    ${rtphone_engine}/endpoint/EP_Observer.h
+    ${E}/media/MT_Codec.cpp
-    ${rtphone_engine}/endpoint/EP_Session.h
+    ${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(${L}/resiprocate)
-add_subdirectory(${rtphone_libs}/ice)
+add_subdirectory(${L}/jrtplib/src)
-add_subdirectory(${rtphone_libs}/jrtplib/src)
+add_subdirectory(${L}/libg729)
-add_subdirectory(${rtphone_libs}/libg729)
 
 if (USE_EVS_CODEC)
-    add_subdirectory(${rtphone_libs}/libevs)
+    add_subdirectory(${L}/libevs)
 endif()
 
-add_subdirectory(${rtphone_libs}/libgsm)
+add_subdirectory(${L}/libgsm)
-add_subdirectory(${rtphone_libs}/gsmhr)
+add_subdirectory(${L}/gsmhr)
-add_subdirectory(${rtphone_libs}/g722)
+add_subdirectory(${L}/g722)
-add_subdirectory(${rtphone_libs}/speexdsp)
+add_subdirectory(${L}/speexdsp)
-add_subdirectory(${rtphone_libs}/srtp)
+add_subdirectory(${L}/libsrtp)
-add_subdirectory(${rtphone_libs}/webrtc)
+add_subdirectory(${L}/webrtc)
-add_subdirectory(${rtphone_engine}/helper)
+add_subdirectory(${L}/opus)
-add_subdirectory(${rtphone_engine}/audio)
-add_subdirectory(${rtphone_engine}/media)
 
-set (LIBS ice_stack jrtplib g729_codec gsm_codec
+set (LIBS_STATIC ${LIBS_STATIC} jrtplib g729_codec gsm_codec opus
-    gsmhr_codec g722_codec srtp resiprocate helper_lib audio_lib webrtc speexdsp
+                                gsmhr_codec g722_codec srtp3 resiprocate webrtc speexdsp)
-    uuid)
-
-if (CMAKE_SYSTEM MATCHES "Win*")
-    set (LIBS ${LIBS} )
-else ()
-    set (LIBS ${LIBS} dl uuid)
-endif ()
 
 if (USE_AMR_CODEC)
-    set (LIBS ${LIBS})
+    include (${LIB_PLATFORM}/platform_libs.cmake)
-endif (USE_AMR_CODEC)
+    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()
 
-target_link_libraries(rtphone
+if (USE_EVS_CODEC)
-    ice_stack jrtplib g729_codec gsm_codec
+    message("Media: EVS codec will be included.")
-    gsmhr_codec g722_codec srtp resiprocate
+    set (DEFINES ${DEFINES} -DUSE_EVS_CODEC)
-    helper_lib
+    set (LIBS_STATIC ${LIBS_STATIC} evs_codec)
-    audio_lib
+endif()
-    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/
+        ${L}/libevs/lib_com
-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/libevs/lib_com
+        ${L}/libevs/lib_enc
-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/libevs/lib_enc
+        ${L}/libevs/lib_dec
-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/libevs/lib_dec
+        ${L}/speex/include
-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/speex/include
+        ${L}/libs/json
-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/opus/include/
-        ${CMAKE_CURRENT_SOURCE_DIR}/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)
+    if (!GAudioManager)
-    GAudioManager = std::make_shared<AudioManager>();
+        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);
+    assert(mTerminal);
-  LOCK_MANAGER;
+    LOCK_MANAGER;
 
-  ICELogInfo(<< "Start main audio with usage id " << usageId);
+    ICELogInfo(<< "Start main audio with usage id " << usageId);
 
-  if (mUsage.obtain(usageId) > 1)
+    if (mUsage.obtain(usageId) > 1)
-    return;
+        return;
 
-  if (Audio::OsEngine::instance())
+    if (Audio::OsEngine::instance())
-    Audio::OsEngine::instance()->open();
+        Audio::OsEngine::instance()->open();
 
-  if (!mAudioInput || !mAudioOutput)
+    if (!mAudioInput || !mAudioOutput)
-  {
+    {
-      // Disable AEC for now - because PVQA conflicts with speex AEC.
+        // Disable AEC for now - because PVQA conflicts with speex AEC.
-      std::shared_ptr<Audio::Enumerator> enumerator(Audio::Enumerator::make(usageId == atNull));
+        std::shared_ptr<Audio::Enumerator> enumerator(Audio::Enumerator::make(usageId == atNull));
-      if (!mTerminal->audio())
+        if (!mTerminal->audio())
-          mTerminal->setAudio(std::make_shared<Audio::DevicePair>(false, true));
+        {
+            auto audio = std::make_shared<Audio::DevicePair>();
+            audio->setAgc(true);
+            audio->setAec(false);
+            audio->setMonitoring(mAudioMonitoring);
 
-      if (!mAudioInput)
+            mTerminal->setAudio(audio);
-      {
+        }
-          enumerator->open(Audio::myMicrophone);
-          int inputIndex = enumerator->indexOfDefaultDevice();
 
-          // Construct and set to terminal's audio pair input device
+        if (!mAudioInput)
-          if (usageId != atNull)
+        {
-              mAudioInput = Audio::PInputDevice(Audio::InputDevice::make(enumerator->idAt(inputIndex)));
+            enumerator->open(Audio::myMicrophone);
-          else
+            int inputIndex = enumerator->indexOfDefaultDevice();
-              mAudioInput = Audio::PInputDevice(new Audio::NullInputDevice());
 
-          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)
+            mTerminal->audio()->setInput(mAudioInput);
-      {
+        }
-          Audio::Enumerator *enumerator = Audio::Enumerator::make(usageId == atNull);
-          enumerator->open(Audio::mySpeaker);
-          int outputIndex = enumerator->indexOfDefaultDevice();
 
-          // Construct and set terminal's audio pair output device
+        if (!mAudioOutput)
-          if (usageId != atNull)
+        {
-          {
+            Audio::Enumerator *enumerator = Audio::Enumerator::make(usageId == atNull);
-            if (outputIndex >= enumerator->count())
+            enumerator->open(Audio::mySpeaker);
-              outputIndex = 0;
+            int outputIndex = enumerator->indexOfDefaultDevice();
 
-              mAudioOutput = Audio::POutputDevice(
+            // Construct and set terminal's audio pair output device
-                      Audio::OutputDevice::make(enumerator->idAt(outputIndex)));
+            if (usageId != atNull)
-          }
+            {
-          else
+                if (outputIndex >= enumerator->count())
-              mAudioOutput = Audio::POutputDevice(new Audio::NullOutputDevice());
+                    outputIndex = 0;
 
-          mTerminal->audio()->setOutput(mAudioOutput);
+                mAudioOutput = Audio::POutputDevice(
-      }
+                    Audio::OutputDevice::make(enumerator->idAt(outputIndex)));
-  }
+            }
+            else
+                mAudioOutput = Audio::POutputDevice(new Audio::NullOutputDevice());
 
-  // Open audio
+            mTerminal->audio()->setOutput(mAudioOutput);
-  if (mAudioInput)
+        }
-    mAudioInput->open();
+    }
-  if (mAudioOutput)
+
-    mAudioOutput->open();
+    // Open audio
+    if (mAudioInput)
+        mAudioInput->open();
+    if (mAudioOutput)
+        mAudioOutput->open();
 }
 
 void AudioManager::close()
 {
-  mUsage.clear();
+    mUsage.clear();
-  if (mAudioInput)
+    if (mAudioInput)
-  {
+    {
-    mAudioInput->close();
+        mAudioInput->close();
-    mAudioInput.reset();
+        mAudioInput.reset();
-  }
+    }
 
-  if (mAudioOutput)
+    if (mAudioOutput)
-  {
+    {
-    mAudioOutput->close();
+        mAudioOutput->close();
-    mAudioOutput.reset();
+        mAudioOutput.reset();
-  }
+    }
-  mPlayer.setOutput(Audio::POutputDevice());
+    mPlayer.setOutput(Audio::POutputDevice());
 }
 
 void AudioManager::stop(int usageId)
 {
-  LOCK_MANAGER;
+    LOCK_MANAGER;
 
-  ICELogInfo( << "Stop main audio with usage id " << usageId);
+    ICELogInfo( << "Stop main audio with usage id " << usageId);
-  if (mTerminal)
+    if (mTerminal)
-  {
+    {
-    if (mTerminal->audio())
+        if (mTerminal->audio())
-      mTerminal->audio()->player().release(usageId);
+            mTerminal->audio()->player().release(usageId);
-  }
+    }
 
-  if (!mUsage.release(usageId))
+    if (!mUsage.release(usageId))
-  {
+    {
-    close();
+        close();
 
-    // Reset device pair on terminal side
+        // Reset device pair on terminal side
-    mTerminal->setAudio(Audio::PDevicePair());
+        mTerminal->setAudio(Audio::PDevicePair());
 
-    if (Audio::OsEngine::instance())
+        if (Audio::OsEngine::instance())
-      Audio::OsEngine::instance()->close();
+            Audio::OsEngine::instance()->close();
-  }
+    }
 }
 
 void AudioManager::startPlayFile(int usageId, const std::string& path, AudioTarget target, LoopMode lm, int timelimit)
 {
-  // Check if file exists
+    // Check if file exists
-  Audio::PWavFileReader r = std::make_shared<Audio::WavFileReader>();
+    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())
+    if (!r->isOpened())
-  {
+    {
-    ICELogError(<< "Cannot open file to play");
+        ICELogError(<< "Cannot open file to play");
-    return;
+        return;
-  }
+    }
 
-  // Delegate processing to existing audio device pair manager
+    // Delegate processing to existing audio device pair manager
-  mTerminal->audio()->player().add(usageId, r, lm == lmLoopAudio, timelimit);
+    mTerminal->audio()->player().add(usageId, r, lm == lmLoopAudio, timelimit);
-  start(usageId);
+    start(usageId);
 }
 
 void AudioManager::stopPlayFile(int usageId)
 {
-  stop(usageId);
+    stop(usageId);
-  mPlayer.release(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();
+    mPlayer.releasePlayed();
-  std::vector<int> ids;
+    std::vector<int> ids;
-  mTerminal->audio()->player().retrieveUsageIds(ids);
+    mTerminal->audio()->player().retrieveUsageIds(ids);
-  for (unsigned i=0; i<ids.size(); i++)
+    for (unsigned i=0; i<ids.size(); i++)
-    stop(ids[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_Ring = 1,
-  AudioPrefix_Zero,
+    AudioPrefix_Zero,
-  AudioPrefix_One,
+    AudioPrefix_One,
-  AudioPrefix_Two,
+    AudioPrefix_Two,
-  AudioPrefix_Three,
+    AudioPrefix_Three,
-  AudioPrefix_Four,
+    AudioPrefix_Four,
-  AudioPrefix_Five,
+    AudioPrefix_Five,
-  AudioPrefix_Six,
+    AudioPrefix_Six,
-  AudioPrefix_Seven,
+    AudioPrefix_Seven,
-  AudioPrefix_Eight,
+    AudioPrefix_Eight,
-  AudioPrefix_Nine,
+    AudioPrefix_Nine,
-  AudioPrefix_Asterisk,
+    AudioPrefix_Asterisk,
-  AudioPrefix_Diez
+    AudioPrefix_Diez
 };
 
 #define AudioSessionCoeff 64
@@ -37,51 +34,56 @@ enum
 class AudioManager: public Audio::Player::EndOfAudioDelegate
 {
 public:
-  AudioManager();
+    AudioManager();
-  virtual ~AudioManager();
+    virtual ~AudioManager();
 
-  static AudioManager& instance();
+    static AudioManager& instance();
 
-  // Enforces to close audio devices. Used to shutdown AudioManager on exit from application
+    // Enforces to close audio devices. Used to shutdown AudioManager on exit from application
-  void close();
+    void close();
 
-  // Terminal and settings must be available for AudioManager
+    // Terminal and settings must be available for AudioManager
-  void setTerminal(MT::Terminal* terminal);
+    void setTerminal(MT::Terminal* terminal);
-  MT::Terminal* terminal();
+    MT::Terminal* terminal();
 
-  // Start/stop methods relies on usage counter; only first start and last stop opens/closes devices actually
+    void setAudioMonitoring(Audio::DataConnection* monitoring);
-  void start(int usageId);
+    Audio::DataConnection* audioMonitoring();
-  void stop(int usageId);
 
-  enum AudioTarget
+    // Start/stop methods relies on usage counter; only first start and last stop opens/closes devices actually
-  {
+    void start(int usageId);
-    atNull,
+    void stop(int usageId);
-    atReceiver,
-    atRinger
-  };
 
-  enum LoopMode
+    enum AudioTarget
-  {
+    {
-    lmLoopAudio,
+        atNull,
-    lmNoloop
+        atReceiver,
-  };
+        atRinger
+    };
 
-  void startPlayFile(int usageId, const std::string& path, AudioTarget target, LoopMode lm, int timelimit = 0);
+    enum LoopMode
-  void stopPlayFile(int usageId);
+    {
+        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::PInputDevice mAudioInput;
-  Audio::POutputDevice mAudioOutput;
+    Audio::POutputDevice mAudioOutput;
-  Audio::Player mPlayer;
+    Audio::Player mPlayer;
-  MT::Terminal* mTerminal;
+    MT::Terminal* mTerminal;
+    Audio::DataConnection* mAudioMonitoring;
 
-  std::map<int, int> UsageMap;
+    std::map<int, int> UsageMap;
-  UsageCounter mUsage;
+    UsageCounter mUsage;
-  std::mutex mGuard;
+    std::mutex mGuard;
 };
 #endif

src/engine/agent/Agent_Impl.cpp

@@ -7,13 +7,6 @@
 #include "helper/HL_Base64.h"
 #include <fstream>
 
-#if defined(USE_PVQA_LIBRARY)
-# include "pvqa++.h"
-#endif
-
-#if defined(USE_AQUA_LIBRARY)
-# include "aqua++.h"
-#endif
 
 const std::string Status_Ok = "ok";
 const std::string Status_SessionNotFound = "session not found";
@@ -39,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)
@@ -139,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*/)
@@ -156,25 +169,14 @@ void AgentImpl::processConfig(JsonCpp::Value &d, JsonCpp::Value &answer)
 {
     std::unique_lock<std::recursive_mutex> l(mAgentMutex);
 
-#if !defined(TARGET_ANDROID) && defined(USE_PVQA_LIBRARY)
-    // It works for desktop OSes only
-    // Because Android requires special initializing procedure (valid JNI environment context)
-    std::string pvqaLicense = d["pvqa-license"].asString(), pvqaConfig = d["pvqa-config"].asString();
-    if (!pvqaLicense.empty() && !pvqaConfig.empty())
-        sevana::pvqa::initialize(pvqaLicense, pvqaConfig);
-#endif
-
-#if !defined(TARGET_ANDROID) && defined(USE_AQUA_LIBRARY)
-    std::string aquaLicense = d["aqua-license"].asString();
-    if (!aquaLicense.empty())
-        sevana::aqua::initialize(aquaLicense.c_str(), aquaLicense.size());
-#endif
-
     std::string transport = d["transport"].asString();
-    config()[CONFIG_TRANSPORT] = (transport == "any") ? 0 : (transport == "udp" ? 1 : (transport == "tcp" ? 2 : 3));
+    config()[CONFIG_TRANSPORT] = (transport == "any") ? TransportType_Any : (transport == "udp" ? TransportType_Udp : (transport == "tcp" ? TransportType_Tcp : TransportType_Tls));
     config()[CONFIG_IPV4] = d["ipv4"].asBool();
     config()[CONFIG_IPV6] = d["ipv6"].asBool();
 
+    if (transport == "tls")
+        config()[CONFIG_SIPS] = true;
+
     // Log file
     std::string logfile = d["logfile"].asString();
     ice::Logger& logger = ice::GLogger;
@@ -186,10 +188,13 @@ void AgentImpl::processConfig(JsonCpp::Value &d, JsonCpp::Value &answer)
 
     mUseNativeAudio = d["nativeaudio"].asBool();
     config()[CONFIG_OWN_DNS] = d["dns_servers"].asString();
+    config()[CONFIG_SIPS] = d["secure"].asBool();
+    config()[CONFIG_STUNSERVER_IP] = d["stun_server"].asString();
+
     answer["status"] = Status_Ok;
 }
 
-void AgentImpl::processStart(JsonCpp::Value& /*request*/, JsonCpp::Value &answer)
+void AgentImpl::processStart(JsonCpp::Value& request, JsonCpp::Value &answer)
 {
     std::unique_lock<std::recursive_mutex> l(mAgentMutex);
     if (mThread)
@@ -198,6 +203,9 @@ void AgentImpl::processStart(JsonCpp::Value& /*request*/, JsonCpp::Value &answer
         return; // Started already
     }
 
+    // Process config (can be sent via start command as well)
+    // processConfig(request, answer);
+
     // Start socket thread
     SocketHeap::instance().start();
 
@@ -222,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();
@@ -250,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;
 
@@ -332,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 = {
@@ -356,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())
+        // if (temp_path.size())
-            config += " -fau " + temp_path; */
+        //    config += " -fau " + temp_path;
 
         auto qc = std::make_shared<sevana::aqua>();
         if (!qc->is_open())
@@ -370,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
 
@@ -444,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)
+//#if defined(USE_AQUA_LIBRARY)
-    closeAqua(sessionId);
+//    closeAqua(sessionId);
-#endif
+//#endif
     answer["status"] = Status_Ok;
 }
 
@@ -470,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)
 {
@@ -515,24 +491,13 @@ void AgentImpl::processGetMediaStats(JsonCpp::Value& request, JsonCpp::Value& an
     {
         PSession session = sessionIter->second;
         VariantMap result;
-        bool includePvqa = request["include_pvqa"].asBool();
+        session->getSessionInfo(Session::InfoOptions::Detailed,
-#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,
                                 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))
@@ -555,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
@@ -643,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);
+        if (pb != std::string::npos && pe != std::string::npos && pe > pb) {
-        pb != std::string::npos && pe != std::string::npos;
+            std::string cert = pem.substr(pb, pe - pb + EndCertificate.size());
-        pb = pem.find(BeginCertificate, pb + BeginCertificate.size()), pe = pem.find(EndCertificate, pe + EndCertificate.size()))
+            addRootCert(ByteBuffer(cert.c_str(), cert.size()));
-    {
-        // Get single certificate
-        std::string cert = pem.substr(pb, pe + EndCertificate.size());
-        //int size = cert.size();
-        addRootCert(ByteBuffer(cert.c_str(), cert.size()));
 
-        // Delete processed part
+            pb = ++pe;
-        pem.erase(0, pe + EndCertificate.size());
+        }
     }
 
     answer["status"] = Status_Ok;
@@ -742,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
                     {
@@ -752,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);
-                        // Turn off recording from the stream
+                    answer["status"] = Status_Ok;
-                        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;
-                        }
-                    }
                 }
                 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)
+    /*switch (direction)
-    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)
     {
     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
@@ -961,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

@@ -13,18 +13,9 @@
 #include "Agent_AudioManager.h"
 #include <mutex>
 #include <condition_variable>
-#if defined(USE_AQUA_LIBRARY)
-# include "aqua++.h"
-#endif
 
-#if defined(USE_PVQA_LIBRARY)
-# include "pvqa++.h"
-#endif
 
-class AgentImpl: public UserAgent
+class AgentImpl: public UserAgent, public MT::Stream::MediaObserver
-#if defined(USE_AQUA_LIBRARY)
-    , public MT::Stream::MediaObserver
-#endif
 {
 protected:
   std::recursive_mutex mAgentMutex;
@@ -39,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);
@@ -82,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;
@@ -131,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_Android.h

@@ -25,7 +25,6 @@
 
 namespace Audio
 {
-
     class AndroidEnumerator: public Enumerator
     {
     public:

src/engine/audio/Audio_AndroidOboe.cpp

@@ -0,0 +1,245 @@
+#include "Audio_AndroidOboe.h"
+#include "../helper/HL_Sync.h"
+#include "../helper/HL_Log.h"
+#include <mutex>
+#include <iostream>
+#include <stdexcept>
+
+#include "../helper/HL_String.h"
+#include "../helper/HL_Time.h"
+
+#ifdef TARGET_ANDROID
+
+#define LOG_SUBSYSTEM "Audio"
+
+using namespace Audio;
+
+
+// -------------------- AndroidEnumerator -----------------------------
+
+AndroidEnumerator::AndroidEnumerator()
+{}
+
+AndroidEnumerator::~AndroidEnumerator()
+{}
+
+int AndroidEnumerator::indexOfDefaultDevice()
+{
+  return 0;
+}
+
+int AndroidEnumerator::count()
+{
+  return 1;
+}
+
+int AndroidEnumerator::idAt(int index)
+{
+  return 0;
+}
+
+std::string AndroidEnumerator::nameAt(int index)
+{
+  return "Audio";
+}
+
+void AndroidEnumerator::open(int direction)
+{}
+
+void AndroidEnumerator::close()
+{}
+
+// --------------- Input implementation ----------------
+AndroidInputDevice::AndroidInputDevice(int devId)
+{}
+
+AndroidInputDevice::~AndroidInputDevice()
+{
+  close();
+}
+
+bool AndroidInputDevice::open()
+{
+  if (active())
+    return true;
+
+  oboe::AudioStreamBuilder builder;
+  builder.setDirection(oboe::Direction::Input);
+  builder.setPerformanceMode(oboe::PerformanceMode::LowLatency);
+  builder.setSharingMode(oboe::SharingMode::Exclusive);
+  builder.setFormat(oboe::AudioFormat::I16);
+  builder.setChannelCount(oboe::ChannelCount::Mono);
+  builder.setCallback(this);
+  oboe::Result rescode = builder.openStream(&mRecordingStream);
+  if (rescode != oboe::Result::OK)
+    return false;
+
+  mDeviceRate = mRecordingStream->getSampleRate();
+  ICELogInfo(<< "Input Opened with rate " << mDeviceRate);
+  mActive = true;
+
+  rescode = mRecordingStream->requestStart();
+  if (rescode != oboe::Result::OK)
+  {
+      close();
+      mActive = false;
+  }
+  return mActive;
+}
+
+void AndroidInputDevice::close()
+{
+  // There is no check for active() value because close() can be called to cleanup after bad open() call.
+  if (mRecordingStream != nullptr)
+  {
+    mRecordingStream->close();
+    delete mRecordingStream; mRecordingStream = nullptr;
+  }
+  mActive = false;
+}
+
+oboe::DataCallbackResult
+AndroidInputDevice::onAudioReady(oboe::AudioStream *audioStream, void *audioData, int32_t numFrames)
+{
+  std::unique_lock<std::mutex> l(mMutex);
+
+  // Send data to AudioPair
+  if (mConnection)
+    mConnection->onMicData(getFormat(), audioData, numFrames);
+
+  return oboe::DataCallbackResult::Continue;
+}
+
+Format AndroidInputDevice::getFormat()
+{
+  return Format(mDeviceRate, 1);
+}
+
+bool AndroidInputDevice::active() const
+{
+  return mActive;
+}
+
+bool AndroidInputDevice::fakeMode()
+{
+  return false;
+}
+
+void AndroidInputDevice::setFakeMode(bool fakemode)
+{}
+
+int AndroidInputDevice::readBuffer(void* buffer)
+{
+  throw std::runtime_error("AndroidInputDevice::readBuffer() is not implemented.");
+}
+
+// ------------ AndroidOutputDevice -----------------
+AndroidOutputDevice::AndroidOutputDevice(int devId)
+{
+  ICELogDebug(<< "Creating AndroidOutputDevice. This is: " << strx::toHex(this));
+}
+AndroidOutputDevice::~AndroidOutputDevice()
+{
+  ICELogDebug(<< "Deleting AndroidOutputDevice.");
+  close();
+}
+
+bool AndroidOutputDevice::open()
+{
+  std::unique_lock<std::mutex> l(mMutex);
+
+  if (mActive)
+    return true;
+
+  mRequestedFrames = 0;
+  mStartTime = 0.0;
+  mEndTime = 0.0;
+
+  oboe::AudioStreamBuilder builder;
+  builder.setDirection(oboe::Direction::Output);
+  builder.setPerformanceMode(oboe::PerformanceMode::LowLatency);
+  builder.setSharingMode(oboe::SharingMode::Exclusive);
+  builder.setFormat(oboe::AudioFormat::I16);
+  builder.setChannelCount(oboe::ChannelCount::Mono);
+  // builder.setDataCallback(this);
+  builder.setCallback(this);
+  //builder.setErrorCallback(this)
+
+  oboe::Result rescode = builder.openStream(&mPlayingStream);
+  if (rescode != oboe::Result::OK)
+    return false;
+
+  mDeviceRate = mPlayingStream->getSampleRate();
+  ICELogInfo(<< "Input Opened with rate " << mDeviceRate);
+  mActive = true;
+
+  rescode = mPlayingStream->requestStart();
+  if (rescode != oboe::Result::OK)
+  {
+      close();
+      mActive = false;
+  }
+  return mActive;
+}
+
+void AndroidOutputDevice::close()
+{
+  std::unique_lock<std::mutex> l(mMutex);
+  if (!mActive)
+    return;
+
+  if (mPlayingStream != nullptr)
+  {
+    mPlayingStream->close();
+    delete mPlayingStream; mPlayingStream = nullptr;
+  }
+  mEndTime = now_ms();
+  mActive = false;
+
+  ICELogInfo(<< "For time " << mEndTime - mStartTime << " ms was requested "
+             << float(mRequestedFrames) / getFormat().mRate * 1000 << " ms");
+}
+
+Format AndroidOutputDevice::getFormat()
+{
+  return {mDeviceRate, 1};
+}
+
+bool AndroidOutputDevice::fakeMode()
+{
+  return false;
+}
+
+void AndroidOutputDevice::setFakeMode(bool /*fakemode*/)
+{
+}
+
+oboe::DataCallbackResult AndroidOutputDevice::onAudioReady(oboe::AudioStream *audioStream, void *audioData, int32_t numFrames)
+{
+  if (mInShutdown)
+    return oboe::DataCallbackResult::Stop;
+
+  if (mStartTime == 0.0)
+    mStartTime = now_ms();
+
+  // Ask producer about data
+  memset(audioData, 0, numFrames * 2);
+  if (mConnection)
+  {
+    Format f = getFormat();
+    if (f.mRate != 0)
+      mConnection->onSpkData(f, audioData, numFrames * 2);
+  }
+  mRequestedFrames += numFrames;
+
+  return oboe::DataCallbackResult::Continue;
+}
+
+// TODO - special case https://github.com/google/oboe/blob/master/docs/notes/disconnect.md
+void AndroidOutputDevice::onErrorAfterClose(oboe::AudioStream *stream, oboe::Result result) {
+  if (result == oboe::Result::ErrorDisconnected) {
+    // LOGI("Restarting AudioStream after disconnect");
+    // soundEngine.restart(); // please check oboe samples for soundEngine.restart(); call
+  }
+}
+#endif // TARGET_ANDROID

src/engine/audio/Audio_AndroidOboe.h

@@ -0,0 +1,109 @@
+/* Copyright(C) 2007-2017 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 __AUDIO_ANDROID_OBOE_H
+#define __AUDIO_ANDROID_OBOE_H
+
+#ifdef TARGET_ANDROID
+
+#include "Audio_Interface.h"
+#include "Audio_Helper.h"
+#include "Audio_Resampler.h"
+#include "Audio_DataWindow.h"
+#include "../helper/HL_Pointer.h"
+#include "../helper/HL_ByteBuffer.h"
+#include "../helper/HL_Exception.h"
+#include "../helper/HL_Statistics.h"
+
+#include <memory>
+#include <string>
+
+#include "oboe/Oboe.h"
+
+namespace Audio
+{
+    class AndroidEnumerator: public Enumerator
+    {
+    public:
+        AndroidEnumerator();
+        ~AndroidEnumerator();
+
+        void open(int direction);
+        void close();
+
+        int count();
+        std::string nameAt(int index);
+        int idAt(int index);
+        int indexOfDefaultDevice();
+
+    protected:
+    };
+
+    class AndroidInputDevice: public InputDevice, public oboe::AudioStreamCallback
+    {
+    public:
+        AndroidInputDevice(int devId);
+        ~AndroidInputDevice();
+
+        bool open();
+        void close();
+        Format getFormat();
+
+        bool fakeMode();
+        void setFakeMode(bool fakemode);
+        int readBuffer(void* buffer);
+        bool active() const;
+
+        oboe::DataCallbackResult
+        onAudioReady(oboe::AudioStream *audioStream, void *audioData, int32_t numFrames);
+
+
+    protected:
+        bool mActive = false;
+        oboe::AudioStream* mRecordingStream = nullptr;
+        PResampler mResampler;
+        DataWindow mDeviceRateCache, mSdkRateCache;
+        int mDeviceRate; // Actual rate of opened recorder
+        int mBufferSize; // Size of buffer used for recording (at native sample rate)
+        DataWindow mRecorderBuffer;
+        std::condition_variable mDataCondVar;
+        int mRecorderBufferIndex;
+        std::mutex mMutex;
+    };
+
+class AndroidOutputDevice: public OutputDevice, public oboe::AudioStreamCallback
+    {
+    public:
+        AndroidOutputDevice(int devId);
+        ~AndroidOutputDevice();
+
+        bool open();
+        void close();
+        Format getFormat();
+
+        bool fakeMode();
+        void setFakeMode(bool fakemode);
+
+        oboe::DataCallbackResult onAudioReady(oboe::AudioStream *audioStream, void *audioData, int32_t numFrames);
+        void onErrorAfterClose(oboe::AudioStream *stream, oboe::Result result);
+
+        protected:
+        std::mutex mMutex;
+        int mDeviceRate = 0;
+        oboe::AudioStream* mPlayingStream = nullptr;
+        DataWindow mPlayBuffer;
+        int mBufferIndex = 0, mBufferSize = 0;
+        bool mInShutdown = false;
+        bool mActive = false;
+
+        // Statistics
+        float mRequestedFrames = 0.0, mStartTime = 0.0, mEndTime = 0.0;
+    };
+}
+
+#endif // TARGET_ANDROID
+
+#endif // __AUDIO_ANDROID_H

src/engine/audio/Audio_DataWindow.cpp

@@ -10,163 +10,171 @@ using namespace Audio;
 
 DataWindow::DataWindow()
 {
-  mFilled = 0;
+    mFilled = 0;
-  mData = NULL;
+    mData = NULL;
-  mCapacity = 0;
+    mCapacity = 0;
 }
 
 DataWindow::~DataWindow()
 {
-  if (mData)
+    if (mData)
-    free(mData);
+        free(mData);
 }
 
 void DataWindow::setCapacity(int capacity)
 {
-  Lock l(mMutex);
+    Lock l(mMutex);
-  int tail  = capacity - mCapacity;
+    int tail  = capacity - mCapacity;
-  mData = (char*)realloc(mData, capacity);
+    mData = (char*)realloc(mData, capacity);
-  if (tail > 0)
+    if (tail > 0)
-    memset(mData + mCapacity, 0, tail);
+        memset(mData + mCapacity, 0, tail);
-  mCapacity = capacity;
+    mCapacity = capacity;
 }
 
 void DataWindow::addZero(int length)
 {
-  Lock l(mMutex);
+    Lock l(mMutex);
 
-  if (length > mCapacity)
+    if (length > mCapacity)
-    length = mCapacity;
+        length = mCapacity;
 
-  int avail = mCapacity - mFilled;
+    int avail = mCapacity - mFilled;
 
-  if (avail < length)
+    if (avail < length)
-  {
+    {
-    memmove(mData, mData + length - avail, mFilled - (length - avail));
+        memmove(mData, mData + length - avail, mFilled - (length - avail));
-    mFilled -= length - avail;
+        mFilled -= length - avail;
-  }
+    }
-  memset(mData + mFilled, 0, length);
+    memset(mData + mFilled, 0, length);
-  mFilled += length;
+    mFilled += length;
 }
 
 
 void DataWindow::add(const void* data, int length)
 {
-  Lock l(mMutex);
+    Lock l(mMutex);
 
-  if (length > mCapacity)
+    if (length > mCapacity)
-  {
+    {
-    data = (char*)data + length - mCapacity;
+        // Use latest bytes from data buffer in this case.
-    length = mCapacity;
+        data = (char*)data + length - mCapacity;
-  }
+        length = mCapacity;
+    }
 
-  int avail = mCapacity - mFilled;
+    // Check how much free space we have
+    int avail = mCapacity - mFilled;
 
-  if (avail < length)
+    if (avail < length)
-  {
+    {
-    memmove(mData, mData + length - avail, mFilled - (length - avail));
+        // Find the portion of data to move & save
-    mFilled -= length - avail;
+        int delta = length - avail;
-  }
+
-  memcpy(mData + mFilled, data, length);
+        // Move the data
-  mFilled += length;
+        if (mFilled - delta > 0)
+            memmove(mData, mData + delta, mFilled - delta);
+        mFilled -= delta;
+    }
+
+    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);
+    Lock l(mMutex);
-  if (length > mFilled)
+    if (length > mFilled)
-    length = mFilled;
+        length = mFilled;
-  if (length != mFilled)
+    if (length != mFilled)
-    memmove(mData, mData + length, mFilled - length);
+        memmove(mData, mData + length, mFilled - 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);
+    Lock l(mMutex);
-  mFilled = 0;
+    mFilled = 0;
 }
 
 short DataWindow::shortAt(int index) const
 {
-  Lock l(mMutex);
+    Lock l(mMutex);
-  assert(index < mFilled / 2);
+    assert(index < mFilled / 2);
-  return ((short*)mData)[index];
+    return ((short*)mData)[index];
 }
 
 void DataWindow::setShortAt(short value, int index)
 {
-  Lock l(mMutex);
+    Lock l(mMutex);
-  assert(index < mFilled / 2);
+    assert(index < mFilled / 2);
-  ((short*)mData)[index] = value;
+    ((short*)mData)[index] = value;
 }
 
 int DataWindow::read(void* buffer, int length)
 {
-  Lock l(mMutex);
+    Lock l(mMutex);
-  if (length > mFilled)
+    if (length > mFilled)
-    length = mFilled;
+        length = mFilled;
-  if (length)
+    if (length)
-  {
+    {
-    if (buffer)
+        if (buffer)
-      memcpy(buffer, mData, length);
+            memcpy(buffer, mData, length);
-    if (length < mFilled)
+        if (length < mFilled)
-      memmove(mData, mData+length, mFilled - length);
+            memmove(mData, mData+length, mFilled - length);
-    mFilled -= length;
+        mFilled -= length;
-  }
+    }
-  return length;
+    return length;
 }
 
 int DataWindow::filled() const
 {
-  Lock l(mMutex);
+    Lock l(mMutex);
-  return mFilled;
+    return mFilled;
 }
 
 void DataWindow::setFilled(int filled)
 {
-  Lock l(mMutex);
+    Lock l(mMutex);
-  mFilled = filled;
+    mFilled = filled;
 }
 
 int DataWindow::capacity() const
 {
-  Lock l(mMutex);
+    Lock l(mMutex);
-  return mCapacity;
+    return mCapacity;
 }
 
 void DataWindow::zero(int length)
 {
-  Lock l(mMutex);
+    Lock l(mMutex);
-  assert(length <= mCapacity);
+    assert(length <= mCapacity);
-  mFilled = length;
+    mFilled = length;
-  memset(mData, 0, mFilled);
+    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);
+    dst.setCapacity(src.filled()*2);
-  short* input = (short*)src.mutableData();
+    short* input = (short*)src.mutableData();
-  short* output = (short*)dst.mutableData();
+    short* output = (short*)dst.mutableData();
 
-  for (int i=0; i<src.filled()/2; i++)
+    for (int i=0; i<src.filled()/2; i++)
-    output[i*2] = output[i*2+1] = input[i];
+        output[i*2] = output[i*2+1] = input[i];
-  dst.mFilled = src.filled() * 2;
+    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)
+DevicePair::DevicePair()
-:mConfig(NULL), mDelegate(NULL), mAec(aec), mAgc(agc), mAecFilter(AUDIO_MIC_BUFFER_LENGTH*10, AUDIO_MIC_BUFFER_LENGTH, AUDIO_SAMPLERATE), mAgcFilter(AUDIO_CHANNELS)
+: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;
@@ -185,6 +228,7 @@ void DevicePair::onSpkData(const Format& f, void* buffer, int length)
     {
       memset(mOutput10msBuffer.mutableData(), 0, (size_t)mOutput10msBuffer.capacity());
 
+      // Ask audio data on main AUDIO_SAMPLERATE frequency
       if (mDelegate)
         mDelegate->onSpkData(Format(), mOutput10msBuffer.mutableData(), mOutput10msBuffer.capacity());
 
@@ -197,8 +241,12 @@ void DevicePair::onSpkData(const Format& f, void* buffer, int length)
 
       // Resample these 10 milliseconds it to native format
       size_t wasProcessed = 0;
-      size_t wasProduced = mSpkResampler.resample(AUDIO_SAMPLERATE, mOutput10msBuffer.data(), mOutput10msBuffer.capacity(), wasProcessed, f.mRate,
+      size_t wasProduced = mSpkResampler.resample(Format().mRate,
-                                               mOutputNativeData.mutableData() + mOutputNativeData.filled(), mOutputNativeData.capacity() - mOutputNativeData.filled());
+                                                  mOutput10msBuffer.data(),
+                                                  mOutput10msBuffer.capacity(),
+                                                  wasProcessed, f.mRate,
+                                               mOutputNativeData.mutableData() + mOutputNativeData.filled(),
+                                               mOutputNativeData.capacity() - mOutputNativeData.filled());
       mOutputNativeData.setFilled(mOutputNativeData.filled() + wasProduced);
 #ifdef CONSOLE_LOGGING
       printf("Resampled %d to %d\n", wasProcessed, wasProduced);
@@ -206,7 +254,7 @@ void DevicePair::onSpkData(const Format& f, void* buffer, int length)
     }
   }
 
-  assert(mOutputNativeData.filled() >= length);
+  // assert(mOutputNativeData.filled() >= length);
 #ifdef DUMP_NATIVEOUTPUT
   if (mNativeOutputDump)
     mNativeOutputDump->write(mOutputNativeData.data(), length);
@@ -214,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.
@@ -224,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.cpp

@@ -146,7 +146,8 @@ OsEngine* OsEngine::instance()
 #endif
 
 #ifdef TARGET_ANDROID
-    return &OpenSLEngine::instance();
+    return nullptr; // As we use Oboe library for now
+    //return &OpenSLEngine::instance();
 #endif
 
     return nullptr;

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"
 
@@ -216,48 +216,52 @@ void Mixer::mix()
 			channelList[activeCounter++] = &mChannelList[i];
 	
   // No active channels - nothing to mix - exit
-	if (!activeCounter)
+  if (!activeCounter)
   {
-    //ICELogDebug(<< "No active channel");
+    // ICELogDebug(<< "No active channel");
     return;
   }
 	
 	// Optimized versions for 1&  2  active channels
   if (activeCounter == 1)
-	{
+  {
-		// Copy much samples as we have
+    // Copy much samples as we have
     Stream& audio = *channelList[0];
-		mOutput.add(audio.data().data(), audio.data().filled());
+
-		audio.data().erase(audio.data().filled());
+    // Copy the decoded data
+    mOutput.add(audio.data().data(), audio.data().filled());
+
+	// Erase copied audio samples
+	audio.data().erase(audio.data().filled());
     //ICELogSpecial(<<"Length of mixer stream " << audio.data().filled());
-	}
+  }
   else	
-	if (activeCounter == 2)
+  if (activeCounter == 2)
-	{
+  {
     Stream& audio1 = *channelList[0];
-		Stream& audio2 = *channelList[1];
+	Stream& audio2 = *channelList[1];
-		int filled1 = audio1.data().filled() / 2, filled2 = audio2.data().filled() / 2;
+	int filled1 = audio1.data().filled() / 2, filled2 = audio2.data().filled() / 2;
     int available = filled1 > filled2 ? filled1 : filled2;
 		
-		// Find how much samples can be mixed
+	// Find how much samples can be mixed
-		int filled = mOutput.filled() / 2;
+	int filled = mOutput.filled() / 2;
 		
     int maxsize = mOutput.capacity() / 2;
-		if (maxsize - filled < available)
+	if (maxsize - filled < available)
-			available = maxsize - filled;
+      available = maxsize - filled;
 		
-		short sample = 0;
+	short sample = 0;
-		for (int i=0; i<available; i++)
+	for (int i=0; i<available; i++)
-		{
+	{
       short sample1 = filled1 > i ? audio1.data().shortAt(i) : 0;
       short sample2 = filled2 > i ? audio2.data().shortAt(i) : 0;
       sample = (abs(sample1) > abs(sample2)) ? sample1 : sample2;
 
       mOutput.add(sample);
-		}
-		audio1.data().erase(available*2);
-		audio2.data().erase(available*2);
 	}
+    audio1.data().erase(available*2);
+	audio2.data().erase(available*2);
+  }
   else
   {
     do

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_Player.cpp

@@ -1,14 +1,18 @@
-/* Copyright(C) 2007-2014 VoIP objects (voipobjects.com)
+/* Copyright(C) 2007-2021 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 "Audio_Player.h"
 
+#include "../helper/HL_Log.h"
+
+#define LOG_SUBSYSTEM "Player"
+
 using namespace Audio;
 // -------------- Player -----------
 Player::Player()
-:mDelegate(NULL), mPlayedTime(0)
+:mDelegate(nullptr), mPlayedTime(0)
 {
 }
 
@@ -99,7 +103,7 @@ void Player::onFilePlayed()
 void Player::obtain(int usage)
 {
   Lock l(mGuard);
-  UsageMap::iterator usageIter = mUsage.find(usage);
+  auto usageIter = mUsage.find(usage);
   if (usageIter == mUsage.end())
     mUsage[usage] = 1;
   else
@@ -132,7 +136,7 @@ int Player::releasePlayed()
 {
   Lock l(mGuard);
   int result = mFinishedUsages.size();
-  while (mFinishedUsages.size())
+  while (!mFinishedUsages.empty())
   {
     release(mFinishedUsages.front());
     mFinishedUsages.erase(mFinishedUsages.begin());

src/engine/audio/Audio_Player.h

@@ -1,4 +1,4 @@
-/* Copyright(C) 2007-2014 VoIP objects (voipobjects.com)
+/* Copyright(C) 2007-2021 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/. */
@@ -8,6 +8,7 @@
 
 #include "../helper/HL_Log.h"
 #include "../helper/HL_Sync.h"
+#include "../helper/HL_Statistics.h"
 #include "Audio_Interface.h"
 #include <deque>
 #include <map>
@@ -48,15 +49,18 @@ namespace Audio
     void onMicData(const Format& f, const void* buffer, int length);
     void onSpkData(const Format& f, void* buffer, int length);
     void onFilePlayed();
-    void scheduleRelease();
     void obtain(int usageId);
+
   public:
     Player();
     ~Player();
+
     void setDelegate(EndOfAudioDelegate* d);
     EndOfAudioDelegate* getDelegate() const;
+
     void setOutput(POutputDevice output);
     POutputDevice getOutput() const;
+
     void add(int usageId, PWavFileReader file, bool loop, int timelength);
     void release(int usageId);
     void clear();

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  wFormatTag;
-  WORD  nChannels;
+    WORD  nChannels;
-  DWORD nSamplesPerSec;
+    DWORD nSamplesPerSec;
-  DWORD nAvgBytesPerSec;
+    DWORD nAvgBytesPerSec;
-  WORD  nBlockAlign;
+    WORD  nBlockAlign;
-  WORD  wBitsPerSample;
+    WORD  wBitsPerSample;
-  WORD  cbSize;
+    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];
+    char name[5] = {0};
-  if (fread(name, 1, 4, mHandle) != 4)
+    readBuffer(name, 4);
-    THROW_READERROR;
 
-  name[4] = 0;
+    std::string result = name;
-  std::string result = name;
+    uint32_t size = 0;
-  unsigned size;
+    readBuffer(&size, 4);
-  if (fread(&size, 4, 1, mHandle) != 1)
-    THROW_READERROR;
 
-  if (result == "fact")
+    if (result == "fact")
-    fread(&mDataLength, 4, 1, mHandle);
+    {
-  else
+        uint32_t dataLength = 0;
-  if (result != "data")
+        readBuffer(&dataLength, sizeof dataLength);
-    fseek(mHandle, size, SEEK_CUR);
+        mDataLength = dataLength;
-  else
+    }
-    mDataLength = size;
+    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;
+    auto p = mInput->tellg();
-  try
+    mInput->read(reinterpret_cast<char*>(buffer), sz);
-  {
+    if (mInput->tellg() - p != sz)
-  #ifdef WIN32
+        throw Exception(ERR_WAVFILE_FAILED);
-    mHandle = _wfopen(filename.c_str(), L"rb");
+}
-  #else
+
-    mHandle = fopen(StringHelper::makeUtf8(filename).c_str(), "rb");
+size_t WavFileReader::tryReadBuffer(void* buffer, size_t sz)
-  #endif
+{
-    if (NULL == mHandle)
+    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;
+    catch(...)
-    
+    {
-    // Read the .WAV header
+        mInput.reset();
-    char riff[4];
+        mLastError = static_cast<unsigned>(-1);
-    if (fread(riff, 4, 1, mHandle) < 1)
+    }
-		  THROW_READERROR;
+    return isOpened();
-  	
-    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();
 }
 
 void WavFileReader::close()
 {
-  LOCK;
+    LOCK;
-
+    mInput.reset();
-  if (nullptr != mHandle)
-    fclose(mHandle);
-  mHandle = nullptr;
 }
 
-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)
+size_t WavFileReader::readRaw(void* buffer, size_t bytes)
-    return 0;
+{
+    return readRaw((short*)buffer, bytes / channels() / sizeof(short)) * channels() * sizeof(short);
+}
 
-  // Get number of samples that must be read from source file
+size_t WavFileReader::read(short* buffer, size_t samples)
-  int requiredBytes = mResampler.getSourceLength(samples) * mChannels * mBits / 8;
+{
-  void* temp = alloca(requiredBytes);
+    LOCK;
-  memset(temp, 0, requiredBytes);
 
-  // Find required size of input buffer
+    if (!mInput)
-  if (mDataLength)
+        return 0;
-  {
-    unsigned filePosition = ftell(mHandle);
 
-    // Check how much data we can read
+    // Get number of samples that must be read from source file
-    unsigned fileAvailable = mDataLength + mDataOffset - filePosition;
+    size_t requiredBytes = mResampler.getSourceLength(samples) * mChannels * mBits / 8;
-    requiredBytes = (int)fileAvailable < requiredBytes ? (int)fileAvailable : requiredBytes;
+    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);
+    memset(temp, 0, requiredBytes);
-  size_t processedBytes = 0;
-  size_t result = mResampler.processBuffer(temp, requiredBytes, processedBytes,
-                                           buffer, samples * 2 * AUDIO_CHANNELS);
 
-  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;
+    LOCK;
-
+    if (!mInput)
-  return (mHandle != 0);
+        return false;
+    return mInput->is_open();
 }
 
 void WavFileReader::rewind()
 {
-  LOCK;
+    LOCK;
- 
+    if (mInput)
-  if (mHandle)
+        mInput->seekg(mDataOffset);
-    fseek(mHandle, mDataOffset, SEEK_SET);
 }
 
-std::tstring WavFileReader::filename() const
+std::filesystem::path WavFileReader::path() const
 {
-  LOCK;
+    LOCK;
-
+    return mPath;
-  return mFileName;
 }
 
-unsigned WavFileReader::size() const
+size_t WavFileReader::size() const
 {
-  LOCK;
+    LOCK;
-
+    return mDataLength;
-  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) 
+    if (result < 1)
-    throw Exception(ERR_WAVFILE_FAILED, errno);
+        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;
+bool WavFileWriter::open(const std::filesystem::path& p, int samplerate, int channels)
-  mChannels = channels;
+{
+    LOCK;
+    close();
+    mSamplerate = samplerate;
+    mChannels = channels;
 
-#ifdef WIN32
+    mOutput = std::make_unique<std::ofstream>(p, std::ios::binary | std::ios::trunc);
-  mHandle = _wfopen(filename.c_str(), L"wb");
+    if (!mOutput)
-#else
+    {
-  mHandle = fopen(StringHelper::makeUtf8(filename).c_str(), "wb");
+        int errorcode = errno;
-#endif
+        ICELogError(<< "Failed to create .wav file: filename = " << p << " , error = " << errorcode);
-  if (nullptr == mHandle)
+        return false;
-  {
+    }
-    ICELogError(<< "Failed to create .wav file: filename = " << StringHelper::makeUtf8(filename) << " , error = " << errno);
-    return false;
-  }
 
-  // Write the .WAV header
+    // Write the .WAV header
-  const char* riff = "RIFF";
+    const char* riff = "RIFF";
-  checkWriteResult( fwrite(riff, 4, 1, mHandle) );
+    writeBuffer(riff, 4);
 
-  // Write the file size
+    // Write the file size
-  unsigned int filesize = 0;
+    uint32_t filesize = 0;
-  checkWriteResult( fwrite(&filesize, 4, 1, mHandle) );
+    writeBuffer(&filesize, sizeof filesize);
 
-  const char* wavefmt = "WAVEfmt ";
+    const char* wavefmt = "WAVEfmt ";
-  checkWriteResult( fwrite(wavefmt, 8, 1, mHandle) );
+    writeBuffer(wavefmt, 8);
 
-  // Set the format description
+    // Set the format description
-  DWORD dwFmtSize = 16; /*= 16L*/;
+    uint32_t dwFmtSize = 16; /*= 16L*/;
-  checkWriteResult( fwrite(&dwFmtSize, sizeof(dwFmtSize), 1, mHandle) );
+    writeBuffer(&dwFmtSize, sizeof(dwFmtSize));
 
-  WaveFormatEx format;
+    WaveFormatEx format;
-  format.wFormatTag = WAVE_FORMAT_PCM; 
+    format.wFormatTag = WAVE_FORMAT_PCM;
-  checkWriteResult( fwrite(&format.wFormatTag, sizeof(format.wFormatTag), 1, mHandle) );
+    writeBuffer(&format.wFormatTag, sizeof(format.wFormatTag));
 
-  format.nChannels = mChannels;
+    format.nChannels = mChannels;
-  checkWriteResult( fwrite(&format.nChannels, sizeof(format.nChannels), 1, mHandle) );
+    writeBuffer(&format.nChannels, sizeof(format.nChannels));
 
-  format.nSamplesPerSec = mRate; 
+    format.nSamplesPerSec = mSamplerate;
-  checkWriteResult( fwrite(&format.nSamplesPerSec, sizeof(format.nSamplesPerSec), 1, mHandle) );
+    writeBuffer(&format.nSamplesPerSec, sizeof(format.nSamplesPerSec));
 
-  format.nAvgBytesPerSec = mRate * 2 * mChannels;
+    format.nAvgBytesPerSec = mSamplerate * 2 * mChannels;
-  checkWriteResult( fwrite(&format.nAvgBytesPerSec, sizeof(format.nAvgBytesPerSec), 1, mHandle) );
+    writeBuffer(&format.nAvgBytesPerSec, sizeof(format.nAvgBytesPerSec));
 
-  format.nBlockAlign = 2 * mChannels;
+    format.nBlockAlign = 2 * mChannels;
-  checkWriteResult( fwrite(&format.nBlockAlign, sizeof(format.nBlockAlign), 1, mHandle) );
+    writeBuffer(&format.nBlockAlign, sizeof(format.nBlockAlign));
 
-  format.wBitsPerSample = BITS_PER_CHANNEL; 
+    format.wBitsPerSample = BITS_PER_CHANNEL;
-  checkWriteResult( fwrite(&format.wBitsPerSample, sizeof(format.wBitsPerSample), 1, mHandle) );
+    writeBuffer(&format.wBitsPerSample, sizeof(format.wBitsPerSample));
 
-  const char* data = "data";
+    const char* data = "data";
-  checkWriteResult( fwrite(data, 4, 1, mHandle));
+    writeBuffer(data, 4);
 
-  mFileName = filename;
+    mPath = p;
-  mWritten  = 0;
+    mWritten  = 0;
 
-  mLengthOffset = ftell(mHandle);
+    mLengthOffset = mOutput->tellp();
-  checkWriteResult( fwrite(&mWritten, 4, 1, mHandle) );
+    writeBuffer(&mWritten, sizeof mWritten);
 
-  return isOpened();
+    return isOpened();
 }
 
 void WavFileWriter::close()
 {
-  LOCK;
+    LOCK;
-
+    mOutput.reset();
-  if (mHandle)
-  {
-    fclose(mHandle);
-    mHandle = nullptr;
-  }
 }
 
 size_t WavFileWriter::write(const void* buffer, size_t bytes)
 {
-  LOCK;
+    LOCK;
 
-  if (!mHandle)
+    if (!mOutput)
-    return 0;
+        return 0;
 
-  // Seek the end of file
+    // Seek the end of file - here new data will be written
-  fseek(mHandle, 0, SEEK_END);
+    mOutput->seekp(0, std::ios_base::end);
-  mWritten += bytes;
+    mWritten += bytes;
 
-  // Write the data
+    // Write the data
-  fwrite(buffer, bytes, 1, mHandle);
+    writeBuffer(buffer, bytes);
 
-  // Write file length
+    // Write file length
-  fseek(mHandle, 4, SEEK_SET);
+    mOutput->seekp(4, std::ios_base::beg);
-  int32_t fl = mWritten + 36;
+    uint32_t fl = mWritten + 36;
-  fwrite(&fl, sizeof(fl), 1, mHandle);
+    writeBuffer(&fl, sizeof(fl));
 
-  // Write data length
+    // Write data length
-  fseek(mHandle, static_cast<long>(mLengthOffset), SEEK_SET);
+    mOutput->seekp(mLengthOffset, std::ios_base::beg);
-  checkWriteResult( fwrite(&mWritten, 4, 1, mHandle) );
+    writeBuffer(&mWritten, sizeof(mWritten));
 
-  return bytes;
+    return bytes;
 }
 
-bool WavFileWriter::isOpened()
+bool WavFileWriter::isOpened() const
 {
-  LOCK;
+    LOCK;
-
+    return mOutput.get();
-  return (mHandle != nullptr);
 }
 
-std::tstring WavFileWriter::filename()
+std::filesystem::path WavFileWriter::path() const
 {
-  LOCK;
+    LOCK;
-
+    return mPath;
-  return mFileName;
 }
 

src/engine/audio/Audio_WavFile.h

@@ -12,74 +12,84 @@
 #include <string>
 #include <memory>
 #include <mutex>
+#include <filesystem>
+#include <fstream>
 
 
 namespace Audio
 {
 
-  class WavFileReader
+class WavFileReader
-  {
+{
-  protected:
+protected:
-    FILE* mHandle;
+    uint16_t                        mChannels = 0;
-    short mChannels;
+    uint16_t                        mBits = 0;
-    short mBits;
+    int                             mSamplerate = 0;
-    int mRate;
+    std::filesystem::path           mPath;
-    std::tstring mFileName;
+    mutable std::recursive_mutex    mFileMtx;
-    mutable std::recursive_mutex mFileMtx;
+    size_t                          mDataOffset = 0;
-    unsigned mDataOffset;
+    size_t                          mDataLength = 0;
-    unsigned mDataLength;
+    Resampler                       mResampler;
-    Resampler mResampler;
+    unsigned                        mLastError = 0;
-    unsigned mLastError;
+    std::unique_ptr<std::ifstream>  mInput;
+    uint8_t                         mTempBuffer[16384];
 
-    std::string readChunk();
+    std::string         readChunk();
-  public:
+    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);
+    size_t read(short* buffer, size_t samples);
-    std::tstring filename() const;
+    size_t readRaw(short* buffer, size_t samples);
-    unsigned size() const;
+
+    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
+class WavFileWriter
-  {
+{
-  protected:
+protected:
-    FILE*                   mHandle;        /// Handle of audio file.
+    std::unique_ptr<std::ofstream>  mOutput;            /// Handle of audio file.
-    std::tstring            mFileName;      /// Path to requested audio file.
+    std::filesystem::path           mPath;              /// Path to requested audio file.
-    std::recursive_mutex    mFileMtx;       /// Mutex to protect this instance.
+    mutable std::recursive_mutex    mFileMtx;           /// Mutex to protect this instance.
-    int                     mWritten;       /// Amount of written data (in bytes)
+    size_t                          mWritten = 0;       /// Amount of written data (in bytes)
-    int                     mLengthOffset;  /// Position of length field.
+    size_t                          mLengthOffset = 0;  /// Position of length field.
-    int                     mRate,
+    int                             mSamplerate = 0,
-                            mChannels;
+                                    mChannels = 0;
 
     void checkWriteResult(int result);
-
+    void writeBuffer(const void* buffer, size_t sz);
-  public:
+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,27 +1,42 @@
 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})
+set_property(TARGET audio_lib PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 
 ##
 target_include_directories(audio_lib

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 16000
-#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 480
-#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 122
-#define MT_AMRNB_CODECNAME "amr"
-
-#define MT_AMRNB_OCTET_PAYLOADTYPE 123
-
-#define MT_AMRWB_PAYLOADTYPE 124
-#define MT_AMRWB_CODECNAME "amr-wb"
-
-#define MT_AMRWB_OCTET_PAYLOADTYPE 125
-
-#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 UserAgent;
-friend class NATDecorator;
+    friend class NATDecorator;
 public:
-  Account(PVariantMap config, UserAgent& agent);
+    Account(PVariantMap config, UserAgent& agent);
-  ~Account();
+    ~Account();
 
-  void start();
+    void start();
-  void stop();
+    void stop();
-  void refresh();
+    void refresh();
-  bool active();
+    bool active();
-  int id() const;
+    int id() const;
 
-  enum class RegistrationState
+    enum class RegistrationState
-  {
+    {
-    None,
+        None,
-    Registering,
+        Registering,
-    Reregistering,
+        Reregistering,
-    Registered,
+        Registered,
-    Unregistering
+        Unregistering
-  };
+    };
-  RegistrationState registrationState();
+    RegistrationState registrationState();
 
-  /* Publishes new presence information */
+    /* Publishes new presence information */
-  void publishPresence(bool online, const std::string& content, int seconds = 600);
+    void publishPresence(bool online, const std::string& content, int seconds = 600);
 
-  /* Stops publishing of presence */
+    /* Stops publishing of presence */
-  void stopPublish();
+    void stopPublish();
 
-  /* Starts observing on specified target / package */
+    /* Starts observing on specified target / package */
-  PClientObserver observe(const std::string& target, const std::string& package, void* tag);
+    PClientObserver observe(const std::string& target, const std::string& package, void* tag);
 
-  /* Queues message to peer with specified mime type. Returns ID of message. */
+    /* 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);
+    int sendMsg(const std::string& peer, const void* ptr, unsigned length, const std::string& mime, void* tag);
 
-  /* Returns name of account - <sip:user@domain> */
+    /* Returns name of account - <sip:user@domain> */
-  std::string name();
+    std::string name();
 
-  /* Updates account with configuration */
+    /* Updates account with configuration */
-  void setup(VariantMap& config);
+    void setup(VariantMap& config);
 
-  /* Returns corresponding resiprocate profile */
+    /* Returns corresponding resiprocate profile */
-  resip::SharedPtr<resip::UserProfile> getUserProfile() const { return mProfile; }
+    std::shared_ptr<resip::UserProfile> getUserProfile() const { return mProfile; }
 
-  typedef std::map<std::string, std::string> UserInfo;
+    typedef std::map<std::string, std::string> UserInfo;
-  void setUserInfo(const UserInfo& info);
+    void setUserInfo(const UserInfo& info);
-  UserInfo getUserInfo() const;
+    UserInfo getUserInfo() const;
 
 protected:
-  PVariantMap mConfig;
+    PVariantMap mConfig;
 
-  // Registration
+    // Registration
-  ResipSession* mRegistration;
+    ResipSession* mRegistration;
-  resip::ClientRegistrationHandle mRegistrationHandle;
+    resip::ClientRegistrationHandle mRegistrationHandle;
-  resip::ClientPublicationHandle mPublication;
+    resip::ClientPublicationHandle mPublication;
-  resip::TransportType mUsedTransport;
+    resip::TransportType mUsedTransport;
 
-  RegistrationState mRegistrationState;
+    RegistrationState mRegistrationState;
 
-  ice::NetworkAddress mExternalAddress;
+    ice::NetworkAddress mExternalAddress;
-  resip::SharedPtr<resip::UserProfile> mProfile;
+    std::shared_ptr<resip::UserProfile> mProfile;
-  UserAgent& mAgent;
+    UserAgent& mAgent;
-  bool mPresenceOnline;
+    bool mPresenceOnline;
-  std::string mPresenceContent;
+    std::string mPresenceContent;
 
-  // Timer to refresh STUN server IP
+    // Timer to refresh STUN server IP
-  ice::ICEScheduleTimer mRefreshStunServerIpTimer;
+    ice::ICEScheduleTimer mRefreshStunServerIpTimer;
 
-  // Cached auth
+    // Cached auth
-  resip::Auth mCachedAuth;
+    resip::Auth mCachedAuth;
 
-  // Id of account
+    // Id of account
-  int mId;
+    int mId;
 
-  // User info about current state
+    // User info about current state
-  UserInfo mUserInfo;
+    UserInfo mUserInfo;
 
-  // List of client subscriptions sent from this account
+    // List of client subscriptions sent from this account
-  typedef std::set<PClientObserver> ClientObserverSet;
+    typedef std::set<PClientObserver> ClientObserverSet;
-  ClientObserverSet mClientObserverSet;
+    ClientObserverSet mClientObserverSet;
 
 
-  void process();
+    void process();
-  // Method queries new stun server ip from dns (if stun server is specified as dns name)
+    // Method queries new stun server ip from dns (if stun server is specified as dns name)
-  void queryStunServerIp();
+    void queryStunServerIp();
 
-  bool isResponsibleFor(const resip::NameAddr& addr);
+    bool isResponsibleFor(const resip::NameAddr& addr);
-  enum class SecureScheme
+    enum class SecureScheme
-  {
+    {
-    SipsAndTls,
+        SipsAndTls,
-    SipsOnly,
+        SipsOnly,
-    TlsOnly,
+        TlsOnly,
-    Nothing
+        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
+    // This method prepares configuration, creates ice stack and sets ownership to session
-  void prepareIceStack(Session* session, ice::AgentRole role);
+    void prepareIceStack(Session* session, ice::AgentRole role);
-  void onSuccess(resip::ClientRegistrationHandle h, const resip::SipMessage& response);
+    void onSuccess(resip::ClientRegistrationHandle h, const resip::SipMessage& response);
-  void onRemoved(resip::ClientRegistrationHandle h, const resip::SipMessage& response);
+    void onRemoved(resip::ClientRegistrationHandle h, const resip::SipMessage& response);
-  void onFailure(resip::ClientRegistrationHandle, 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::DnsHostRecord>&);
-  void onDnsResult(const resip::DNSResult<resip::DnsAAAARecord>&);
+    void onDnsResult(const resip::DNSResult<resip::DnsAAAARecord>&);
-  void onDnsResult(const resip::DNSResult<resip::DnsSrvRecord>&);
+    void onDnsResult(const resip::DNSResult<resip::DnsSrvRecord>&);
-  void onDnsResult(const resip::DNSResult<resip::DnsNaptrRecord>&);
+    void onDnsResult(const resip::DNSResult<resip::DnsNaptrRecord>&);
-  void onDnsResult(const resip::DNSResult<resip::DnsCnameRecord>&);
+    void onDnsResult(const resip::DNSResult<resip::DnsCnameRecord>&);
 #pragma endregion
 
-  static int generateId();
+    static int generateId();
-  static resip::AtomicCounter IdGenerator;
+    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
+    return std::format("{} {} inline:{}", 1, toString(suite), keyText.c_str());
-    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;
 }
 
 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
+    return toSrtpSuite(suite);
-    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;
 }
 
 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>
 
@@ -28,19 +26,19 @@ public:
   virtual ~AudioProvider();
   
   // Returns provider RTP name
-  std::string   streamName();
+  std::string   streamName() override;
   
   // Returns provider RTP profile name
-  std::string   streamProfile();
+  std::string   streamProfile() override;
   
   // Sets destination IP address
-  void          setDestinationAddress(const RtpPair<InternetAddress>& addr);
+  void          setDestinationAddress(const RtpPair<InternetAddress>& addr) override;
 
   // Processes incoming data
-  void          processData(PDatagramSocket s, const void* dataBuffer, int dataSize, InternetAddress& source);
+  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);
+  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
+    // Stop receive RTP stream
-  if (state() & (int)StreamState::Receiving)
+    if (state() & (int)StreamState::Receiving)
-    setState( state() & ~(int)StreamState::Receiving );
+        setState( state() & ~(int)StreamState::Receiving );
 
-  mActive = mfPaused;
+    mActive = mfPaused;
 }
 
 void DataProvider::resume()
 {
-  // Tell remote peer about resumed receiving in SDP
+    // Tell remote peer about resumed receiving in SDP
-  //setState( state() | STATE_SIPRECV );
+    //setState( state() | STATE_SIPRECV );
 
-  // Start receive RTP stream
+    // Start receive RTP stream
-  setState( state() | (int)StreamState::Receiving );
+    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
+    // Process paused and inactive calls
-  if (media.exists("sendonly"))
+    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)
     {
-    case mfActive:
+        mRemoteState = msSendonly;
-      setState(state() | (int)StreamState::Sending | (int)StreamState::Receiving);
+        setState(state() & ~(int)StreamState::Sending);
-      break;
-
-    case mfPaused:
-      setState(state() | (int)StreamState::Sending );
-      break;
     }
-  }
+    else
-  return true;
+        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
+    enum MediaFlow
-  {
+    {
-    mfActive,
+        mfActive,
-    mfPaused
+        mfPaused
-  };
+    };
 
-  enum MediaState
+    enum MediaState
-  {
+    {
-    msSendRecv,
+        msSendRecv,
-    msSendonly,
+        msSendonly,
-    msRecvonly,
+        msRecvonly,
-    msInactive
+        msInactive
-  };
+    };
 
-  static bool isSupported(const char* name);
+    static bool isSupported(const char* name);
 
-  // Returns provider RTP name
+    // Returns provider RTP name
-  virtual std::string   streamName() = 0;
+    virtual std::string   streamName() = 0;
 
-  // Returns provider RTP profile name
+    // Returns provider RTP profile name
-  virtual std::string   streamProfile() = 0;
+    virtual std::string   streamProfile() = 0;
 
-  // Sets destination IP address
+    // Sets destination IP address
-  virtual void          setDestinationAddress(const RtpPair<InternetAddress>& addr) = 0;
+    virtual void          setDestinationAddress(const RtpPair<InternetAddress>& addr) = 0;
 
-  // Processes incoming data
+    // Processes incoming data
-  virtual void          processData(PDatagramSocket s, const void* dataBuffer, int dataSize, InternetAddress& address) = 0;
+    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
+    // 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;
+    virtual void          sendData(const PDatagramSocket& s, InternetAddress& destination, const void* dataBuffer, unsigned int datasize) = 0;
 
-  // Updates SDP offer
+    // Updates SDP offer
-  virtual void          updateSdpOffer(resip::SdpContents::Session::Medium& sdp, SdpDirection direction) = 0;
+    virtual void          updateSdpOffer(resip::SdpContents::Session::Medium& sdp, SdpDirection direction) = 0;
 
-  // Called by user agent when session is deleted. Comes after sessionTerminated().
+    // Called by user agent when session is deleted. Comes after sessionTerminated().
-  virtual void          sessionDeleted() = 0;
+    virtual void          sessionDeleted() = 0;
 
-  // Called by user agent when session is terminated.
+    // Called by user agent when session is terminated.
-  virtual void          sessionTerminated() = 0;
+    virtual void          sessionTerminated() = 0;
 
-  // Called by user agent when session is started.
+    // Called by user agent when session is started.
-  virtual void          sessionEstablished(int conntype) = 0;
+    virtual void          sessionEstablished(int conntype) = 0;
 
-  // Called by user agent to save media socket for this provider
+    // Called by user agent to save media socket for this provider
-  virtual void          setSocket(const RtpPair<PDatagramSocket>&  p4, const RtpPair<PDatagramSocket>& p6) = 0;
+    virtual void          setSocket(const RtpPair<PDatagramSocket>&  p4, const RtpPair<PDatagramSocket>& p6) = 0;
 
-  // Called by user agent to get media socket for this provider
+    // Called by user agent to get media socket for this provider
-  virtual RtpPair<PDatagramSocket>& socket(int family) = 0;
+    virtual RtpPair<PDatagramSocket>& socket(int family) = 0;
 
-  // Called by user agent to process media stream description from remote peer.
+    // Called by user agent to process media stream description from remote peer.
-  // Returns true if description is processed succesfully. Otherwise method returns false.
+    // Returns true if description is processed succesfully. Otherwise method returns false.
-  virtual bool          processSdpOffer(const resip::SdpContents::Session::Medium& media, SdpDirection sdpDirection) = 0;
+    virtual bool          processSdpOffer(const resip::SdpContents::Session::Medium& media, SdpDirection sdpDirection) = 0;
 
-  virtual unsigned      state() = 0;
+    virtual unsigned      state() = 0;
-  virtual void          setState(unsigned state) = 0;
+    virtual void          setState(unsigned state) = 0;
 
-  virtual void          pause();
+    virtual void          pause();
-  virtual void          resume();
+    virtual void          resume();
 
-  virtual MT::Statistics  getStatistics() = 0;
+    virtual MT::Statistics  getStatistics() = 0;
 
 protected:
-  MediaFlow  mActive;
+    MediaFlow  mActive;
-  MediaState mRemoteState;
+    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"
@@ -62,52 +62,60 @@
 using namespace std;
 enum
 {
-  CONFIG_IPV4 = 0,            // Use IP4
+    TransportType_Any,
-  CONFIG_IPV6,                // Use IP6.
+    TransportType_Udp,
-  CONFIG_USERNAME,            // Username. String value.
+    TransportType_Tcp,
-  CONFIG_DOMAIN,              // Domain. String value.
+    TransportType_Tls
-  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.
+enum
-  CONFIG_DISPLAYNAME,         // Optional user display name. String value.
+{
-  CONFIG_DOMAINPORT,          // Optional domain port number. Integer value.
+    CONFIG_IPV4 = 0,            // Use IP4
-  CONFIG_REGISTERDURATION,    // Wanted duration for registration. Integer value. It is MANDATORY value.
+    CONFIG_IPV6,                // Use IP6.
-  CONFIG_RPORT,               // Use SIP rport field. Recommended to set it to true. Boolean value.
+    CONFIG_USERNAME,            // Username. String value.
-  CONFIG_KEEPALIVETIME,       // Interval between UDP keep-alive messages. Boolean value.
+    CONFIG_DOMAIN,              // Domain. String value.
-  CONFIG_RELAY,               // Sets if TURN server must be used instead of STUN. Boolean value.
+    CONFIG_PASSWORD,            // Password. String value.
-  CONFIG_ICETIMEOUT,          // Optional timeout for ICE connectivity checks and candidate gathering. Integer value.
+    CONFIG_RINSTANCE,           // Determines if SIP rinstance field has to be used during registration. Boolean value.
-  CONFIG_ICEUSERNAME,	        // Optional username for TURN server. String value.
+    CONFIG_INSTANCE_ID,         // Instance id. It is alternative option to rinstance.
-  CONFIG_ICEPASSWORD,         // Optional password for TURN server. String value.
+    CONFIG_DISPLAYNAME,         // Optional user display name. String value.
-  CONFIG_SIPS,                // Marks if account credentials are sips: scheme. Boolean value.
+    CONFIG_DOMAINPORT,          // Optional domain port number. Integer value.
-  CONFIG_STUNSERVER_IP,       // Optional IP address of STUN/TURN server. String value. It is better to use CONFIG_STUNSERVER_NAME.
+    CONFIG_REGISTERDURATION,    // Wanted duration for registration. Integer value. It is MANDATORY value.
-  CONFIG_STUNSERVER_NAME,     // Host name of STUN/TURN server. stun.xten.com for example. String value.
+    CONFIG_RPORT,               // Use SIP rport field. Recommended to set it to true. Boolean value.
-  CONFIG_STUNSERVER_PORT,     // Port number of STUN/TURN server. Integer value.
+    CONFIG_KEEPALIVETIME,       // Interval between UDP keep-alive messages. Boolean value.
-  CONFIG_USERAGENT,           // Name of user agent in SIP headers. String value.
+    CONFIG_RELAY,               // Sets if TURN server must be used instead of STUN. Boolean value.
-  CONFIG_ICEREQUIRED,         // ICE MUST be present in remote peer offers and answers. Boolean value.
+    CONFIG_ICETIMEOUT,          // Optional timeout for ICE connectivity checks and candidate gathering. Integer value.
-  CONFIG_TRANSPORT,           // 0 - all transports, 1 - UDP, 2 - TCP, 3 - TLS,
+    CONFIG_ICEUSERNAME,	        // Optional username for TURN server. String value.
-  CONFIG_SUBSCRIPTION_TIME,   // Subscription time (in seconds)
+    CONFIG_ICEPASSWORD,         // Optional password for TURN server. String value.
-  CONFIG_SUBSCRIPTION_REFRESHTIME, // Refresh interval for subscriptions
+    CONFIG_SIPS,                // Marks if account credentials are sips: scheme. Boolean value.
-  CONFIG_DNS_CACHE_TIME,       // DNS cache time; default is 86400 seconds
+    CONFIG_STUNSERVER_IP,       // Optional IP address of STUN/TURN server. String value. It is better to use CONFIG_STUNSERVER_NAME.
-  CONFIG_PRESENCE_ID,         // Tuple ID used in presence publishing; determines source device
+    CONFIG_STUNSERVER_NAME,     // Host name of STUN/TURN server. stun.xten.com for example. String value.
-  CONFIG_ROOTCERT,            // Additional root cert in PEM format; string.
+    CONFIG_STUNSERVER_PORT,     // Port number of STUN/TURN server. Integer value.
-  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_USERAGENT,           // Name of user agent in SIP headers. String value.
-  CONFIG_RTCP_ATTR,           // Use "rtcp" attribute in sdp. Default value is true.
+    CONFIG_ICEREQUIRED,         // ICE MUST be present in remote peer offers and answers. Boolean value.
-  CONFIG_MULTIPLEXING,        // Do rtp/rtcp multiplexing
+    CONFIG_TRANSPORT,           // 0 - all transports, 1 - UDP, 2 - TCP, 3 - TLS,
-  CONFIG_DEFERRELAYED,        // Defer relayed media path
+    CONFIG_SUBSCRIPTION_TIME,   // Subscription time (in seconds)
-  CONFIG_PROXY,               // Proxy host name or IP address
+    CONFIG_SUBSCRIPTION_REFRESHTIME, // Refresh interval for subscriptions
-  CONFIG_PROXYPORT,           // Proxy port number
+    CONFIG_DNS_CACHE_TIME,       // DNS cache time; default is 86400 seconds
-  CONFIG_CODEC_PRIORITY,      // Another VariantMap with codec priorities,
+    CONFIG_PRESENCE_ID,         // Tuple ID used in presence publishing; determines source device
-  CONFIG_ACCOUNT,             // VariantMap with account configuration
+    CONFIG_ROOTCERT,            // Additional root cert in PEM format; string.
-  CONFIG_EXTERNALIP,          // Use external/public IP in outgoing requests
+    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_OWN_DNS,             // Use predefined DNS servers
+    CONFIG_RTCP_ATTR,           // Use "rtcp" attribute in sdp. Default value is true.
-  CONFIG_REGID                // reg-id value from RFC5626
+    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_SIP = 1,
-  EV_ICE = 2
+    EV_ICE = 2
 };
 
 class UserAgent;
@@ -116,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;
@@ -124,15 +132,15 @@ typedef std::vector<SIPAction*> SIPActionVector;
 // Session termination reason
 enum 
 {
-  Error,
+    Error,
-  Timeout, 
+    Timeout,
-  Replaced,
+    Replaced,
-  LocalBye,
+    LocalBye,
-  RemoteBye,
+    RemoteBye,
-  LocalCancel,
+    LocalCancel,
-  RemoteCancel,
+    RemoteCancel,
-  Rejected, //Only as UAS, UAC has distinct onFailure callback
+    Rejected, //Only as UAS, UAC has distinct onFailure callback
-  Referred
+    Referred
 };
 
 class UserAgent:  public resip::ClientRegistrationHandler, 
@@ -144,238 +152,239 @@ class UserAgent:  public resip::ClientRegistrationHandler,
                   public resip::ServerSubscriptionHandler,
                   public resip::ClientPagerMessageHandler, 
                   public resip::ServerPagerMessageHandler,
-                  public resip::ClientPublicationHandler,
+                  public resip::ClientPublicationHandler
-                  public resip::InternalTransport::TransportLogger
+//public resip::InternalTransport::TransportLogger
 {
-  friend class Account;
+    friend class Account;
-  friend class Session;
+    friend class Session;
-  friend class ResipSession;
+    friend class ResipSession;
-  friend class NATDecorator;
+    friend class NATDecorator;
-  friend class WatcherQueue;
+    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. */
+    /* 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 bool compareSipAddresses(const std::string& sip1, const std::string& sip2);
-  static std::string formatSipAddress(std::string sip);
+    static std::string formatSipAddress(const std::string& sip);
-  static bool isSipAddressValid(std::string sip);
+    static bool isSipAddressValid(const std::string& sip);
-  struct SipAddress
+    struct SipAddress
-  {
+    {
-    bool mValid;
+        bool mValid;
-    std::string mScheme;
+        std::string mScheme;
-    std::string mUsername;
+        std::string mUsername;
-    std::string mDomain;
+        std::string mDomain;
-    std::string mDisplayname;
+        std::string mDisplayname;
-  };
+    };
 
-  static SipAddress parseSipAddress(const std::string& sip);
+    static SipAddress parseSipAddress(const std::string& sip);
 
-  UserAgent();
+    UserAgent();
-  virtual ~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. */
+    /* Emergency stop. Please always call shutdown() before this. Kills registration, sessions & presence - everything. onStop() is called in context of this method. */
-  void stop();
+    void stop();
 
-  /* Checks if user agent is active (started). */
+    /* Checks if user agent is active (started). */
-  bool active();
+    bool active();
 
-  /* Used to refresh existing registration(s), publication, subscriptions. */
+    /* Used to refresh existing registration(s), publication, subscriptions. */
-  void refresh();
+    void refresh();
 
-  /* Runs sip & ice stacks. Event handlers are called in its context. */
+    /* Runs sip & ice stacks. Event handlers are called in its context. */
-  void process();
+    void process();
 
-  /* Adds root cert in PEM format. Usable after start() call. */
+    /* Adds root cert in PEM format. Usable after start() call. */
-  void addRootCert(const ByteBuffer& data);
+    void addRootCert(const ByteBuffer& data);
 
-  PAccount createAccount(PVariantMap config);
+    PAccount createAccount(PVariantMap config);
-  void deleteAccount(PAccount account);
+    void deleteAccount(PAccount account);
 
-  /* Creates session. Returns session ID. */
+    /* Creates session. Returns session ID. */
-  PSession createSession(PAccount account);
+    PSession createSession(PAccount account);
 
-  // Must be called when IP interface list is changed
+    // Must be called when IP interface list is changed
-  void updateInterfaceList();
+    void updateInterfaceList();
 
-  // Called on new incoming session; providers shoukld
+    // Called on new incoming session; providers shoukld
-  virtual PDataProvider onProviderNeeded(const std::string& name) = 0;
+    virtual PDataProvider onProviderNeeded(const std::string& name) = 0;
 
-  // Called on new session offer
+    // Called on new session offer
-  virtual void onNewSession(PSession s) = 0;
+    virtual void onNewSession(PSession s) = 0;
 
-  // Called when session is terminated
+    // Called when session is terminated
-  virtual void onSessionTerminated(PSession s, int responsecode, int reason) = 0;
+    virtual void onSessionTerminated(PSession s, int responsecode, int reason) = 0;
 
-  // Called when session is established ok i.e. after all ICE signalling is finished
+    // 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
+    // Conntype is type of establish event - EV_SIP or EV_ICE
-  virtual void onSessionEstablished(PSession s, int conntype, const RtpPair<InternetAddress>& p) = 0;
+    virtual void onSessionEstablished(PSession s, int conntype, const RtpPair<InternetAddress>& p) = 0;
 
-  // Called when client session gets
+    // Called when client session gets
-  virtual void onSessionProvisional(PSession s, int code) = 0;
+    virtual void onSessionProvisional(PSession s, int code) = 0;
 
-  // Called when user agent started
+    // Called when user agent started
-  virtual void onStart(int errorcode) = 0;
+    virtual void onStart(int errorcode) = 0;
 
-  // Called when user agent stopped
+    // Called when user agent stopped
-  virtual void onStop() = 0;
+    virtual void onStop() = 0;
 
-  // Called when account registered
+    // Called when account registered
-  virtual void onAccountStart(PAccount account) = 0;
+    virtual void onAccountStart(PAccount account) = 0;
 
-  // Called when account removed or failed (non zero error code)
+    // Called when account removed or failed (non zero error code)
-  virtual void onAccountStop(PAccount account, int error) = 0;
+    virtual void onAccountStop(PAccount account, int error) = 0;
 
-  // Called when connectivity checks failed.
+    // Called when connectivity checks failed.
-  virtual void onConnectivityFailed(PSession s) = 0;
+    virtual void onConnectivityFailed(PSession s) = 0;
 
-  // Called when new candidate is gathered
+    // Called when new candidate is gathered
-  virtual void onCandidateGathered(PSession s, const char* address);
+    virtual void onCandidateGathered(PSession s, const char* address);
 
-  // Called when network change detected
+    // Called when network change detected
-  virtual void onNetworkChange(PSession s) = 0;
+    virtual void onNetworkChange(PSession s) = 0;
 
-  // Called when all candidates are gathered
+    // Called when all candidates are gathered
-  virtual void onGathered(PSession s);
+    virtual void onGathered(PSession s);
 
-  // Called when new connectivity check is finished
+    // Called when new connectivity check is finished
-  virtual void onCheckFinished(PSession s, const char* description);
+    virtual void onCheckFinished(PSession s, const char* description);
 
-  // Called when log message must be recorded
+    // Called when log message must be recorded
-  virtual void onLog(const char* msg);
+    virtual void onLog(const char* msg);
 
-  // Called when problem with SIP connection(s) detected
+    // Called when problem with SIP connection(s) detected
-  virtual void onSipConnectionFailed() = 0;
+    virtual void onSipConnectionFailed() = 0;
 
-  // Subscribe/publish presence methods
+    // Subscribe/publish presence methods
-  virtual void onPublicationSuccess(PAccount acc);
+    virtual void onPublicationSuccess(PAccount acc);
-  virtual void onPublicationTerminated(PAccount acc, int code);
+    virtual void onPublicationTerminated(PAccount acc, int code);
-  virtual void onClientObserverStart(PClientObserver observer);
+    virtual void onClientObserverStart(PClientObserver observer);
-  virtual void onServerObserverStart(PServerObserver observer);
+    virtual void onServerObserverStart(PServerObserver observer);
-  virtual void onClientObserverStop(PClientObserver observer, int code);
+    virtual void onClientObserverStop(PClientObserver observer, int code);
-  virtual void onServerObserverStop(PServerObserver 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 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 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 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 onMessageSent(PAccount account, int id, const std::string& peer, void* tag);
 
-  // Configuration methods
+    // Configuration methods
-  VariantMap& config();
+    VariantMap& config();
 
 public:
-  // InviteSessionHandler implementation
+        // InviteSessionHandler implementation
 #pragma region InviteSessionHandler implementation
-  /// called when an initial INVITE or the intial response to an outoing invite  
+        /// 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::ClientInviteSessionHandle, resip::InviteSession::OfferAnswerType oat, const resip::SipMessage& msg) override;
-  virtual void onNewSession(resip::ServerInviteSessionHandle, 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
+    /// Received a failure response from UAS
-  virtual void onFailure(resip::ClientInviteSessionHandle, const resip::SipMessage& msg) override;
+    virtual void onFailure(resip::ClientInviteSessionHandle, const resip::SipMessage& msg) override;
 
-  /// called when an in-dialog provisional response is received that contains an SDP body
+    /// 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;
+    virtual void onEarlyMedia(resip::ClientInviteSessionHandle, const resip::SipMessage&, const resip::SdpContents&) override;
 
-  /// called when dialog enters the Early state - typically after getting 18x
+    /// called when dialog enters the Early state - typically after getting 18x
-  virtual void onProvisional(resip::ClientInviteSessionHandle, const resip::SipMessage&) override;
+    virtual void onProvisional(resip::ClientInviteSessionHandle, const resip::SipMessage&) override;
 
-  /// called when a dialog initiated as a UAC enters the connected state
+    /// called when a dialog initiated as a UAC enters the connected state
-  virtual void onConnected(resip::ClientInviteSessionHandle, const resip::SipMessage& msg) override;
+    virtual void onConnected(resip::ClientInviteSessionHandle, const resip::SipMessage& msg) override;
 
-  /// called when a dialog initiated as a UAS enters the connected state
+    /// called when a dialog initiated as a UAS enters the connected state
-  virtual void onConnected(resip::InviteSessionHandle, const resip::SipMessage& msg) override;
+    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
+    /// 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. 
+    /// because another fork answered and this fork was canceled by a proxy.
-  virtual void onForkDestroyed(resip::ClientInviteSessionHandle) override;
+    virtual void onForkDestroyed(resip::ClientInviteSessionHandle) override;
 
-  /// called when a 3xx with valid targets is encountered in an early dialog     
+    /// called when a 3xx with valid targets is encountered in an early dialog
-  /// This is different then getting a 3xx in onTerminated, as another
+    /// This is different then getting a 3xx in onTerminated, as another
-  /// request will be attempted, so the DialogSet will not be destroyed.
+    /// request will be attempted, so the DialogSet will not be destroyed.
-  /// Basically an onTermintated that conveys more information.
+    /// Basically an onTermintated that conveys more information.
-  /// checking for 3xx respones in onTerminated will not work as there may
+    /// checking for 3xx respones in onTerminated will not work as there may
-  /// be no valid targets.
+    /// be no valid targets.
-  virtual void onRedirected(resip::ClientInviteSessionHandle, const resip::SipMessage& msg) override;
+    virtual void onRedirected(resip::ClientInviteSessionHandle, const resip::SipMessage& msg) override;
 
-  /// called when an SDP answer is received - has nothing to do with user
+    /// called when an SDP answer is received - has nothing to do with user
-  /// answering the call 
+    /// answering the call
-  virtual void onAnswer(resip::InviteSessionHandle, const resip::SipMessage& msg, const resip::SdpContents&) override;
+    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
+    /// 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;
+    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
+    /// called when an Invite w/out SDP is sent, or any other context which
-  /// requires an SDP offer from the user
+    /// requires an SDP offer from the user
-  virtual void onOfferRequired(resip::InviteSessionHandle, const resip::SipMessage& msg) override;
+    virtual void onOfferRequired(resip::InviteSessionHandle, const resip::SipMessage& msg) override;
 
-  /// called if an offer in a UPDATE or re-INVITE was rejected - not real
+    /// called if an offer in a UPDATE or re-INVITE was rejected - not real
-  /// useful. A SipMessage is provided if one is available
+    /// useful. A SipMessage is provided if one is available
-  virtual void onOfferRejected(resip::InviteSessionHandle, const resip::SipMessage* msg) override;
+    virtual void onOfferRejected(resip::InviteSessionHandle, const resip::SipMessage* msg) override;
 
-  /// called when INFO message is received 
+    /// called when INFO message is received
-  virtual void onInfo(resip::InviteSessionHandle, const resip::SipMessage& msg) override;
+    virtual void onInfo(resip::InviteSessionHandle, const resip::SipMessage& msg) override;
 
-  /// called when response to INFO message is received 
+    /// called when response to INFO message is received
-  virtual void onInfoSuccess(resip::InviteSessionHandle, const resip::SipMessage& msg) override;
+    virtual void onInfoSuccess(resip::InviteSessionHandle, const resip::SipMessage& msg) override;
-  virtual void onInfoFailure(resip::InviteSessionHandle, const resip::SipMessage& msg) override;
+    virtual void onInfoFailure(resip::InviteSessionHandle, const resip::SipMessage& msg) override;
 
-  /// called when MESSAGE message is received 
+    /// called when MESSAGE message is received
-  virtual void onMessage(resip::InviteSessionHandle, const resip::SipMessage& msg) override;
+    virtual void onMessage(resip::InviteSessionHandle, const resip::SipMessage& msg) override;
 
-  /// called when response to MESSAGE message is received 
+    /// called when response to MESSAGE message is received
-  virtual void onMessageSuccess(resip::InviteSessionHandle, const resip::SipMessage& msg) override;
+    virtual void onMessageSuccess(resip::InviteSessionHandle, const resip::SipMessage& msg) override;
-  virtual void onMessageFailure(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
+    /// called when an REFER message is received.  The refer is accepted or
-  /// rejected using the server subscription. If the offer is accepted,
+    /// rejected using the server subscription. If the offer is accepted,
-  /// DialogUsageManager::makeInviteSessionFromRefer can be used to create an
+    /// DialogUsageManager::makeInviteSessionFromRefer can be used to create an
-  /// InviteSession that will send notify messages using the ServerSubscription
+    /// InviteSession that will send notify messages using the ServerSubscription
-  virtual void onRefer(resip::InviteSessionHandle, resip::ServerSubscriptionHandle, const resip::SipMessage& msg) override;
+    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 
+    /// called when an REFER message receives a failure response
-  virtual void onReferRejected(resip::InviteSessionHandle, const resip::SipMessage& msg) override;
+    virtual void onReferRejected(resip::InviteSessionHandle, const resip::SipMessage& msg) override;
 
-  /// called when an REFER message receives an accepted response 
+    /// called when an REFER message receives an accepted response
-  virtual void onReferAccepted(resip::InviteSessionHandle, resip::ClientSubscriptionHandle, const resip::SipMessage& msg) override;
+    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
+    /// Called when registraion succeeds or each time it is sucessfully
-  /// refreshed. 
+    /// refreshed.
-  void onSuccess(resip::ClientRegistrationHandle, const resip::SipMessage& response) override;
+    void onSuccess(resip::ClientRegistrationHandle, const resip::SipMessage& response) override;
 
-  // Called when all of my bindings have been removed
+    // Called when all of my bindings have been removed
-  void onRemoved(resip::ClientRegistrationHandle, const resip::SipMessage& response) override;
+    void onRemoved(resip::ClientRegistrationHandle, const resip::SipMessage& response) override;
 
-  /// call on Retry-After failure. 
+    /// call on Retry-After failure.
-  /// return values: -1 = fail, 0 = retry immediately, N = retry in N seconds
+    /// return values: -1 = fail, 0 = retry immediately, N = retry in N seconds
-  int onRequestRetry(resip::ClientRegistrationHandle, int retrySeconds, const resip::SipMessage& response) override;
+    int onRequestRetry(resip::ClientRegistrationHandle, int retrySeconds, const resip::SipMessage& response) override;
 
-  /// Called if registration fails, usage will be destroyed (unless a 
+    /// Called if registration fails, usage will be destroyed (unless a
-  /// Registration retry interval is enabled in the Profile)
+    /// Registration retry interval is enabled in the Profile)
-  void onFailure(resip::ClientRegistrationHandle, const resip::SipMessage& response) override;
+    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. */
+    /** return true to also do default logging, false to suppress default logging. */
-  virtual bool operator()(resip::Log::Level level,
+    virtual bool operator()(resip::Log::Level level,
-    const resip::Subsystem& subsystem, 
+                            const resip::Subsystem& subsystem,
-    const resip::Data& appName,
+                            const resip::Data& appName,
-      const char* file,
+                            const char* file,
-      int line,
+                            int line,
-      const resip::Data& message,
+                            const resip::Data& message,
-      const resip::Data& messageWithHeaders) override;
+                            const resip::Data& messageWithHeaders,
+                            const resip::Data& instanceName) override;
 #pragma endregion
 
 #pragma region DnsResultSink implementation
@@ -389,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 onSuccess(resip::ClientPublicationHandle, const resip::SipMessage& status) override;
-  void onRemove(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;
+    void onFailure(resip::ClientPublicationHandle, const resip::SipMessage& status) override;
-  int onRequestRetry(resip::ClientPublicationHandle, int retrySeconds, 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 onUpdate(resip::ClientSubscriptionHandle h, const resip::SipMessage& notify);
-  void onUpdatePending(resip::ClientSubscriptionHandle, const resip::SipMessage& notify, bool outOfOrder) override;
+    void onUpdatePending(resip::ClientSubscriptionHandle, const resip::SipMessage& notify, bool outOfOrder) override;
-  void onUpdateActive(resip::ClientSubscriptionHandle, const resip::SipMessage& notify, bool outOfOrder) override;
+    void onUpdateActive(resip::ClientSubscriptionHandle, const resip::SipMessage& notify, bool outOfOrder) override;
 
-  //unknown Subscription-State value
+    //unknown Subscription-State value
-  void onUpdateExtension(resip::ClientSubscriptionHandle, const resip::SipMessage& notify, bool outOfOrder) override;
+    void onUpdateExtension(resip::ClientSubscriptionHandle, const resip::SipMessage& notify, bool outOfOrder) override;
-  int onRequestRetry(resip::ClientSubscriptionHandle, int retrySeconds, const resip::SipMessage& notify) override;
+    int onRequestRetry(resip::ClientSubscriptionHandle, int retrySeconds, const resip::SipMessage& notify) override;
 
-  //subscription can be ended through a notify or a failure response.
+    //subscription can be ended through a notify or a failure response.
-  void onTerminated(resip::ClientSubscriptionHandle, const resip::SipMessage* msg) override;
+    void onTerminated(resip::ClientSubscriptionHandle, const resip::SipMessage* msg) override;
-  //not sure if this has any value.
+    //not sure if this has any value.
-  void onNewSubscription(resip::ClientSubscriptionHandle, const resip::SipMessage& notify) override;
+    void onNewSubscription(resip::ClientSubscriptionHandle, const resip::SipMessage& notify) override;
 
-  /// called to allow app to adorn a message.
+    /// called to allow app to adorn a message.
-  void onReadyToSend(resip::ClientSubscriptionHandle, resip::SipMessage& msg) override;
+    void onReadyToSend(resip::ClientSubscriptionHandle, resip::SipMessage& msg) override;
-  void onNotifyNotReceived(resip::ClientSubscriptionHandle) override;
+    void onNotifyNotReceived(resip::ClientSubscriptionHandle) override;
 
-  /// Called when a TCP or TLS flow to the server has terminated.  This can be caused by socket
+    /// 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.
+    /// 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 
+    //  Called only if clientOutbound is enabled on the UserProfile and the first hop server
-  /// supports RFC5626 (outbound).
+    /// supports RFC5626 (outbound).
-  /// Default implementation is to re-form the subscription using a new flow
+    /// Default implementation is to re-form the subscription using a new flow
-  void onFlowTerminated(resip::ClientSubscriptionHandle) override;
+    void onFlowTerminated(resip::ClientSubscriptionHandle) override;
-  void onNewSubscription(resip::ServerSubscriptionHandle, const resip::SipMessage& sub) override;
+    void onNewSubscription(resip::ServerSubscriptionHandle, const resip::SipMessage& sub) override;
-  void onTerminated(resip::ServerSubscriptionHandle) override;
+    void onTerminated(resip::ServerSubscriptionHandle) override;
 #pragma endregion
 
 #pragma region PagerHandler
-  void onSuccess(resip::ClientPagerMessageHandle, const resip::SipMessage& status) 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 onFailure(resip::ClientPagerMessageHandle, const resip::SipMessage& status, std::unique_ptr<resip::Contents> contents) override;
-  void onMessageArrived(resip::ServerPagerMessageHandle, const resip::SipMessage& message) 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 to protect this instance
-  Mutex mGuard;
+    Mutex mGuard;
 
-  // Smart pointer to resiprocate's master profile instance. The stack configuration holds here.
+    // Smart pointer to resiprocate's master profile instance. The stack configuration holds here.
-  resip::SharedPtr<resip::MasterProfile> mProfile;
+    std::shared_ptr<resip::MasterProfile> mProfile;
 
-  // Resiprocate's SIP stack object pointer
+    // Resiprocate's SIP stack object pointer
-  resip::SipStack* mStack;
+    resip::SipStack* mStack;
 
-  // Resiprocate's dialog usage manager object pointer
+    // Resiprocate's dialog usage manager object pointer
-  resip::DialogUsageManager* mDum;
+    resip::DialogUsageManager* mDum;
 
-  // List of available transports. They are owned by SipStack - so there is no need to delete instances in UserAgent.
+    // List of available transports. They are owned by SipStack - so there is no need to delete instances in UserAgent.
-  std::vector<resip::InternalTransport*> mTransportList;
+    std::vector<resip::InternalTransport*> mTransportList;
 
-  typedef std::map<int, PSession> SessionMap;
+    typedef std::map<int, PSession> SessionMap;
 
-  // Session's map
+    // Session's map
-  SessionMap mSessionMap;
+    SessionMap mSessionMap;
 
-  // Used configuration
+    // Used configuration
-  VariantMap mConfig;
+    VariantMap mConfig;
 
-  // Action vector
+    // Action vector
-  SIPActionVector mActionVector;
+    SIPActionVector mActionVector;
 
-  typedef std::map<int, PClientObserver> ClientObserverMap;
+    typedef std::map<int, PClientObserver> ClientObserverMap;
-  ClientObserverMap mClientObserverMap;
+    ClientObserverMap mClientObserverMap;
 
-  typedef std::map<int, PServerObserver> ServerObserverMap;
+    typedef std::map<int, PServerObserver> ServerObserverMap;
-  ServerObserverMap mServerObserverMap;
+    ServerObserverMap mServerObserverMap;
 
-  typedef std::set<PAccount> AccountSet;
+    typedef std::set<PAccount> AccountSet;
-  AccountSet mAccountSet;
+    AccountSet mAccountSet;
 
-  // Constructs and sends INVITE to remote peer. Remote peer address is stored inside session object.
+    // Constructs and sends INVITE to remote peer. Remote peer address is stored inside session object.
-  void sendOffer(Session* session);
+    void sendOffer(Session* session);
-  void internalStopSession(Session& session);
+    void internalStopSession(Session& session);
-  void processWatchingList();
+    void processWatchingList();
-  bool handleMultipartRelatedNotify(const resip::SipMessage& notify);
+    bool handleMultipartRelatedNotify(const resip::SipMessage& notify);
 
-  PSession getUserSession(int sessionId);
+    PSession getUserSession(int sessionId);
-  PAccount getAccount(const resip::NameAddr& myAddr);
+    PAccount getAccount(const resip::NameAddr& myAddr);
-  PAccount getAccount(Account* account);
+    PAccount getAccount(Account* account);
-  PAccount getAccount(int sessionId);
+    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
+    // Check if queue has similar item
-  for (unsigned i=0; i<mItemList.size(); i++)
+    for (unsigned i=0; i<mItemList.size(); i++)
-  {
+    {
-    Item& item = mItemList[i];
+        Item& item = mItemList[i];
-    if (item.mTarget == peer && item.mPackage == package &&
+        if (item.mTarget == peer && item.mPackage == package &&
-        item.mState != Item::State_Deleting)
+            item.mState != Item::State_Deleting)
-      return item.mId;
+            return item.mId;
-  }
+    }
 
-  Item item;
+    Item item;
-  item.mTarget = peer;
+    item.mTarget = peer;
-  item.mPackage = package;
+    item.mPackage = package;
-  item.mTag = tag;
+    item.mTag = tag;
-  item.mState = Item::State_ScheduledToAdd;
+    item.mState = Item::State_ScheduledToAdd;
-  item.mSession = new ResipSession(*mAgent.mDum);
+    item.mSession = new ResipSession(*mAgent.mDum);
-  item.mSession->setUa(&mAgent);
+    item.mSession->setUa(&mAgent);
-  item.mSession->setType(ResipSession::Type_Subscription);
+    item.mSession->setType(ResipSession::Type_Subscription);
-  item.mSession->setTag(tag);
+    item.mSession->setTag(tag);
-  item.mId = item.mSession->sessionId();
+    item.mId = item.mSession->sessionId();
-  item.mSession->setRemoteAddress(peer);
+    item.mSession->setRemoteAddress(peer);
-  item.mTag = tag;
+    item.mTag = tag;
-  mItemList.push_back(item);
+    mItemList.push_back(item);
-  process();
+    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
+    // Check if queue has similar item
-  for (unsigned i=0; i<mItemList.size(); i++)
+    for (unsigned i=0; i<mItemList.size(); i++)
-  {
-    Item& item = mItemList[i];
-    if (item.mId == id && !id)
     {
-      if (item.mState != Item::State_Deleting)
+        Item& item = mItemList[i];
-        item.mState = Item::State_ScheduledToDelete;
+        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
+    // Check if queue has similar item
-  for (unsigned i=0; i<mItemList.size(); i++)
+    for (unsigned i=0; i<mItemList.size(); i++)
-  {
-    Item& item = mItemList[i];
-    if (item.mId == id && !id)
     {
-      if (item.mState == Item::State_ScheduledToDelete || item.mState == Item::State_Active)
+        Item& item = mItemList[i];
-        item.mState = Item::State_ScheduledToRefresh;
+        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)
+    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)
     {
-    case Item::State_ScheduledToAdd:
+        // Find next item to process
-      if (mAgent.mConfig.exists(CONFIG_SUBSCRIPTION_TIME))
+        ItemList::iterator i = mItemList.begin();
-        expires = mAgent.mConfig[CONFIG_SUBSCRIPTION_TIME].asInt();
+        for (;i != mItemList.end() && !i->scheduled(); i++)
-      if (mAgent.mConfig.exists(CONFIG_SUBSCRIPTION_REFRESHTIME))
+            ;
-        refresh = mAgent.mConfig[CONFIG_SUBSCRIPTION_REFRESHTIME].asInt();
+        if (i == mItemList.end())
+            return;
 
-      msg = mAgent.mDum->makeSubscription(resip::NameAddr(resip::Data(i->mTarget)), resip::Data(i->mPackage), 
+        std::shared_ptr<resip::SipMessage> msg;
-        expires, refresh, i->mSession);
+        int expires = DEFAULT_SUBSCRIPTION_TIME, refresh = DEFAULT_SUBSCRIPTION_REFRESHTIME;
-      msg->header(resip::h_Accepts) = mAgent.mDum->getMasterProfile()->getSupportedMimeTypes(resip::NOTIFY);
-      mActiveId = i->mId;
-      i->mState = Item::State_Adding;
-      mAgent.mDum->send(msg);
-      break;
 
-    case Item::State_ScheduledToDelete:
+        switch (i->mState)
-      i->mSession->runTerminatedEvent(ResipSession::Type_Subscription, 0, 0);
+        {
-      if (i->mHandle.isValid())
+        case Item::State_ScheduledToAdd:
-      {
+            if (mAgent.mConfig.exists(CONFIG_SUBSCRIPTION_TIME))
-        mActiveId = i->mId;
+                expires = mAgent.mConfig[CONFIG_SUBSCRIPTION_TIME].asInt();
-        i->mHandle->end();
+            if (mAgent.mConfig.exists(CONFIG_SUBSCRIPTION_REFRESHTIME))
-        i->mState = Item::State_Deleting;
+                refresh = mAgent.mConfig[CONFIG_SUBSCRIPTION_REFRESHTIME].asInt();
-        break;
-      }
-      else
-        mItemList.erase(i);
-      break;
 
-    case Item::State_ScheduledToRefresh:
+            msg = mAgent.mDum->makeSubscription(resip::NameAddr(resip::Data(i->mTarget)), resip::Data(i->mPackage),
-      if (i->mHandle.isValid())
+                                                expires, refresh, i->mSession);
-      {
+            msg->header(resip::h_Accepts) = mAgent.mDum->getMasterProfile()->getSupportedMimeTypes(resip::NOTIFY);
-        mActiveId = i->mId;
+            mActiveId = i->mId;
-        i->mState = Item::State_Refreshing;
+            i->mState = Item::State_Adding;
-        i->mHandle->requestRefresh();
+            mAgent.mDum->send(msg);
-      }
+            break;
-      else
-        mItemList.erase(i);
-      break;
 
-    default:
+        case Item::State_ScheduledToDelete:
-      break;
+            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);
+    ice::Lock l(mGuard);
-  ItemList::iterator i = findById(id);
+    ItemList::iterator i = findById(id);
-  if (i != mItemList.end())
+    if (i != mItemList.end())
-  {
+    {
-    if (i->mSession)
+        if (i->mSession)
-      i->mSession->runTerminatedEvent(ResipSession::Type_Subscription, code, 0);
+            i->mSession->runTerminatedEvent(ResipSession::Type_Subscription, code, 0);
-    mItemList.erase(i);
+        mItemList.erase(i);
-    if (i->mId == mActiveId)
+        if (i->mId == mActiveId)
-      mActiveId = 0;
+            mActiveId = 0;
-  }
+    }
-  process();
+    process();
 }
 
 void WatcherQueue::onEstablished(int id, int code)
 {
-  ice::Lock l(mGuard);
+    ice::Lock l(mGuard);
-  ItemList::iterator i = findById(id);
+    ItemList::iterator i = findById(id);
-  if (i != mItemList.end())
+    if (i != mItemList.end())
-  {
+    {
-    i->mState = Item::State_Active;
+        i->mState = Item::State_Active;
-    if (i->mId == mActiveId)
+        if (i->mId == mActiveId)
-      mActiveId = 0;
+            mActiveId = 0;
-  }
+    }
-  process();
+    process();
 }
 
 WatcherQueue::ItemList::iterator WatcherQueue::findById(int id)
 {
-  for (ItemList::iterator i=mItemList.begin(); i != mItemList.end(); i++)
+    for (ItemList::iterator i=mItemList.begin(); i != mItemList.end(); i++)
-    if (i->mId == id)
+        if (i->mId == id)
-      return i;
+            return i;
-  return mItemList.end();
+    return mItemList.end();
 }
 
 void WatcherQueue::clear()
 {
-  ice::Lock l(mGuard);
+    ice::Lock l(mGuard);
-  for (ItemList::iterator i=mItemList.begin(); i != mItemList.end(); i++)
+    for (ItemList::iterator i=mItemList.begin(); i != mItemList.end(); i++)
-  {
+    {
-    if (i->mHandle.isValid())
+        if (i->mHandle.isValid())
-      i->mHandle->end();
+            i->mHandle->end();
-  }
+    }
-  mItemList.clear();
+    mItemList.clear();
 }

src/engine/endpoint/EP_NetworkQueue.h

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

src/engine/endpoint/EP_Observer.cpp

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

src/engine/endpoint/EP_Observer.h

@@ -21,51 +21,51 @@ class ResipSession;
 
 class ClientObserver
 {
-  friend class Account;
+    friend class Account;
-  friend class UserAgent;
+    friend class UserAgent;
 public:
-  ClientObserver();
+    ClientObserver();
-  ~ClientObserver();
+    ~ClientObserver();
 
-  void refresh();
+    void refresh();
-  void stop();
+    void stop();
-  std::string peer();
+    std::string peer();
 
 protected:
-  resip::ClientSubscriptionHandle mHandle;
+    resip::ClientSubscriptionHandle mHandle;
-  ResipSession* mSession;
+    ResipSession* mSession;
-  int mSessionId;
+    int mSessionId;
-  std::string mPeer;
+    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 peer() const;
-  std::string package() const;
+    std::string package() const;
 
-  void accept();
+    void accept();
-  void update(std::string simpleId, bool online, std::string msg);
+    void update(std::string simpleId, bool online, std::string msg);
-  void stop();
+    void stop();
 
 protected:
-  enum State
+    enum State
-  {
+    {
-    State_Incoming,
+        State_Incoming,
-    State_Active,
+        State_Active,
-    State_Closed
+        State_Closed
-  };
+    };
-  State mState;
+    State mState;
-  resip::ServerSubscriptionHandle mHandle;
+    resip::ServerSubscriptionHandle mHandle;
-  std::string mPeer, mPackage;
+    std::string mPeer, mPackage;
-  resip::Uri mContact;
+    resip::Uri mContact;
-  int mSessionId;
+    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 = nullptr;
-    Stream* media = NULL;
+    for (Stream& stream: mStreamList)
-    for (unsigned streamIndex = 0; streamIndex < mStreamList.size(); streamIndex++)
     {
-        Stream& stream = mStreamList[streamIndex];
+        if (!stream.provider())
-        if (stream.provider())
+            continue;
-        {
-            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;
 
-            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())
+            if (rtcpPort.isEmpty())
-                {
+            {
-                    rtcpPort = rtpPort;
+                rtcpPort = rtpPort;
-                    rtcpPort.setPort( rtpPort.port() + 1);
+                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.setSocket4( SocketHeap::instance().allocSocketPair(AF_INET, this, IS_MULTIPLEX()) );
-    s.setSocket6( SocketHeap::instance().allocSocketPair(AF_INET6, this, DOMULTIPLEX()) );
+    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() ),
+        RtpPair<PDatagramSocket> s4 = SocketHeap::instance().allocSocketPair(AF_INET, this, IS_MULTIPLEX() ),
-                s6 = SocketHeap::instance().allocSocketPair(AF_INET, this, DOMULTIPLEX());
+                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.setSocket4(SocketHeap::instance().allocSocketPair(AF_INET, this, IS_MULTIPLEX()));
-                stream.setSocket6(SocketHeap::instance().allocSocketPair(AF_INET6, this, DOMULTIPLEX()));
+                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 "../engine_config.h"
-#include "EP_Session.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 std::atomic_int IdGenerator;
-   static resip::AtomicCounter InstanceCounter;
+   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

@@ -1,17 +1,20 @@
+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)
 
-set (USE_NULL_UUID OFF CACHE BOOL "When enabled linking to libuuid is avoided")
-
 set (CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 file (GLOB HELPER_LIB_SOURCES "*.cpp" "*.h")
 
 add_library(helper_lib ${HELPER_LIB_SOURCES})
+set_property(TARGET helper_lib PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 
 # Private include directories
-target_include_directories(helper_lib PRIVATE ../../libs/ ../../engine ../)
+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_Calculator.h

@@ -312,7 +312,7 @@ namespace Calc
       {
         // Dot is here - is it float
         bool isFloat = false;
-        StringHelper::toFloat(mCurrentLexem.mValue, 0.0f, &isFloat);
+        strx::toFloat(mCurrentLexem.mValue, 0.0f, &isFloat);
         if (isFloat)
           mCurrentLexem.mType = LexemType::Float;
         else
@@ -488,7 +488,7 @@ namespace Calc
 
       case LexemType::Hex:
         result->mType = Ast::Type::Number;
-        result->mValue = StringHelper::fromHex2Int(l.mValue);
+        result->mValue = strx::fromHex2Int(l.mValue);
         break;
 
       case LexemType::Float:

src/engine/helper/HL_CsvReader.cpp

@@ -20,10 +20,10 @@ bool CsvReader::readLine(std::vector<std::string>& cells)
   std::string line;
   if (!std::getline(mInputStream, line))
     return false;
-  StringHelper::trim(line);
+  strx::trim(line);
   if (line.empty())
       return false;
 
-  StringHelper::split(line, cells, ",;");
+  strx::split(line, cells, ",;");
   return true;
 }

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()
+// std::string FileHelper::gettempname()
-{
+// {
-#if defined(TARGET_LINUX)
+// #if defined(TARGET_LINUX) || defined(TARGET_ANDROID)
-    char template_filename[L_tmpnam] = "rtphone_XXXXXXX.tmp";
+//     char template_filename[L_tmpnam] = "rtphone_XXXXXXX.tmp";
-    mkstemp(template_filename);
+//     int code = mkstemp(template_filename);
-    return template_filename;
-#elif defined(TARGET_WIN)
-    char buffer[L_tmpnam];
-    tmpnam(buffer);
 
-    return buffer;
+//     return template_filename;
-#elif defined(TARGET_OSX)
+// #elif defined(TARGET_WIN)
-    char template_filename[L_tmpnam] = "rtphone_XXXXXXX.tmp";
+//     char buffer[L_tmpnam];
-    mktemp(template_filename);
+//     tmpnam(buffer);
-    return template_filename;
+
-#endif
+//     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())
+    if (!sourceAddr6.isEmpty())
-            mSourceAddress = sourceAddr6;
+        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())
+    if (!destAddr6.isEmpty())
-            mDestinationAddress = destAddr6;
+        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_NetworkFrame.cpp

@@ -11,24 +11,50 @@
 #define MPLS_STACK_MASK (0x00000100)
 #define MPLS_STACK_SHIFT (8)
 
-NetworkFrame::PacketData NetworkFrame::GetUdpPayloadForEthernet(NetworkFrame::PacketData& packet, InternetAddress& source, InternetAddress& destination)
+NetworkFrame::Payload NetworkFrame::GetUdpPayloadForRaw(const Packet& data)
 {
-    PacketData result(packet);
+    const Ip4Header* ip4 = reinterpret_cast<const Ip4Header*>(data.mData);
 
-    const EthernetHeader* ethernet = reinterpret_cast<const EthernetHeader*>(packet.mData);
+    if (ip4->mProtocol != IPPROTO_UDP && ip4->mProtocol != 0)
+        return Payload();
+
+
+    switch (ip4->version())
+    {
+    case 4:
+        return GetUdpPayloadForIp4(data);
+
+    case 6:
+        return GetUdpPayloadForIp6(data);
+
+    default:
+        return Payload();
+    }
+}
+
+NetworkFrame::Payload NetworkFrame::GetUdpPayloadForEthernet(const Packet& data)
+{
+    Packet result(data);
+
+    const EthernetHeader* ethernet = reinterpret_cast<const EthernetHeader*>(data.mData);
 
     // Skip ethernet header
-    packet.mData += sizeof(EthernetHeader);
+    result.mData += sizeof(EthernetHeader);
-    packet.mLength -= sizeof(EthernetHeader);
+    result.mLength -= sizeof(EthernetHeader);
 
     // See if there is Vlan header
     uint16_t proto = 0;
     if (ethernet->mEtherType == 129)
     {
-        const VlanHeader* vlan = reinterpret_cast<const VlanHeader*>(packet.mData);
+        // Skip 1 or more VLAN headers
-        packet.mData += sizeof(VlanHeader);
+        do
-        packet.mLength -= sizeof(VlanHeader);
+        {
-        proto = ntohs(vlan->mData);
+            const VlanHeader* vlan = reinterpret_cast<const VlanHeader*>(result.mData);
+            result.mData += sizeof(VlanHeader);
+            result.mLength -= sizeof(VlanHeader);
+            proto = ntohs(vlan->mData);
+        }
+        while (proto == 0x8100);
     }
 
     // Skip MPLS headers
@@ -38,10 +64,10 @@ NetworkFrame::PacketData NetworkFrame::GetUdpPayloadForEthernet(NetworkFrame::Pa
     case ETHERTYPE_MPLS_MC:
         // Parse MPLS here until marker "bottom of mpls stack"
         for(bool bottomOfStack = false; !bottomOfStack;
-            bottomOfStack = ((ntohl(*(uint32_t*)(packet.mData - 4)) & MPLS_STACK_MASK) >> MPLS_STACK_SHIFT) != 0)
+            bottomOfStack = ((ntohl(*(uint32_t*)(result.mData - 4)) & MPLS_STACK_MASK) >> MPLS_STACK_SHIFT) != 0)
         {
-            packet.mData += 4;
+            result.mData += 4;
-            packet.mLength -=4;
+            result.mLength -=4;
         }
         break;
 
@@ -54,86 +80,86 @@ NetworkFrame::PacketData NetworkFrame::GetUdpPayloadForEthernet(NetworkFrame::Pa
         break;
     }
 
-    const Ip4Header* ip4 = reinterpret_cast<const Ip4Header*>(packet.mData);
+    const Ip4Header* ip4 = reinterpret_cast<const Ip4Header*>(result.mData);
 
     if (ip4->mProtocol != IPPROTO_UDP && ip4->mProtocol != 0)
-        return PacketData();
+        return Payload();
 
 
     switch (ip4->version())
     {
     case 4:
-        return GetUdpPayloadForIp4(packet, source, destination);
+        return GetUdpPayloadForIp4(result);
 
     case 6:
-        return GetUdpPayloadForIp6(packet, source, destination);
+        return GetUdpPayloadForIp6(result);
 
     default:
-        return PacketData();
+        return Payload();
     }
 }
 
-NetworkFrame::PacketData NetworkFrame::GetUdpPayloadForSLL(NetworkFrame::PacketData& packet, InternetAddress& source, InternetAddress& destination)
+NetworkFrame::Payload NetworkFrame::GetUdpPayloadForSLL(const Packet& data)
 {
-    PacketData result(packet);
+    Packet result(data);
 
-    if (packet.mLength < 16)
+    if (result.mLength < 16)
-        return PacketData();
+        return Payload();
 
-    const LinuxSllHeader* sll = reinterpret_cast<const LinuxSllHeader*>(packet.mData);
+    const LinuxSllHeader* sll = reinterpret_cast<const LinuxSllHeader*>(result.mData);
 
-    packet.mData += sizeof(LinuxSllHeader);
+    result.mData += sizeof(LinuxSllHeader);
-    packet.mLength -= sizeof(LinuxSllHeader);
+    result.mLength -= sizeof(LinuxSllHeader);
 
     switch (ntohs(sll->mProtocolType))
     {
     case 0x0800:
-        return GetUdpPayloadForIp4(packet, source, destination);
+        return GetUdpPayloadForIp4(result);
 
     case 0x86DD:
-        return GetUdpPayloadForIp6(packet, source, destination);
+        return GetUdpPayloadForIp6(result);
 
     default:
-        return PacketData();
+        return Payload();
     }
 }
 
-NetworkFrame::PacketData NetworkFrame::GetUdpPayloadForLoopback(NetworkFrame::PacketData& packet, InternetAddress& source, InternetAddress& destination)
+NetworkFrame::Payload NetworkFrame::GetUdpPayloadForLoopback(const Packet& data)
 {
-    PacketData result(packet);
+    Packet result(data);
 
-    if (packet.mLength < 16)
+    if (result.mLength < 16)
-        return PacketData();
+        return Payload();
 
     struct LoopbackHeader
     {
         uint32_t mProtocolType;
     };
 
-    const LoopbackHeader* lh = reinterpret_cast<const LoopbackHeader*>(packet.mData);
+    const LoopbackHeader* lh = reinterpret_cast<const LoopbackHeader*>(result.mData);
 
-    packet.mData += sizeof(LoopbackHeader);
+    result.mData += sizeof(LoopbackHeader);
-    packet.mLength -= sizeof(LoopbackHeader);
+    result.mLength -= sizeof(LoopbackHeader);
 
     switch (lh->mProtocolType)
     {
     case AF_INET:
-        return GetUdpPayloadForIp4(packet, source, destination);
+        return GetUdpPayloadForIp4(result);
 
     case AF_INET6:
-        return GetUdpPayloadForIp6(packet, source, destination);
+        return GetUdpPayloadForIp6(result);
 
     default:
-        return PacketData();
+        return Payload();
     }
 }
 
-NetworkFrame::PacketData NetworkFrame::GetUdpPayloadForIp4(NetworkFrame::PacketData& packet, InternetAddress& source, InternetAddress& destination)
+NetworkFrame::Payload NetworkFrame::GetUdpPayloadForIp4(const Packet& data)
 {
-    PacketData result(packet);
+    Packet result(data);
-    const Ip4Header* ip4 = reinterpret_cast<const Ip4Header*>(packet.mData);
+    const Ip4Header* ip4 = reinterpret_cast<const Ip4Header*>(data.mData);
     if (ip4->mProtocol != IPPROTO_UDP && ip4->mProtocol != 0)
-        return PacketData(nullptr, 0);
+        return Payload();
 
     result.mData += ip4->headerLength();
     result.mLength -= ip4->headerLength();
@@ -147,13 +173,15 @@ NetworkFrame::PacketData NetworkFrame::GetUdpPayloadForIp4(NetworkFrame::PacketD
     if (length - sizeof(UdpHeader) < (size_t)result.mLength)
         result.mLength = length - sizeof(UdpHeader);
 
-    source.setIp(ip4->mSource);
+    InternetAddress addr_source;
-    source.setPort(ntohs(udp->mSourcePort));
+    addr_source.setIp(ip4->mSource);
+    addr_source.setPort(ntohs(udp->mSourcePort));
 
-    destination.setIp(ip4->mDestination);
+    InternetAddress addr_dest;
-    destination.setPort(ntohs(udp->mDestinationPort));
+    addr_dest.setIp(ip4->mDestination);
+    addr_dest.setPort(ntohs(udp->mDestinationPort));
 
-    return result;
+    return {.data = result, .source = addr_source, .dest = addr_dest};
 }
 
 struct Ip6Header
@@ -183,10 +211,10 @@ struct Ip6Header
     struct	in6_addr	dst_ip;
 };
 
-NetworkFrame::PacketData NetworkFrame::GetUdpPayloadForIp6(NetworkFrame::PacketData& packet, InternetAddress& source, InternetAddress& destination)
+NetworkFrame::Payload NetworkFrame::GetUdpPayloadForIp6(const Packet& data)
 {
-    PacketData result(packet);
+    Packet result(data);
-    const Ip6Header* ip6 = reinterpret_cast<const Ip6Header*>(packet.mData);
+    const Ip6Header* ip6 = reinterpret_cast<const Ip6Header*>(result.mData);
     /*if (ip6->mProtocol != IPPROTO_UDP && ip4->mProtocol != 0)
     return PacketData(nullptr, 0);
   */
@@ -198,18 +226,13 @@ NetworkFrame::PacketData NetworkFrame::GetUdpPayloadForIp6(NetworkFrame::PacketD
     result.mData += sizeof(UdpHeader);
     result.mLength -= sizeof(UdpHeader);
 
-    /*
+    InternetAddress addr_source;
-  if (result.mLength != ntohs(udp->mDatagramLength))
+    addr_source.setIp(ip6->src_ip);
-    return PacketData(nullptr, 0);
+    addr_source.setPort(ntohs(udp->mSourcePort));
-  */
 
-    source.setIp(ip6->src_ip);
+    InternetAddress addr_dest;
-    source.setPort(ntohs(udp->mSourcePort));
+    addr_dest.setIp(ip6->dst_ip);
-    //std::cout << source.toStdString() << " - ";
+    addr_dest.setPort(ntohs(udp->mDestinationPort));
 
-    destination.setIp(ip6->dst_ip);
+    return {.data = result, .source = addr_source, .dest = addr_dest};
-    destination.setPort(ntohs(udp->mDestinationPort));
-    //std::cout << destination.toStdString() << std::endl;
-
-    return result;
 }

src/engine/helper/HL_NetworkFrame.h

@@ -7,25 +7,38 @@
 class NetworkFrame
 {
 public:
-    struct PacketData
+    struct Packet
     {
         const uint8_t* mData;
         size_t mLength;
 
-        PacketData(const uint8_t* data, size_t length)
+        Packet(const uint8_t* data, size_t length)
             :mData(data), mLength(length)
         {}
 
-        PacketData()
+        Packet()
             :mData(nullptr), mLength(0)
         {}
+
+        bool is_empty() const
+        {
+            return mData == nullptr || mLength == 0;
+        }
     };
 
-    static PacketData GetUdpPayloadForEthernet(PacketData& packet, InternetAddress& source, InternetAddress& destination);
+    struct Payload
-    static PacketData GetUdpPayloadForIp4(PacketData& packet, InternetAddress& source, InternetAddress& destination);
+    {
-    static PacketData GetUdpPayloadForIp6(PacketData& packet, InternetAddress& source, InternetAddress& destination);
+        Packet data;
-    static PacketData GetUdpPayloadForSLL(PacketData& packet, InternetAddress& source, InternetAddress& destination);
+        InternetAddress source;
-    static PacketData GetUdpPayloadForLoopback(PacketData& packet, InternetAddress& source, InternetAddress& destination);
+        InternetAddress dest;
+    };
+
+    static Payload GetUdpPayloadForEthernet(const Packet& data);
+    static Payload GetUdpPayloadForIp4(const Packet& data);
+    static Payload GetUdpPayloadForIp6(const Packet& data);
+    static Payload GetUdpPayloadForSLL(const Packet& data);
+    static Payload GetUdpPayloadForLoopback(const Packet& data);
+    static Payload GetUdpPayloadForRaw(const Packet& data);
 
     struct EthernetHeader
     {

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,16 +278,16 @@ 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)
-                            line_callback(StringHelper::trim(lines.substr(p, d-p)));
+                            line_callback(strx::trim(lines.substr(p, d-p)));
                         p = d + 1;
                     }
                 }
@@ -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 cc:4;         /* CSRC count             */
-    unsigned char x:1;		/* header extension flag  */
+    unsigned char x:1;          /* header extension flag  */
-    unsigned char p:1;		/* padding flag           */
+    unsigned char p:1;          /* padding flag           */
-    unsigned char version:2;	/* protocol version       */
+    unsigned char version:2;	 /* protocol version       */
-    unsigned char pt:7;	/* payload type           */
+    unsigned char pt:7;	     /* payload type           */
-    unsigned char m:1;		/* marker bit             */
+    unsigned char m:1;		     /* marker bit             */
-    unsigned short seq;		/* sequence number        */
+    unsigned short seq;		 /* sequence number        */
-    unsigned int ts;		/* timestamp              */
+    unsigned int ts;		     /* timestamp              */
-    unsigned int ssrc;	/* synchronization source */
+    unsigned int ssrc;	         /* synchronization source */
 };
 
 struct RtcpHeader
 {
-    unsigned char rc:5;		/* reception report count */
+    unsigned char rc:5;		  /* reception report count */
-    unsigned char p:1;		/* padding flag           */
+    unsigned char p:1;          /* padding flag           */
-    unsigned char version:2;	/* protocol version       */
+    unsigned char version:2;    /* protocol version       */
-    unsigned char pt:8;		/* payload type           */
+    unsigned char pt:8;         /* payload type           */
-    uint16_t len;			/* length                 */
+    uint16_t len;               /* length                 */
-    uint32_t ssrc;	       	/* synchronization source */
+    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;
+    const RtpHeader* h = reinterpret_cast<const RtpHeader*>(buffer);
-    bool rtp = ( (_type & 0x7F) >= 96 && (_type & 0x7F) <= 127) || ((_type & 0x7F) < 35);
+    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];
+    const RtcpHeader* h = reinterpret_cast<const RtcpHeader*>(buffer);
-
+    return h->version == 0b10;
-    return (b & 0xC0 ) == 128;
 }
 
 bool RtpHelper::isRtcp(const void* buffer, size_t length)
@@ -75,9 +82,17 @@ 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)
+{
+    if (isRtp(buffer, length))
+        reinterpret_cast<RtpHeader*>(buffer)->ssrc = htonl(ssrc);
+    else
+        reinterpret_cast<RtcpHeader*>(buffer)->ssrc = htonl(ssrc);
 }
 
 int RtpHelper::findPtype(const void* buffer, size_t length)
@@ -184,69 +199,3 @@ void RtpDump::flush()
 }
 #endif
 
-
-// -------------- MediaStreamId --------------------
-bool MediaStreamId::operator < (const MediaStreamId& right) const
-{
-    if (mSsrcIsId)
-        return std::tie(mSSRC, mSource, mDestination) < std::tie(right.mSSRC, right.mSource, right.mDestination);
-    else
-        return std::tie(mSource, mDestination) < std::tie(right.mSource, right.mDestination);
-
-}
-
-bool MediaStreamId::operator == (const MediaStreamId& right) const
-{
-    if (mSsrcIsId)
-        return std::tie(mSSRC, mSource, mDestination) == std::tie(right.mSSRC, right.mSource, right.mDestination);
-    else
-        return std::tie(mSource, mDestination) == std::tie(right.mSource, right.mDestination);
-}
-
-std::string MediaStreamId::toString() const
-{
-    std::ostringstream oss;
-    oss << "src: " << mSource.toStdString() <<
-           " dst: " << mDestination.toStdString() <<
-           " ssrc: " << StringHelper::toHex(mSSRC);
-    return oss.str();
-}
-
-
-void writeToJson(const MediaStreamId& id, std::ostringstream& oss)
-{
-    oss << "  \"src\": \"" << id.mSource.toStdString() << "\"," << std::endl
-        << "  \"dst\": \"" << id.mDestination.toStdString() << "\"," << std::endl
-        << "  \"ssrc\": \"" << StringHelper::toHex(id.mSSRC) << "\"," << std::endl
-#if !defined(USE_NULL_UUID)
-        << "  \"link_id\": \"" << id.mLinkId.toString() << "\"" << std::endl
-#endif
-        ;
-}
-
-std::string MediaStreamId::getDetectDescription() const
-{
-    std::ostringstream oss;
-    oss << "{\"event\": \"stream_detected\"," << std::endl;
-    writeToJson(*this, oss);
-    oss << "}";
-
-    return oss.str();
-}
-
-std::string MediaStreamId::getFinishDescription() const
-{
-    std::ostringstream oss;
-    oss << "{" << std::endl
-        << "  \"event\": \"stream_finished\", " << std::endl;
-    writeToJson(*this, oss);
-    oss << "}";
-
-    return oss.str();
-}
-
-std::ostream& operator << (std::ostream& output, const MediaStreamId& id)
-{
-    return (output << id.toString());
-}
-

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 <cstdint>
-#include "HL_InternetAddress.h"
+#include <stdlib.h>
-
-#include <vector>
-#include <string>
 
 // Class to carry rtp/rtcp socket pair
 template<class T>
@@ -36,13 +33,14 @@ struct RtpPair
 class RtpHelper
 {
 public:
-    static bool isRtp(const void* buffer, size_t length);
+    static bool     isRtp(const void* buffer, size_t length);
-    static int findPtype(const void* buffer, size_t length);
+    static int      findPtype(const void* buffer, size_t length);
-    static int findPacketNo(const void* buffer, size_t length);
+    static int      findPacketNo(const void* buffer, size_t length);
-    static bool isRtpOrRtcp(const void* buffer, size_t length);
+    static bool     isRtpOrRtcp(const void* buffer, size_t length);
-    static bool isRtcp(const void* buffer, size_t length);
+    static bool     isRtcp(const void* buffer, size_t length);
     static unsigned findSsrc(const void* buffer, size_t length);
-    static int findPayloadLength(const void* buffer, size_t length);
+    static void     setSsrc(void* buffer, size_t length, uint32_t ssrc);
+    static int      findPayloadLength(const void* buffer, size_t length);
 };
 
 #if defined(USE_RTPDUMP)
@@ -72,21 +70,4 @@ public:
 };
 #endif
 
-struct MediaStreamId
-{
-    InternetAddress mSource;
-    InternetAddress mDestination;
-    uint32_t mSSRC = 0;
-    bool mSsrcIsId = true;
-    Uuid mLinkId;
-    bool operator < (const MediaStreamId& s2) const;
-    bool operator == (const MediaStreamId& right) const;
-
-    std::string toString() const;
-    std::string getDetectDescription() const;
-    std::string getFinishDescription() const;
-};
-
-std::ostream& operator << (std::ostream& output, const MediaStreamId& id);
-
 #endif

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_Statistics.h

@@ -0,0 +1,82 @@
+#ifndef __HELPER_STATISTICS_H
+#define __HELPER_STATISTICS_H
+
+template<typename T>
+struct Average
+{
+    int mCount = 0;
+    T mSum = 0;
+    T average() const
+    {
+        if (!mCount)
+            return 0;
+        return mSum / mCount;
+    }
+
+    T value() const
+    {
+        return average();
+    }
+
+    void process(T value)
+    {
+        mCount++;
+        mSum += value;
+    }
+};
+
+template<typename T, int minimum = 100000, int maximum = 0, int default_value = 0>
+struct TestResult
+{
+    T mMin = minimum;
+    T mMax = maximum;
+    Average<T> mAverage;
+    T mCurrent = default_value;
+
+    void process(T value)
+    {
+        if (mMin > value)
+            mMin = value;
+        if (mMax < value)
+            mMax = value;
+        mCurrent = value;
+        mAverage.process(value);
+    }
+
+    bool is_initialized() const
+    {
+        return mAverage.mCount > 0;
+    }
+
+    T current() const
+    {
+        if (is_initialized())
+            return mCurrent;
+        else
+            return 0;
+    }
+
+    T value() const
+    {
+        return current();
+    }
+
+    T average() const
+    {
+        return mAverage.average();
+    }
+
+    TestResult<T>& operator = (T value)
+    {
+        process(value);
+        return *this;
+    }
+
+    operator T()
+    {
+        return mCurrent;
+    }
+};
+
+
+#endif

src/engine/helper/HL_StreamState.h

@@ -1,4 +1,4 @@
-/* Copyright(C) 2007-2016 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/. */
@@ -10,13 +10,13 @@
 
 enum class StreamState
 {
-  Sending = 1,          // Transmitting RTP. Set this flag to allow outgoing media stream.
+  Sending   = 1,        // Transmitting RTP. Set this flag to allow outgoing media stream.
   Receiving = 2,        // Receiving RTP. Set this flag to allow receiving media stream.
-  Playing = 4,          // Play to audio. Unmutes the audio from specified stream.
+  Playing   = 4,        // Play to audio. Unmutes the audio from specified stream.
-  Grabbing = 8,         // Capture audio. Unmutes the audio to specified stream.
+  Grabbing  = 8,        // Capture audio. Unmutes the audio to specified stream.
-  Srtp = 16,            // Use SRTP. Make attempt
+  Srtp      = 16,       // Use SRTP. Make attempt
-  SipSend = 32,         // Declare send capability in SDP
+  SipSend   = 32,       // Declare send capability in SDP
-  SipRecv = 64          // Declare recv capability in SDP
+  SipRecv   = 64        // Declare recv capability in SDP
 };
 
 

src/engine/helper/HL_String.cpp

@@ -1,4 +1,4 @@
-/* Copyright(C) 2007-2017 VoIPobjects (voipobjects.com)
+/* Copyright(C) 2007-2023 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,6 +8,7 @@
 #include <iomanip>
 #include <memory.h>
 #include <algorithm>
+#include <inttypes.h>
 
 #ifdef TARGET_WIN
 # include <WinSock2.h>
@@ -15,7 +16,7 @@
 # include <cctype>
 #endif
 
-std::string StringHelper::extractFilename(const std::string& path)
+std::string strx::extractFilename(const std::string& path)
 {
     if (path.empty())
         return std::string();
@@ -30,7 +31,7 @@ std::string StringHelper::extractFilename(const std::string& path)
         return path.substr(p_bs + 1);
 }
 
-std::string StringHelper::appendPath(const std::string& s1, const std::string& s2)
+std::string strx::appendPath(const std::string& s1, const std::string& s2)
 {
     std::string result = s1;
     if (!endsWith(result, "/") && !endsWith(result, "\\"))
@@ -44,7 +45,7 @@ std::string StringHelper::appendPath(const std::string& s1, const std::string& s
     return result + s2;
 }
 
-std::string StringHelper::makeUtf8(const std::tstring &arg)
+std::string strx::makeUtf8(const std::tstring &arg)
 {
 #if defined(TARGET_WIN)
     size_t required = WideCharToMultiByte(CP_UTF8, 0, arg.c_str(), -1, NULL, 0, NULL, NULL);
@@ -56,12 +57,12 @@ std::string StringHelper::makeUtf8(const std::tstring &arg)
 #endif
 }
 
-std::string StringHelper::toUtf8(const std::tstring &arg)
+std::string strx::toUtf8(const std::tstring &arg)
 {
     return makeUtf8(arg);
 }
 
-std::tstring StringHelper::makeTstring(const std::string& arg)
+std::tstring strx::makeTstring(const std::string& arg)
 {
 #if defined(TARGET_WIN)
     size_t count = MultiByteToWideChar(CP_UTF8, 0, arg.c_str(), -1, NULL, 0);
@@ -73,7 +74,7 @@ std::tstring StringHelper::makeTstring(const std::string& arg)
 #endif
 }
 
-int StringHelper::toInt(const char *s, int defaultValue, bool* isOk)
+int strx::toInt(const char *s, int defaultValue, bool* isOk)
 {
     int result;
     if (sscanf(s, "%d", &result) != 1)
@@ -89,7 +90,7 @@ int StringHelper::toInt(const char *s, int defaultValue, bool* isOk)
     return result;
 }
 
-uint64_t StringHelper::toUint64(const char* s, uint64_t def, bool *isOk)
+uint64_t strx::toUint64(const char* s, uint64_t def, bool *isOk)
 {
     uint64_t result = def;
 #if defined(TARGET_WIN)
@@ -109,14 +110,14 @@ uint64_t StringHelper::toUint64(const char* s, uint64_t def, bool *isOk)
     return result;
 }
 
-std::string StringHelper::toHex(unsigned int value)
+std::string strx::toHex(unsigned int value)
 {
     char buffer[32];
     sprintf(buffer, "%x", value);
     return buffer;
 }
 
-std::string StringHelper::toHex(const void *ptr)
+std::string strx::toHex(const void *ptr)
 {
     std::ostringstream oss;
     oss << std::fixed << std::setw(8) << std::setfill('0') << std::hex << ptr;
@@ -126,7 +127,7 @@ std::string StringHelper::toHex(const void *ptr)
 //must be lowercase for MD5
 static const char hexmap[] = "0123456789abcdef";
 
-std::string StringHelper::toHex(const uint8_t* input, size_t inputLength)
+std::string strx::toHex(const uint8_t* input, size_t inputLength)
 {
     std::string result; result.resize(inputLength * 2);
 
@@ -147,7 +148,7 @@ std::string StringHelper::toHex(const uint8_t* input, size_t inputLength)
     return result;
 }
 
-std::string StringHelper::prefixLines(const std::string &source, const std::string &prefix)
+std::string strx::prefixLines(const std::string &source, const std::string &prefix)
 {
     // Read source line by line
     std::istringstream iss(source);
@@ -160,7 +161,7 @@ std::string StringHelper::prefixLines(const std::string &source, const std::stri
     return oss.str();
 }
 
-std::string StringHelper::doubleToString(double value, int precision)
+std::string strx::doubleToString(double value, int precision)
 {
     std::stringstream ss;
     ss << std::fixed << std::setprecision(precision) << value;
@@ -168,7 +169,7 @@ std::string StringHelper::doubleToString(double value, int precision)
 }
 
 
-const char* StringHelper::findSubstring(const char* buffer, const char* substring, size_t bufferLength)
+const char* strx::findSubstring(const char* buffer, const char* substring, size_t bufferLength)
 {
 #if defined(TARGET_WIN)
     return (const char*)strstr(buffer, substring);
@@ -178,7 +179,7 @@ const char* StringHelper::findSubstring(const char* buffer, const char* substrin
 }
 
 
-void StringHelper::split(const std::string& src, std::vector<std::string>& dst, const std::string& delims)
+void strx::split(const std::string& src, std::vector<std::string>& dst, const std::string& delims)
 {
     dst.clear();
     std::string::size_type p = 0;
@@ -202,21 +203,21 @@ void StringHelper::split(const std::string& src, std::vector<std::string>& dst,
     }
 }
 
-std::vector<std::string> StringHelper::split(const std::string& src, const std::string& delims)
+std::vector<std::string> strx::split(const std::string& src, const std::string& delims)
 {
     std::vector<std::string> r;
     split(src, r, delims);
     return r;
 }
 
-std::pair<std::string, int> StringHelper::parseHost(const std::string& host, int defaultPort)
+std::pair<std::string, int> strx::parseHost(const std::string& host, int defaultPort)
 {
     std::pair<std::string, int> result;
     std::size_t p = host.find(':');
     if (p != std::string::npos)
     {
         result.first = host.substr(0, p);
-        result.second = StringHelper::toInt(host.c_str() + p + 1, defaultPort);
+        result.second = strx::toInt(host.c_str() + p + 1, defaultPort);
     }
     else
     {
@@ -226,15 +227,15 @@ std::pair<std::string, int> StringHelper::parseHost(const std::string& host, int
     return result;
 }
 
-std::pair<std::string, std::string> StringHelper::parseAssignment(const std::string& s, bool trimQuotes)
+std::pair<std::string, std::string> strx::parseAssignment(const std::string& s, bool trimQuotes)
 {
     std::pair<std::string, std::string> result;
 
     std::string::size_type p = s.find('=');
     if (p != std::string::npos)
     {
-        result.first = StringHelper::trim(s.substr(0, p));
+        result.first = strx::trim(s.substr(0, p));
-        result.second = StringHelper::trim(s.substr(p+1));
+        result.second = strx::trim(s.substr(p+1));
         if (trimQuotes && result.second.size() >= 2)
         {
             if ((result.second[0] == '"' && result.second[result.second.size()-1] == '"') ||
@@ -243,19 +244,19 @@ std::pair<std::string, std::string> StringHelper::parseAssignment(const std::str
         }
     }
     else
-        result.first = StringHelper::trim(s);
+        result.first = strx::trim(s);
 
     return result;
 }
 
-std::string StringHelper::intToString(int value)
+std::string strx::intToString(int value)
 {
     char buffer[32];
     sprintf(buffer, "%d", value);
     return buffer;
 }
 
-float StringHelper::toFloat(const std::string &s, float v, bool* isOk)
+float strx::toFloat(const std::string &s, float v, bool* isOk)
 {
     float result = 0.0;
     int code = sscanf(s.c_str(), "%f", &result);
@@ -274,14 +275,14 @@ float StringHelper::toFloat(const std::string &s, float v, bool* isOk)
     return result;
 }
 
-std::string StringHelper::trim(const std::string &s)
+std::string strx::trim(const std::string &s)
 {
     auto wsfront = std::find_if_not(s.begin(), s.end(), [](int c) { return std::isspace(c) || c == '\r' || c == '\n'; });
     auto wsback = std::find_if_not(s.rbegin(), s.rend(), [](int c) { return std::isspace(c) || c == '\r' || c == '\n'; }).base();
     return (wsback <= wsfront ? std::string() : std::string(wsfront,wsback));
 }
 
-std::string StringHelper::timeToString(time_t t)
+std::string strx::timeToString(time_t t)
 {
     char buffer[128] = "";
     struct tm lt;
@@ -295,12 +296,12 @@ std::string StringHelper::timeToString(time_t t)
     return buffer;
 }
 
-std::string StringHelper::millisecondsToString(uint64_t t)
+std::string strx::millisecondsToString(uint64_t t)
 {
     return timeToString(t/1000);
 }
 
-int StringHelper::fromHex2Int(const std::string &s)
+int strx::fromHex2Int(const std::string &s)
 {
     int result = 0;
     sscanf(s.c_str(), "%x", &result);
@@ -318,12 +319,12 @@ 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 StringHelper::fromHex2String(const std::string& s)
+std::string strx::fromHex2String(const std::string& s)
 {
     std::string result; result.resize(s.size() / 2);
     const char* t = s.c_str();
@@ -333,7 +334,7 @@ std::string StringHelper::fromHex2String(const std::string& s)
     return result;
 }
 
-std::string StringHelper::replace(const std::string& s, char f, char r)
+std::string strx::replace(const std::string& s, char f, char r)
 {
     std::string result(s);
     for (std::string::size_type i = 0; i < result.size(); i++)
@@ -343,7 +344,7 @@ std::string StringHelper::replace(const std::string& s, char f, char r)
     return result;
 }
 
-std::string StringHelper::replace(const std::string& s, const std::string& tmpl, const std::string& n)
+std::string strx::replace(const std::string& s, const std::string& tmpl, const std::string& n)
 {
     std::string result(s);
     std::string::size_type p = 0;
@@ -356,7 +357,7 @@ std::string StringHelper::replace(const std::string& s, const std::string& tmpl,
     return result;
 }
 
-std::string StringHelper::decodeUri(const std::string& s)
+std::string strx::decodeUri(const std::string& s)
 {
     std::string ret;
     ret.reserve(s.size());
@@ -379,19 +380,19 @@ std::string StringHelper::decodeUri(const std::string& s)
     return ret;
 }
 
-bool StringHelper::startsWith(const std::string& s, const std::string& prefix)
+bool strx::startsWith(const std::string& s, const std::string& prefix)
 {
     std::string::size_type p = s.find(prefix);
     return p == 0;
 }
 
-bool StringHelper::endsWith(const std::string& s, const std::string& suffix)
+bool strx::endsWith(const std::string& s, const std::string& suffix)
 {
     std::string::size_type p = s.rfind(suffix);
     return (p == s.size() - suffix.size());
 }
 
-int StringHelper::stringToDuration(const std::string& s)
+int strx::stringToDuration(const std::string& s)
 {
     if (endsWith(s, "ms"))
         return std::stoi(s.substr(0, s.size()-2));
@@ -405,92 +406,52 @@ int StringHelper::stringToDuration(const std::string& s)
         return std::stoi(s) * 1000;
 }
 
-#define XML_HEADER "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>"
+std::string strx::uppercase(const std::string& s)
-// --------------------- XcapHelper -----------------
-std::string XcapHelper::buildBuddyList(std::string listName, std::vector<std::string> buddies)
 {
-    std::ostringstream result;
+    std::string r(s);
-    result << XML_HEADER <<
+    std::transform(r.begin(), r.end(), r.begin(), ::toupper);
-              "<resource-lists xmlns=\"urn:ietf:params:xml:ns:resource-lists\">" <<
+    return r;
-              "<list name=\"" << listName.c_str() << "\">";
-
-    // to test CT only!
-    //result << "<entry uri=\"" << "sip:dbogovych1@10.11.1.25" << "\"/>";
-    //result << "<entry uri=\"" << "sip:dbogovych2@10.11.1.25" << "\"/>";
-
-    for (unsigned i = 0; i<buddies.size(); i++)
-    {
-        result << "<entry uri=\"" << normalizeSipUri(buddies[i]).c_str() << "\"/>";
-    }
-    result << "</list></resource-lists>";
-    return result.str();
 }
 
-std::string XcapHelper::buildRules(std::vector<std::string> buddies)
+std::string strx::lowercase(const std::string& s)
 {
-    std::ostringstream result;
+    std::string r(s);
-    result << XML_HEADER <<
+    std::transform(r.begin(), r.end(), r.begin(), ::tolower);
-              "<ruleset xmlns=\"urn:ietf:params:xml:ns:common-policy\">" <<
+    return r;
-              "<rule id=\"presence_allow\">" <<
-              "<conditions>";
-
-    for (unsigned i = 0; i<buddies.size(); i++)
-    {
-        result << "<identity><one id=\"" <<
-                  normalizeSipUri(buddies[i]).c_str() << "\"/></identity>";
-    }
-    result << "</conditions>" <<
-              "<actions>" <<
-              "<sub-handling xmlns=\"urn:ietf:params:xml:ns:pres-rules\">" <<
-              "allow" <<
-              "</sub-handling>" <<
-              "</actions>" <<
-              "<transformations>" <<
-              "<provide-devices xmlns=\"urn:ietf:params:xml:ns:pres-rules\">" <<
-              "<all-devices/>" <<
-              "</provide-devices>" <<
-              "<provide-persons xmlns=\"urn:ietf:params:xml:ns:pres-rules\">" <<
-              "<all-persons/>" <<
-              "</provide-persons>" <<
-              "<provide-services xmlns=\"urn:ietf:params:xml:ns:pres-rules\">" <<
-              "<all-services/>" <<
-              "</provide-services>" <<
-              "</transformations>" <<
-              "</rule>" <<
-              "</ruleset>";
-    return result.str();
 }
 
-std::string XcapHelper::buildServices(std::string serviceUri, std::string listRef)
+std::string strx::removeQuotes(const std::string& s)
 {
-    std::ostringstream result;
+    std::string r(s);
+    if (s.empty())
+        return s;
 
-    result << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << std::endl <<
+    if (r.front() == '"')
-              "<rls-services xmlns=\"urn:ietf:params:xml:ns:rls-services\"" << std::endl <<
+        r = r.substr(1);
-              "xmlns:rl=\"urn:ietf:params:xml:ns:resource-lists\"" << std::endl <<
-              "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">" << std::endl <<
-              "<service uri=\"" << normalizeSipUri(serviceUri).c_str() << "\">" << std::endl <<
-              "<resource-list>" << listRef.c_str() << "</resource-list>" << std::endl <<
-              "<packages>" << std::endl <<
-              "<package>presence</package>" << std::endl <<
-              "</packages>" << std::endl <<
-              "</service>" << std::endl <<
-              "</rls-services>";
 
-    return result.str();
+    if (r.back() == '"')
+        r = r.substr(0, r.size()-1);
+
+    return r;
 }
 
-std::string XcapHelper::normalizeSipUri(std::string uri)
+#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 (uri.length())
+    if (!haystack || !haystack_len || !needle || !needle_len)
-    {
+        return nullptr;
-        if (uri[0] == '<')
+
-            uri.erase(0,1);
+    for (const char *h = (const char*)haystack;
-        if (uri.length())
+         haystack_len >= needle_len;
-        {
+         ++h, --haystack_len) {
-            if (uri[uri.length()-1] == '>')
+        if (!memcmp(h, needle, needle_len)) {
-                uri.erase(uri.length()-1, 1);
+            return h;
         }
     }
-    return uri;
+    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
@@ -16,7 +17,7 @@
 #endif
 
 
-class StringHelper
+class strx
 {
 public:
     static std::string extractFilename(const std::string& path);
@@ -25,6 +26,7 @@ public:
     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);
@@ -33,9 +35,14 @@ public:
     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 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>
@@ -44,7 +51,7 @@ public:
         std::ostringstream s;
         for (const auto& i : v)
         {
-            if (&i != &v[0])
+            if (&i != &v.front())
                 s << delimiter;
             s << i;
         }
@@ -53,18 +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 float toFloat(const std::string& s, float defaultValue = 0.0, bool* isOk = nullptr);
     static std::string trim(const std::string& s);
     static std::string timeToString(time_t t);
     static std::string millisecondsToString(uint64_t t);
-    static int fromHex2Int(const std::string& s);
-    static std::string fromHex2String(const std::string& s);
     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
@@ -77,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

@@ -0,0 +1,53 @@
+#include "HL_Time.h"
+
+#include <time.h>
+#include <chrono>
+/* return current time in milliseconds */
+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

@@ -0,0 +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)
-#if defined(TARGET_LINUX) || defined(TARGET_OSX)
+//     auto id = uuids::uuid_system_generator{}();
-    uuid_generate(result.mUuid);
+// #else
-#endif
+    std::random_device rd;
-#if defined(TARGET_WIN)
+    auto seed_data = std::array<int, std::mt19937::state_size> {};
-    UuidCreate(&result.mUuid);
+    std::generate(std::begin(seed_data), std::end(seed_data), std::ref(rd));
-#endif
+    std::seed_seq seq(std::begin(seed_data), std::end(seed_data));
-#endif
+    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)
+    auto id = uuids::uuid::from_string(s);
-#if defined(TARGET_LINUX) || defined(TARGET_OSX)
+    if (id)
-    uuid_parse(s.c_str(), result.mUuid);
+        memcpy(result.mUuid, id->as_bytes().data(), id->as_bytes().size_bytes());
-#endif
 
-#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)
+    auto s = std::span<uuids::uuid::value_type, 16>{(uuids::uuid::value_type*)mUuid, 16};
-    return "UUID_disabled";
+    uuids::uuid id(s);
-#else
+    return uuids::to_string(id);
-    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
 }
 
 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>
-
+#include <stdint.h>
-#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
 
 class Uuid
 {
 public:
-  Uuid();
+    Uuid();
-  static Uuid generateOne();
+    static Uuid generateOne();
-  static Uuid parse(const std::string& s);
+    static Uuid parse(const std::string& s);
-  std::string toString() const;
+    std::string toString() const;
-  bool operator < (const Uuid& right) const;
+    bool operator < (const Uuid& right) const;
 
 protected:
-#if defined(USE_NULL_UUID)
+    uint8_t mUuid[16];
-  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
 };
 
 

src/engine/helper/HL_Xcap.cpp

@@ -0,0 +1,109 @@
+/* Copyright(C) 2007-2023 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 "HL_Xcap.h"
+#include <sstream>
+#include <iomanip>
+#include <memory.h>
+#include <algorithm>
+#include <inttypes.h>
+
+#ifdef TARGET_WIN
+# include <WinSock2.h>
+# include <Windows.h>
+# include <cctype>
+#endif
+
+#define XML_HEADER "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>"
+// --------------------- XcapHelper -----------------
+std::string XcapHelper::buildBuddyList(const std::string& listName, const std::vector<std::string>& buddies)
+{
+    std::ostringstream result;
+    result << XML_HEADER <<
+              "<resource-lists xmlns=\"urn:ietf:params:xml:ns:resource-lists\">" <<
+              "<list name=\"" << listName.c_str() << "\">";
+
+    // to test CT only!
+    //result << "<entry uri=\"" << "sip:dbogovych1@10.11.1.25" << "\"/>";
+    //result << "<entry uri=\"" << "sip:dbogovych2@10.11.1.25" << "\"/>";
+
+    for (unsigned i = 0; i<buddies.size(); i++)
+    {
+        result << "<entry uri=\"" << normalizeSipUri(buddies[i]).c_str() << "\"/>";
+    }
+    result << "</list></resource-lists>";
+    return result.str();
+}
+
+std::string XcapHelper::buildRules(const std::vector<std::string>& buddies)
+{
+    std::ostringstream result;
+    result << XML_HEADER <<
+              "<ruleset xmlns=\"urn:ietf:params:xml:ns:common-policy\">" <<
+              "<rule id=\"presence_allow\">" <<
+              "<conditions>";
+
+    for (unsigned i = 0; i<buddies.size(); i++)
+    {
+        result << "<identity><one id=\"" <<
+                  normalizeSipUri(buddies[i]).c_str() << "\"/></identity>";
+    }
+    result << "</conditions>" <<
+              "<actions>" <<
+              "<sub-handling xmlns=\"urn:ietf:params:xml:ns:pres-rules\">" <<
+              "allow" <<
+              "</sub-handling>" <<
+              "</actions>" <<
+              "<transformations>" <<
+              "<provide-devices xmlns=\"urn:ietf:params:xml:ns:pres-rules\">" <<
+              "<all-devices/>" <<
+              "</provide-devices>" <<
+              "<provide-persons xmlns=\"urn:ietf:params:xml:ns:pres-rules\">" <<
+              "<all-persons/>" <<
+              "</provide-persons>" <<
+              "<provide-services xmlns=\"urn:ietf:params:xml:ns:pres-rules\">" <<
+              "<all-services/>" <<
+              "</provide-services>" <<
+              "</transformations>" <<
+              "</rule>" <<
+              "</ruleset>";
+    return result.str();
+}
+
+std::string XcapHelper::buildServices(const std::string& serviceUri, const std::string& listRef)
+{
+    std::ostringstream result;
+
+    result << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"                          << std::endl <<
+              "<rls-services xmlns=\"urn:ietf:params:xml:ns:rls-services\""         << std::endl <<
+              "xmlns:rl=\"urn:ietf:params:xml:ns:resource-lists\""                  << std::endl <<
+              "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">"            << std::endl <<
+              "<service uri=\"" << normalizeSipUri(serviceUri).c_str() << "\">"     << std::endl <<
+              "<resource-list>" << listRef.c_str() << "</resource-list>"            << std::endl <<
+              "<packages>"                                                          << std::endl <<
+              "<package>presence</package>"                                         << std::endl <<
+              "</packages>"                                                         << std::endl <<
+              "</service>"                                                          << std::endl <<
+              "</rls-services>";
+
+    return result.str();
+}
+
+std::string XcapHelper::normalizeSipUri(const std::string& uri)
+{
+    std::string t(uri);
+
+    if (t.length())
+    {
+        if (t[0] == '<')
+            t.erase(0,1);
+        if (t.length())
+        {
+            if (t[t.length()-1] == '>')
+                t.erase(uri.length()-1, 1);
+        }
+    }
+    return t;
+}

src/engine/helper/HL_Xcap.h

@@ -0,0 +1,23 @@
+/* Copyright(C) 2007-2024 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/. */
+
+#ifndef __HELPER_STRING_H
+#define __HELPER_STRING_H
+
+#include <vector>
+#include <string>
+#include <sstream>
+
+class XcapHelper
+{
+public:
+    static std::string buildBuddyList(const std::string& listName, const std::vector<std::string>& buddies);
+    static std::string buildRules(const std::vector<std::string>& buddies);
+    static std::string buildServices(const std::string& serviceUri, const std::string& listRef);
+    static std::string normalizeSipUri(const std::string& uri);
+};
+
+
+#endif

src/engine/media/CMakeLists.txt

@@ -1,19 +1,16 @@
 project (media_lib)
 
-# Rely on C++ 11
+if (NOT DEFINED LIB_PLATFORM)
-set (CMAKE_CXX_STANDARD 11)
+    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)
 
-# Set of variables to control references to codecs
-set (USE_AMR_CODEC       OFF CACHE BOOL "Use AMR codec. Requires libraries.")
-set (USE_EVS_CODEC       OFF CACHE BOOL "Use EVS codec."                    )
-set (USE_OPUS_CODEC      OFF CACHE BOOL "Use Opus codec."                   )
-set (USE_PVQA_LIB        OFF CACHE BOOL "Build with Sevana PVQA library"    )
-set (USE_AQUA_LIB        OFF CACHE BOOL "Build with Sevana AQuA library"    )
-
 set (SOURCES
     MT_Statistics.cpp
     MT_WebRtc.cpp
@@ -29,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
@@ -44,42 +43,55 @@ 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)
-    message("AMR NB and WB codecs will be included.")
+    include (${LIB_PLATFORM}/platform_libs.cmake)
-    add_definitions(-DUSE_AMR_CODEC)
+    message("Media: AMR NB and WB codecs will be included.")
-    set(SOURCES ${SOURCES} MT_AmrCodec.cpp MT_AmrCodec.h)
+    target_compile_definitions(media_lib PUBLIC USE_AMR_CODEC)
+    list (APPEND LIBS_CODEC ${OPENCORE_AMRNB} ${OPENCORE_AMRWB})
 endif()
 
 if (USE_EVS_CODEC)
-    message("EVS codec will be included.")
+    message("Media: EVS codec will be included.")
-    add_definitions (-DUSE_EVS_CODEC)
+    target_compile_definitions (media_lib PUBLIC USE_EVS_CODEC)
-    set (SOURCES ${SOURCES} MT_EvsCodec.cpp MT_EvsCodec.h)
+    list (APPEND LIBS_CODEC evs_codec)
 endif()
 
 if (USE_OPUS_CODEC)
-    message("Opus codec will be included.")
+    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*" OR CMAKE_SYSTEM MATCHES "Darwin*")
-if(CMAKE_SYSTEM MATCHES "Linux*")
+    target_compile_definitions(media_lib PUBLIC HAVE_NETINET_IN_H)
-    add_definitions(-DHAVE_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
+    target_compile_definitions(media_lib PRIVATE
-        -D_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS -DUNICODE -D_UNICODE )
+        _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
+target_link_libraries(media_lib ice_stack ${LIBS_CODEC})
+
+set_property(TARGET media_lib PROPERTY
+  MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 
 target_include_directories(media_lib
     PUBLIC  ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/
@@ -87,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
@@ -99,8 +111,5 @@ target_include_directories(media_lib
             ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/libevs/basic_op
             ${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,
+// Constant of AMR-NB frame lengths in bytes.
-                                          6 , 0 , 0 , 0 , 0 , 0 , 0 , 1  };
+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.
- * 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 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.
- */
 const uint16_t amrwb_framelenbits[10] =
-{132, 177, 253, 285, 317, 365, 397, 461, 477, 40};
+    {132, 177, 253, 285, 317, 365, 397, 461, 477, 40 /* SID packet */};
-
-/**
- * Constant of AMR-WB bitrates.
- */
-const uint16_t amrwb_bitrates[9] =
-{6600, 8850, 12650, 14250, 15850, 18250, 19850, 23050, 23850};
-
 
 // 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));
+    ByteBuffer byte_reader(input.mPayload, static_cast<size_t>(input.mPayloadLength));
-    BitReader br(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));
+    result.mCodeModeRequest = static_cast<uint8_t>(bit_reader.readBits(4));
-    //ICELogMedia(<< "CMR: " << result.mCodeModeRequest);
 
     // 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)) ||
+        bool discard = input.mWideband ? (f.mFrameType >= 10 && f.mFrameType <= 13) : (f.mFrameType >= 9 && f.mFrameType <= 14);
-            (!input.mWideband && (FT >= 9 && FT <= 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.mWideband && f.mFrameType == 15)
-        if (input.mOctetAligned)
+        {
-            br.readBits(2);
+            // DTX, no sense to decode the data
+            continue;
+        }
 
-        AmrFrame frame;
+        if (input.mWideband && f.mFrameType == 14)
-        frame.mFrameType = FT;
+        {
+            // Speech lost code only
+            continue;
+        }
 
-        frame.mMode = FT < SID_FT ? FT : 0xFF;
+        if (!f.mGoodQuality)
-        frame.mGoodQuality = Q == 1;
+        {
-        frame.mTimestamp = input.mCurrentTimestamp;
+            // Bad quality, frame is damaged
+            continue;
+        }
 
-        result.mFrames.push_back(frame);
+        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];
-        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()));
 
         if (bitsLength > 0)
         {
             if (input.mOctetAligned)
             {
-                if (dataIn.size() < byteLength)
+                if (byte_reader.size() < byteLength)
-                    frame.mGoodQuality = false;
+                    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>();
+                f.mData = std::make_shared<ByteBuffer>();
-                frame.mData->resize(bitsLength / 8 + ((bitsLength % 8) ? 1 : 0) + 1);
+                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)
+                if (bit_reader.readBits(f.mData->mutableData() + 1, bitsLength /*+ bitsLength*/ ) < (size_t)bitsLength)
-                    frame.mGoodQuality = false;
+                    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())
+    throw Exception(ERR_NOT_IMPLEMENTED);
-        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();
 }
 
 #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)
-    {
+        return decodeIuup(inputBuffer, outputBuffer);
-        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();
-    }
     else
-    {
+        return decodePlain(inputBuffer, outputBuffer);
-        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 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
+struct AmrCodecConfig
-  {
+{
-    bool mIuUP;
+    bool    mIuUP = false;
-    bool mOctetAligned;
+    bool    mOctetAligned = false;
-    int mPayloadType;
+    int     mPayloadType = -1;
-  };
+};
 
-  class AmrNbCodec : public Codec
+class AmrNbCodec : public Codec
-  {
+{
-  protected:
+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;
+        const char* name() override;
-      int samplerate() override;
+        int samplerate() override;
-      int payloadType() override;
+        int payloadType() override;
 
-#ifdef USE_RESIP_INTEGRATION
+        void updateSdp(resip::SdpContents::Session::Medium::CodecContainer& codecs, SdpDirection direction) override;
-      void updateSdp(resip::SdpContents::Session::Medium::CodecContainer& codecs, SdpDirection direction) override;
+        int processSdp(const 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;
-      void create(CodecMap& codecs) override;
+
-#endif
+        PCodec create() 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
+struct AmrWbStatistics
-  {
+{
-  protected:
+    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;
+        const char* name() override;
-      int samplerate() override;
+        int samplerate() override;
-      int payloadType() override;
+        int payloadType() override;
 
-#ifdef USE_RESIP_INTEGRATION
+        void updateSdp(resip::SdpContents::Session::Medium::CodecContainer& codecs, SdpDirection direction) override;
-      void updateSdp(resip::SdpContents::Session::Medium::CodecContainer& codecs, SdpDirection direction) override;
+        int processSdp(const 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;
-      void create(CodecMap& codecs) override;
+
-#endif
+        PCodec create() 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
+class GsmEfrCodec : public Codec
-  {
+{
-  protected:
+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;
+        const char* name() override;
-      int samplerate() override;
+        int samplerate() override;
-      int payloadType() override;
+        int payloadType() override;
 
-#ifdef USE_RESIP_INTEGRATION
+        void updateSdp(resip::SdpContents::Session::Medium::CodecContainer& codecs, SdpDirection direction) override;
-      void updateSdp(resip::SdpContents::Session::Medium::CodecContainer& codecs, SdpDirection direction) override;
+        int processSdp(const 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;
-      void create(CodecMap& codecs) override;
+
-#endif
+        PCodec create() override;
-      PCodec create() override;
 
     protected:
-      bool mIuUP;
+        bool mIuUP;
-      int mPayloadType;
+        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,16 +3,20 @@
  * 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"
 #include "../helper/HL_Log.h"
+#include "../helper/HL_Time.h"
 #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"
@@ -47,12 +51,22 @@ int RtpBuffer::Packet::rate() const
     return mRate;
 }
 
+const std::vector<short>& RtpBuffer::Packet::pcm() const
+{
+    return mPcm;
+}
+
+std::vector<short>& RtpBuffer::Packet::pcm()
+{
+    return mPcm;
+}
+
 // ------------ RtpBuffer ----------------
 RtpBuffer::RtpBuffer(Statistics& stat)
-    :mStat(stat), mSsrc(0), mHigh(RTP_BUFFER_HIGH), mLow(RTP_BUFFER_LOW), mPrebuffer(RTP_BUFFER_PREBUFFER),
+    :mStat(stat)
-      mFirstPacketWillGo(true), mReturnedCounter(0), mAddCounter(0),
-      mFetchedPacket(std::shared_ptr<RTPPacket>(), 0, 0)
 {
+    if (mStat.mPacketLoss)
+        std::cout << "Warning: packet loss is not zero" << std::endl;
 }
 
 RtpBuffer::~RtpBuffer()
@@ -96,19 +110,27 @@ int RtpBuffer::getCount() const
     return static_cast<int>(mPacketList.size());
 }
 
-bool SequenceSort(const RtpBuffer::Packet& p1, const RtpBuffer::Packet& p2)
+bool SequenceSort(const std::shared_ptr<RtpBuffer::Packet>& p1, const std::shared_ptr<RtpBuffer::Packet>& p2)
 {
-    return p1.rtp()->GetExtendedSequenceNumber() < p2.rtp()->GetExtendedSequenceNumber();
+    return p1->rtp()->GetExtendedSequenceNumber() < p2->rtp()->GetExtendedSequenceNumber();
 }
 
-bool RtpBuffer::add(std::shared_ptr<jrtplib::RTPPacket> packet, int timelength, int rate)
+std::shared_ptr<RtpBuffer::Packet> RtpBuffer::add(std::shared_ptr<jrtplib::RTPPacket> packet, int timelength, int rate)
 {
     if (!packet)
-        return false;
+        return std::shared_ptr<Packet>();
 
     Lock l(mGuard);
 
     // Update statistics
+    if (mLastAddTime == 0.0)
+        mLastAddTime = now_ms();
+    else
+    {
+        float t = now_ms();
+        mStat.mPacketInterval.process(t - mLastAddTime);
+        mLastAddTime = t;
+    }
     mStat.mSsrc = static_cast<uint16_t>(packet->GetSSRC());
 
     // Update jitter
@@ -121,15 +143,15 @@ bool RtpBuffer::add(std::shared_ptr<jrtplib::RTPPacket> packet, int timelength,
     // New sequence number
     unsigned newSeqno = packet->GetExtendedSequenceNumber();
 
-    for (Packet& p: mPacketList)
+    for (std::shared_ptr<Packet>& p: mPacketList)
     {
-        unsigned seqno = p.rtp()->GetExtendedSequenceNumber();
+        unsigned seqno = p->rtp()->GetExtendedSequenceNumber();
 
         if (seqno == newSeqno)
         {
             mStat.mDuplicatedRtp++;
             ICELogMedia(<< "Discovered duplicated packet, skipping");
-            return false;
+            return std::shared_ptr<Packet>();
         }
 
         if (seqno > maxno)
@@ -143,8 +165,11 @@ bool RtpBuffer::add(std::shared_ptr<jrtplib::RTPPacket> packet, int timelength,
 
     if (newSeqno > minno || (available < mHigh))
     {
-        Packet p(packet, timelength, rate);
+        // Insert into queue
+        auto p = std::make_shared<Packet>(packet, timelength, rate);
         mPacketList.push_back(p);
+
+        // Sort again
         std::sort(mPacketList.begin(), mPacketList.end(), SequenceSort);
 
         // Limit by max timelength
@@ -152,21 +177,18 @@ bool RtpBuffer::add(std::shared_ptr<jrtplib::RTPPacket> packet, int timelength,
 
         if (available > mHigh)
             ICELogMedia(<< "Available " << available << "ms with limit " << mHigh << "ms");
-        /*while (available > mHigh && mPacketList.size())
+
-        {
+        return p;
-            ICELogDebug( << "Dropping RTP packet from jitter buffer");
-            available -= mPacketList.front().timelength();
-            mPacketList.erase(mPacketList.begin());
-        }*/
     }
     else
     {
         ICELogMedia(<< "Too old packet, skipping");
         mStat.mOldRtp++;
-        return false;
+
+        return std::shared_ptr<Packet>();
     }
 
-    return true;
+    return std::shared_ptr<Packet>();
 }
 
 RtpBuffer::FetchResult RtpBuffer::fetch(ResultList& rl)
@@ -179,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();
+        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());
@@ -195,65 +218,48 @@ RtpBuffer::FetchResult RtpBuffer::fetch(ResultList& rl)
     }
 
     if (total < mLow)
+    {
+        // Still not prebuffered
         result = FetchResult::NoPacket;
+    }
     else
     {
-        if (mFetchedPacket.rtp())
+        // 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 (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 = seqno - mFetchedPacket.rtp()->GetSequenceNumber() - 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;
-                    Packet& p = mPacketList.front();
+                    rl.push_back(mPacketList.front());
-                    rl.push_back(p.rtp());
-
-                    // Maybe it is time to replay packet right now ? For case of AMR SID packets
-                    /*if (mFetchedPacket.rtp() && gap == 0 && mFetchedPacket.timelength() >= 10 && p.timelength() >= 10)
-                    {
-                        int timestampDelta;
-                        // Timestamp difference
-                        if (p.rtp()->GetTimestamp() > mFetchedPacket.rtp()->GetTimestamp())
-                            timestampDelta = TimeHelper::getDelta(p.rtp()->GetTimestamp(), mFetchedPacket.rtp()->GetTimestamp());
-                        else
-                            timestampDelta = TimeHelper::getDelta(mFetchedPacket.rtp()->GetTimestamp(), p.rtp()->GetTimestamp());
-
-                        // Timestamp units per packet
-                        int nrOfPackets = timestampDelta / (p.timelength() * (p.rate() / 1000));
-
-                        // Add more copies of SID (most probably) packets
-                        for (int i = 0; i < nrOfPackets - 1; i++)
-                        {
-                            //assert(false);
-                            rl.push_back(p.rtp());
-                        }
-                    }*/
 
                     // Save last returned normal packet
                     mFetchedPacket = mPacketList.front();
+                    mLastSeqno = mPacketList.front()->rtp()->GetExtendedSequenceNumber();
 
                     // Remove returned packet from the list
                     mPacketList.erase(mPacketList.begin());
@@ -263,16 +269,17 @@ 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;
 
                 // Put it to output list
-                rl.push_back(mPacketList.front().rtp());
+                rl.push_back(mPacketList.front());
 
                 // Remember returned packet
                 mFetchedPacket = mPacketList.front();
+                mLastSeqno = mPacketList.front()->rtp()->GetExtendedSequenceNumber();
 
                 // Remove returned packet from buffer list
                 mPacketList.erase(mPacketList.begin());
@@ -295,7 +302,7 @@ int RtpBuffer::findTimelength()
 {
     int available = 0;
     for (unsigned i = 0; i < mPacketList.size(); i++)
-        available += mPacketList[i].timelength();
+        available += mPacketList[i]->timelength();
     return available;
 }
 
@@ -321,7 +328,7 @@ Receiver::~Receiver()
 
 //-------------- AudioReceiver ----------------
 AudioReceiver::AudioReceiver(const CodecList::Settings& settings, MT::Statistics &stat)
-    :Receiver(stat), mBuffer(stat), mFrameCount(0), mFailedCount(0), mCodecSettings(settings),
+    :Receiver(stat), mBuffer(stat), mCodecSettings(settings),
       mCodecList(settings)
 {
     // Init resamplers
@@ -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();
@@ -354,63 +356,145 @@ AudioReceiver::~AudioReceiver()
     mDecodedDump.reset();
 }
 
-
+// Update codec settings
-bool AudioReceiver::add(const std::shared_ptr<jrtplib::RTPPacket>& p, Codec** codec)
+void AudioReceiver::setCodecSettings(const CodecList::Settings& codecSettings)
 {
+    if (mCodecSettings == codecSettings)
+        return;
+
+    mCodecSettings = codecSettings;
+    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
+    size_t result = 0;
+
+    // Handle here regular RTP packets
+    // Check if payload length is ok
+    int tail = codec.rtpLength() ? p.GetPayloadLength() % codec.rtpLength() : 0;
+
+    if (!tail)
+    {
+        // Find number of frames
+        int frame_count = codec.rtpLength() ? p.GetPayloadLength() / codec.rtpLength() : 1;
+        int frame_length = codec.rtpLength() ? codec.rtpLength() : (int)p.GetPayloadLength();
+
+        // Save last packet time length
+        // mLastPacketTimeLength = mFrameCount * mCodec->frameTime();
+
+        // Decode
+
+        for (int i=0; i < frame_count; i++)
+        {
+            auto decoded_length = codec.decode(p.GetPayloadData() + i * codec.rtpLength(),
+                                               frame_length,
+                                               output_buffer,
+                                               output_capacity);
+
+            result += decoded_length;
+        }
+    }
+    else
+        ICELogMedia(<< "RTP packet with tail.");
+
+    return result;
+}
+
+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");
+        time_length = 10;
-        return false; // Reject packet with unknown payload type
     }
-
-    // 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
+    // Check if packet is too short from time length side
-        if (time_length < 2)
+    if (time_length < 2)
-        {
+    {
-            // It will cause statistics to report about bad RTP packet
+        // It will cause statistics to report about bad RTP packet
-            // I have to replay last packet payload here to avoid report about lost packet
+        // I have to replay last packet payload here to avoid report about lost packet
-            mBuffer.add(p, time_length, codecIter->second->samplerate());
+        mBuffer.add(p, time_length, samplerate);
-            return false;
+        return false;
-        }
+    }
 
     // Queue packet to buffer
-    return mBuffer.add(p, time_length, codecIter->second->samplerate());
+    auto packet = mBuffer.add(p, time_length, samplerate).get();
+
+    if (packet)
+    {
+        // Check if early decoding configured
+        if (mEarlyDecode && codec)
+        {
+            // Move data to packet buffer
+            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;
+    }
+    else
+        return false;
 }
 
 void AudioReceiver::processDecoded(Audio::DataWindow& output, int options)
@@ -424,18 +508,14 @@ 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);
 }
 
-bool AudioReceiver::getAudio(Audio::DataWindow& output, int options, int* rate)
+AudioReceiver::DecodeResult AudioReceiver::getAudio(Audio::DataWindow& output, int options, int* rate)
 {
-    bool result = false;
+    DecodeResult result = DecodeResult_Skip;
+    bool had_decode = false;
 
     // Get next packet from buffer
     RtpBuffer::ResultList rl;
@@ -443,7 +523,7 @@ bool AudioReceiver::getAudio(Audio::DataWindow& output, int options, int* rate)
     switch (fr)
     {
     case RtpBuffer::FetchResult::Gap:
-        ICELogInfo(<< "Gap detected.");
+        ICELogDebug(<< "Gap detected.");
 
         mDecodedLength = mResampledLength = 0;
         if (mCngPacket && mCodec)
@@ -454,42 +534,47 @@ bool AudioReceiver::getAudio(Audio::DataWindow& output, int options, int* rate)
                                                  reinterpret_cast<short*>(mDecodedFrame), false);
         }
         else
-            if (mCodec && mFrameCount && !mCodecSettings.mSkipDecode)
+        if (mCodec && mFrameCount && !mCodecSettings.mSkipDecode)
+        {
+            // Do PLC to mDecodedFrame/mDecodedLength
+            if (options & DecodeOptions_SkipDecode)
+                mDecodedLength = 0;
+            else
             {
-                // Do PLC to mDecodedFrame/mDecodedLength
+                mDecodedLength = mCodec->plc(mFrameCount, mDecodedFrame, sizeof mDecodedFrame);
-                if (options & DecodeOptions_SkipDecode)
+                if (!mDecodedLength)
-                    mDecodedLength = 0;
+                {
-                else
+                    // PLC is not support or failed
-                    mDecodedLength = mCodec->plc(mFrameCount, mDecodedFrame, sizeof mDecodedFrame);
+                    // 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)
         {
             processDecoded(output, options);
-            result = true;
+            result = DecodeResult_Ok;
         }
         break;
 
     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)
-        for (std::shared_ptr<RTPPacket>& p: rl)
         {
             assert(p);
             // Check if previously CNG packet was detected. Emit CNG audio here if needed.
             if (options & DecodeOptions_FillCngGap && mCngPacket && mCodec)
             {
                 // Fill CNG audio is server mode is present
-                int units = p->GetTimestamp() - mCngPacket->GetTimestamp();
+                int units = p->rtp()->GetTimestamp() - mCngPacket->GetTimestamp();
                 int milliseconds = units / (mCodec->samplerate() / 1000);
                 if (milliseconds > mLastPacketTimeLength)
                 {
@@ -518,73 +603,91 @@ bool AudioReceiver::getAudio(Audio::DataWindow& output, int options, int* rate)
                         if (mDecodedLength)
                             processDecoded(output, options);
                     }
-                    result = true;
+                    result = DecodeResult_Ok;
                 }
             }
 
-            // Find codec
+            if (mEarlyDecode)
-            mCodec = mCodecMap[p->GetPayloadType()];
-            if (mCodec)
             {
-                if (rate)
+                // ToDo - copy the decoded data to output buffer
-                    *rate = mCodec->samplerate();
 
-                // Check if it is CNG packet
+            }
-                if ((p->GetPayloadType() == 0 || p->GetPayloadType() == 8) && p->GetPayloadLength() >= 1 && p->GetPayloadLength() <= 6)
+            else
+            {
+                // Find codec by payload type
+                int ptype = p->rtp()->GetPayloadType();
+                mCodec = mCodecMap[ptype];
+                if (mCodec)
                 {
-                    if (options & DecodeOptions_SkipDecode)
+                    if (rate)
-                        mDecodedLength = 0;
+                        *rate = mCodec->samplerate();
-                    else
+
+                    // Check if it is CNG packet
+                    if ((ptype == 0 || ptype == 8) && p->rtp()->GetPayloadLength() >= 1 && p->rtp()->GetPayloadLength() <= 6)
                     {
-                        mCngPacket = p;
+                        if (options & DecodeOptions_SkipDecode)
-                        mCngDecoder.decode3389(p->GetPayloadData(), p->GetPayloadLength());
+                            mDecodedLength = 0;
-                        // Emit CNG mLastPacketLength milliseconds
+                        else
-                        mDecodedLength = mCngDecoder.produce(mCodec->samplerate(), mLastPacketTimeLength,
-                                                             (short*)mDecodedFrame, true);
-                        if (mDecodedLength)
-                            processDecoded(output, options);
-                    }
-                    result = true;
-                }
-                else
-                {
-                    // Reset CNG packet
-                    mCngPacket.reset();
-
-                    // Handle here regular RTP packets
-                    // Check if payload length is ok
-                    int tail = mCodec->rtpLength() ? p->GetPayloadLength() % mCodec->rtpLength() : 0;
-
-                    if (!tail)
-                    {
-                        // Find number of frames
-                        mFrameCount = mCodec->rtpLength() ? p->GetPayloadLength() / mCodec->rtpLength() : 1;
-                        int frameLength = mCodec->rtpLength() ? mCodec->rtpLength() : (int)p->GetPayloadLength();
-
-                        // Save last packet time length
-                        mLastPacketTimeLength = mFrameCount * mCodec->frameTime();
-
-                        // Decode
-                        for (int i=0; i<mFrameCount && !mCodecSettings.mSkipDecode; i++)
                         {
-                            if (options & DecodeOptions_SkipDecode)
+                            mCngPacket = p->rtp();
-                                mDecodedLength = 0;
+                            mCngDecoder.decode3389(p->rtp()->GetPayloadData(), p->rtp()->GetPayloadLength());
-                            else
+                            // Emit CNG mLastPacketLength milliseconds
-                            {
+                            mDecodedLength = mCngDecoder.produce(mCodec->samplerate(), mLastPacketTimeLength,
-                                // Decode frame by frame
+                                                                 (short*)mDecodedFrame, true);
-                                mDecodedLength = mCodec->decode(p->GetPayloadData() + i*mCodec->rtpLength(),
+                            if (mDecodedLength)
-                                                                frameLength, mDecodedFrame, sizeof mDecodedFrame);
+                                processDecoded(output, options);
-                                if (mDecodedLength)
-                                    processDecoded(output, options);
-                            }
                         }
-                        result = mFrameCount > 0;
+                        result = DecodeResult_Ok;
-
-                        // Check for bitrate counter
-                        processStatisticsWithAmrCodec(mCodec.get());
                     }
                     else
-                        ICELogMedia(<< "RTP packet with tail.");
+                    {
+                        // Reset CNG packet
+                        mCngPacket.reset();
+
+                        // Handle here regular RTP packets
+                        // Check if payload length is ok
+                        size_t payload_length = p->rtp()->GetPayloadLength();
+                        size_t rtp_frame_length = mCodec->rtpLength();
+
+                        int tail = rtp_frame_length ? payload_length % rtp_frame_length : 0;
+
+                        if (!tail)
+                        {
+                            // Find number of frames
+                            mFrameCount = mCodec->rtpLength() ? p->rtp()->GetPayloadLength() / mCodec->rtpLength() : 1;
+                            int frameLength = mCodec->rtpLength() ? mCodec->rtpLength() : (int)p->rtp()->GetPayloadLength();
+
+                            // Save last packet time length
+                            mLastPacketTimeLength = mFrameCount * mCodec->frameTime();
+
+                            // Decode
+                            for (int i=0; i<mFrameCount && !mCodecSettings.mSkipDecode; i++)
+                            {
+                                if (options & DecodeOptions_SkipDecode)
+                                    mDecodedLength = 0;
+                                else
+                                {
+                                    // Trigger the statistics
+                                    had_decode = true;
+
+                                    // Decode frame by frame
+                                    mDecodedLength = mCodec->decode(p->rtp()->GetPayloadData() + i * mCodec->rtpLength(),
+                                                                    frameLength, mDecodedFrame, sizeof mDecodedFrame);
+                                    if (mDecodedLength > 0)
+                                        processDecoded(output, options);
+                                }
+                            }
+                            result = mFrameCount > 0 ? DecodeResult_Ok : DecodeResult_Skip;
+
+                            // Check for bitrate counter
+                            processStatisticsWithAmrCodec(mCodec.get());
+                        }
+                        else
+                        {
+                            result = DecodeResult_BadPacket;
+                            // ICELogMedia(<< "RTP packet with tail.");
+                        }
+                    }
                 }
             }
         }
@@ -594,6 +697,18 @@ bool AudioReceiver::getAudio(Audio::DataWindow& output, int options, int* rate)
         assert(0);
     }
 
+    if (had_decode)
+    {
+        // mStat.mDecodeRequested++;
+        if (mLastDecodeTime == 0.0)
+            mLastDecodeTime = now_ms();
+        else
+        {
+            float t = now_ms();
+            mStat.mDecodingInterval.process(t - mLastDecodeTime);
+            mLastDecodeTime = t;
+        }
+    }
     return result;
 }
 
@@ -639,62 +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>();
-        mPVQA->open(AUDIO_SAMPLERATE, 1, PVQA_INTERVAL);
-    }
-}
-
-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 = (int)fmt.timeFromSize(mPvqaBuffer->filled()) / (PVQA_INTERVAL * 1000);
-        if (frames > 0)
-        {
-            int time4pvqa = (int)(frames * PVQA_INTERVAL * 1000);
-            int size4pvqa = (int)fmt.sizeFromTime(time4pvqa);
-            ICELogInfo(<< "PVQA buffer has " << time4pvqa << " milliseconds of audio.");
-            mPVQA->update(mPvqaBuffer->data(), size4pvqa);
-            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 <optional>
-# include "pvqa++.h"
-#endif
-
-#include <map>
-
-// #define DUMP_DECODED
 
 namespace MT
 {
@@ -47,12 +38,17 @@ namespace MT
     public:
       Packet(const std::shared_ptr<RTPPacket>& packet, int timelen, int rate);
       std::shared_ptr<RTPPacket> rtp() const;
+
       int timelength() const;
       int rate() const;
 
+      const std::vector<short>& pcm() const;
+      std::vector<short>& pcm();
+
     protected:
       std::shared_ptr<RTPPacket> mRtp;
       int mTimelength = 0, mRate = 0;
+      std::vector<short> mPcm;
     };
 
     RtpBuffer(Statistics& stat);
@@ -60,35 +56,49 @@ namespace MT
 
     unsigned ssrc();
     void setSsrc(unsigned ssrc);
+
     void setHigh(int milliseconds);
     int high();
+
     void setLow(int milliseconds);
     int low();
+
     void setPrebuffer(int milliseconds);
     int prebuffer();
+
     int getNumberOfReturnedPackets() const;
     int getNumberOfAddPackets() const;
+
     int findTimelength();
     int getCount() const;
-    // Returns false if packet was not add - maybe too old or too new or duplicate
-    bool add(std::shared_ptr<RTPPacket> packet, int timelength, int rate);
 
-    typedef std::vector<std::shared_ptr<RTPPacket>> ResultList;
+    // Returns false if packet was not add - maybe too old or too new or duplicate
+    std::shared_ptr<Packet> add(std::shared_ptr<RTPPacket> packet, int timelength, int rate);
+
+    typedef std::vector<std::shared_ptr<Packet>> ResultList;
     typedef std::shared_ptr<ResultList> PResultList;
 
     FetchResult fetch(ResultList& rl);
     
   protected:
-    unsigned mSsrc;
+    unsigned mSsrc = 0;
-    int mHigh, mLow, mPrebuffer;
+    int mHigh = RTP_BUFFER_HIGH,
-    int mReturnedCounter, mAddCounter;
+        mLow = RTP_BUFFER_LOW,
+        mPrebuffer = RTP_BUFFER_PREBUFFER;
+    int mReturnedCounter = 0,
+        mAddCounter = 0;
+
     mutable Mutex mGuard;
-    typedef std::vector<Packet> PacketList;
+    typedef std::vector<std::shared_ptr<Packet>> PacketList;
     PacketList mPacketList;
     Statistics& mStat;
-    bool mFirstPacketWillGo;
+    bool mFirstPacketWillGo = true;
     jrtplib::RTPSourceStats mRtpStats;
-    Packet mFetchedPacket;
+    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;
   };
 
   class Receiver
@@ -107,6 +117,9 @@ namespace MT
     AudioReceiver(const CodecList::Settings& codecSettings, Statistics& stat);
     ~AudioReceiver();
     
+    // 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);
@@ -120,7 +133,14 @@ namespace MT
       DecodeOptions_SkipDecode = 4
     };
 
-    bool getAudio(Audio::DataWindow& output, int options = DecodeOptions_ResampleToMainRate, int* rate = nullptr);
+    enum DecodeResult
+    {
+        DecodeResult_Ok,
+        DecodeResult_Skip,
+        DecodeResult_BadPacket
+    };
+
+    DecodeResult getAudio(Audio::DataWindow& output, int options = DecodeOptions_ResampleToMainRate, int* rate = nullptr);
 
     // Looks for codec by payload type
     Codec* findCodec(int payloadType);
@@ -146,6 +166,9 @@ namespace MT
     std::shared_ptr<jrtplib::RTPPacket> mCngPacket;
     CngDecoder mCngDecoder;
 
+    // Decode RTP early, do not wait for speaker callback
+    bool mEarlyDecode = false;
+
     // Buffer to hold decoded data
     char mDecodedFrame[65536];
     int mDecodedLength = 0;
@@ -161,27 +184,23 @@ namespace MT
     // Last packet time length
     int mLastPacketTimeLength = 0;
 
-    int mFailedCount;
+    int mFailedCount = 0;
     Audio::Resampler  mResampler8, mResampler16,
                       mResampler32, mResampler48;
 
     Audio::PWavFileWriter mDecodedDump;
 
+    float mLastDecodeTime = 0.0; // Time last call happened to codec->decode()
+
+    float mIntervalSum = 0.0;
+    int mIntervalCount = 0;
+
     // Zero rate will make audio mono but resampling will be skipped
     void makeMonoAndResample(int rate, int channels);
 
     // 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

@@ -22,413 +22,416 @@
 
 using namespace MT;
 AudioStream::AudioStream(const CodecList::Settings& settings)
-:mPacketTime(0), mEncodedTime(0), mCodecSettings(settings),
+    :mPacketTime(0), mEncodedTime(0), mCodecSettings(settings),
-mRemoteTelephoneCodec(0), mRtpSession(), mTransmittingPayloadType(-1),
+      mRemoteTelephoneCodec(0), mRtpSession(), mTransmittingPayloadType(-1),
-mRtpSender(mStat)
+      mRtpSender(mStat)
 {
-  mOutputBuffer.setCapacity(16384);
+    mOutputBuffer.setCapacity(16384);
-  mCapturedAudio.setCapacity(16384);
+    mCapturedAudio.setCapacity(16384);
-  mCaptureResampler8.start(AUDIO_CHANNELS, AUDIO_SAMPLERATE, 8000);
+    mCaptureResampler8.start(AUDIO_CHANNELS, AUDIO_SAMPLERATE, 8000);
-  mCaptureResampler16.start(AUDIO_CHANNELS, AUDIO_SAMPLERATE, 16000);
+    mCaptureResampler16.start(AUDIO_CHANNELS, AUDIO_SAMPLERATE, 16000);
-  mCaptureResampler32.start(AUDIO_CHANNELS, AUDIO_SAMPLERATE, 32000);
+    mCaptureResampler32.start(AUDIO_CHANNELS, AUDIO_SAMPLERATE, 32000);
-  mCaptureResampler48.start(AUDIO_CHANNELS, AUDIO_SAMPLERATE, 48000);
+    mCaptureResampler48.start(AUDIO_CHANNELS, AUDIO_SAMPLERATE, 48000);
 
-  // Configure transmitter
+    // Configure transmitter
-  jrtplib::RTPExternalTransmissionParams params(&mRtpSender, 0);
+    jrtplib::RTPExternalTransmissionParams params(&mRtpSender, 0);
 
-  jrtplib::RTPSessionParams sessionParams;
+    jrtplib::RTPSessionParams sessionParams;
-  sessionParams.SetAcceptOwnPackets(true);
+    sessionParams.SetAcceptOwnPackets(true);
-  sessionParams.SetMaximumPacketSize(MT_MAXRTPPACKET);
+    sessionParams.SetMaximumPacketSize(MT_MAXRTPPACKET);
-  sessionParams.SetResolveLocalHostname(false);
+    sessionParams.SetResolveLocalHostname(false);
-  sessionParams.SetUsePollThread(false);
+    sessionParams.SetUsePollThread(false);
-  sessionParams.SetOwnTimestampUnit(1/8000.0);
+    sessionParams.SetOwnTimestampUnit(1/8000.0);
-  mRtpSession.Create(sessionParams, &params, jrtplib::RTPTransmitter::ExternalProto);
+    mRtpSession.Create(sessionParams, &params, jrtplib::RTPTransmitter::ExternalProto);
-  mRtpDtmfSession.Create(sessionParams, &params, jrtplib::RTPTransmitter::ExternalProto);
+    mRtpDtmfSession.Create(sessionParams, &params, jrtplib::RTPTransmitter::ExternalProto);
 
-  // Attach srtp session to sender
+    // Attach srtp session to sender
-  mRtpSender.setSrtpSession(&mSrtpSession);
+    mRtpSender.setSrtpSession(&mSrtpSession);
-  //mRtpDump = new RtpDump("d:\\outgoing.rtp");
+    //mRtpDump = new RtpDump("d:\\outgoing.rtp");
-  //mRtpSender.setDumpWriter(mRtpDump);
+    //mRtpSender.setDumpWriter(mRtpDump);
 
 #if defined(DUMP_SENDING_AUDIO)
-  mSendingDump = std::make_shared<WavFileWriter>();
+    mSendingDump = std::make_shared<WavFileWriter>();
-  mSendingDump->open("sending_audio.wav", 8000, 1);
+    mSendingDump->open("sending_audio.wav", 8000, 1);
 #endif
 }
 
 AudioStream::~AudioStream()
 {
-  ICELogInfo(<< "Delete AudioStream instance");
+    ICELogInfo(<< "Delete AudioStream instance");
-  if (mSendingDump)
+    if (mSendingDump)
-  {
+    {
-    mSendingDump->close();
+        mSendingDump->close();
-    mSendingDump.reset();
+        mSendingDump.reset();
-  }
+    }
 
-  // Delete used rtp streams
+    // Delete used rtp streams
-  for (AudioStreamMap::iterator streamIter = mStreamMap.begin(); streamIter != mStreamMap.end(); ++streamIter)
+    for (AudioStreamMap::iterator streamIter = mStreamMap.begin(); streamIter != mStreamMap.end(); ++streamIter)
-    delete streamIter->second;
+        delete streamIter->second;
-  mStreamMap.clear();
+    mStreamMap.clear();
 
-  if (mRtpDtmfSession.IsActive())
+    if (mRtpDtmfSession.IsActive())
-    mRtpDtmfSession.Destroy();
+        mRtpDtmfSession.Destroy();
-  if (mRtpSession.IsActive())
+    if (mRtpSession.IsActive())
-    mRtpSession.Destroy();
+        mRtpSession.Destroy();
 
 #if defined(USE_RTPDUMP)
-  if (mRtpDump)
+    if (mRtpDump)
-  {
+    {
-    mRtpDump->flush();
+        mRtpDump->flush();
-    delete mRtpDump;
+        delete mRtpDump;
-  }
+    }
 #endif
 
-  mCaptureResampler8.stop();
+    mCaptureResampler8.stop();
-  mCaptureResampler16.stop();
+    mCaptureResampler16.stop();
-  mCaptureResampler32.stop();
+    mCaptureResampler32.stop();
-  mCaptureResampler48.stop();
+    mCaptureResampler48.stop();
-  ICELogInfo(<< "Encoded " << mEncodedTime << " milliseconds of audio");
+    ICELogInfo(<< "Encoded " << mEncodedTime << " milliseconds of audio");
 
-  if (mDumpStreams.mStreamForRecordingIncoming)
+    if (mDumpStreams.mStreamForRecordingIncoming)
-    mDumpStreams.mStreamForRecordingIncoming->close();
+        mDumpStreams.mStreamForRecordingIncoming->close();
-  if (mDumpStreams.mStreamForReadingOutgoing)
+    if (mDumpStreams.mStreamForReadingOutgoing)
-    mDumpStreams.mStreamForReadingOutgoing->close();
+        mDumpStreams.mStreamForReadingOutgoing->close();
 
-  if (mFinalStatistics)
+    if (mFinalStatistics)
-    *mFinalStatistics = mStat;
+        *mFinalStatistics = mStat;
 
-  ICELogInfo(<< mStat.toShortString());
+    ICELogInfo(<< mStat.toString());
 }
 
 void AudioStream::setDestination(const RtpPair<InternetAddress>& dest)
 {
-  Lock l(mMutex);
+    Lock l(mMutex);
-  Stream::setDestination(dest);
+    Stream::setDestination(dest);
-  mRtpSender.setDestination(dest);
+    mRtpSender.setDestination(dest);
 }
 
 void AudioStream::setTransmittingCodec(Codec::Factory& factory, int payloadType)  
 {
-  ICELogInfo(<< "Selected codec " << factory.name() << "/" << factory.samplerate() << " for transmitting");
+    ICELogInfo(<< "Selected codec " << factory.name() << "/" << factory.samplerate() << " for transmitting");
 
-  Lock l(mMutex);
+    Lock l(mMutex);
-  mTransmittingCodec = factory.create();
+    mTransmittingCodec = factory.create();
-  mTransmittingPayloadType = payloadType;
+    mTransmittingPayloadType = payloadType;
-  if (mRtpSession.IsActive())
+    if (mRtpSession.IsActive())
-    mRtpSession.SetTimestampUnit(1.0 / mTransmittingCodec->samplerate());
+        mRtpSession.SetTimestampUnit(1.0 / mTransmittingCodec->samplerate());
 }
 
 PCodec AudioStream::transmittingCodec()
 {
-  Lock l(mMutex);
+    Lock l(mMutex);
-  return mTransmittingCodec;
+    return mTransmittingCodec;
 }
 
 void AudioStream::addData(const void* buffer, int bytes)
 {
-  assert(bytes == AUDIO_MIC_BUFFER_SIZE);
+    assert(bytes == AUDIO_MIC_BUFFER_SIZE);
 
-  // Read predefined audio if configured
+    // Read predefined audio if configured
-  if (mDumpStreams.mStreamForReadingOutgoing)
+    if (mDumpStreams.mStreamForReadingOutgoing)
-  {
+    {
-    if (mDumpStreams.mStreamForReadingOutgoing->isOpened())
+        if (mDumpStreams.mStreamForReadingOutgoing->isOpened())
-      mDumpStreams.mStreamForReadingOutgoing->read(const_cast<void*>(buffer), bytes);
+            mDumpStreams.mStreamForReadingOutgoing->read(const_cast<void*>(buffer), bytes);
-  }
-
-  // Read mirrored audio if needed
-  if (mMirror && mMirrorPrebuffered)
-    mMirrorBuffer.read(const_cast<void*>(buffer), bytes);
-
-  if (mMediaObserver)
-    mMediaObserver->onMedia(buffer, bytes, MT::Stream::MediaDirection::Outgoing, this, mMediaObserverTag);
-
-  Codec* codec = nullptr;
-  {
-    Lock l(mMutex);
-    codec = mTransmittingCodec.get();
-    if (nullptr == codec) {
-      // ICELogDebug(<< "No transmitting codec selected.");
-      return;
     }
-  }
 
-  // Resample
+    // Read mirrored audio if needed
-  unsigned dstlen = unsigned(float(codec->samplerate() / float(AUDIO_SAMPLERATE)) * bytes);
+    if (mMirror && mMirrorPrebuffered)
-  Audio::Resampler* r = nullptr;
+        mMirrorBuffer.read(const_cast<void*>(buffer), bytes);
-  switch (codec->samplerate())
-  {
-  case 8000:   r = &mCaptureResampler8; break;
-  case 16000:  r = &mCaptureResampler16; break;
-  case 32000:  r = &mCaptureResampler32; break;
-  case 48000:  r = &mCaptureResampler48; break;
-  default:
-    assert(0);
-  }
 
-  size_t processedInput = 0;
+    if (mMediaObserver)
-  dstlen = r->processBuffer(buffer, bytes, processedInput, mResampleBuffer, dstlen);
+        mMediaObserver->onMedia(buffer, bytes, MT::Stream::MediaDirection::Outgoing, this, mMediaObserverTag);
-  // ProcessedInput output value is ignored - because sample rate of input is always 8/16/32/48K - so all buffer is processed
 
-  // See if we need stereo <-> mono conversions
+    Codec* codec = nullptr;
-  unsigned stereolen = 0;
+    {
-  if (codec->channels() != AUDIO_CHANNELS)
+        Lock l(mMutex);
-  {
+        codec = mTransmittingCodec.get();
-    if (codec->channels() == 2)
+        if (nullptr == codec) {
-      stereolen = Audio::ChannelConverter::monoToStereo(mResampleBuffer, dstlen, mStereoBuffer, dstlen * 2);
+            // ICELogDebug(<< "No transmitting codec selected.");
+            return;
+        }
+    }
+
+    // Resample
+    unsigned dstlen = unsigned(float(codec->samplerate() / float(AUDIO_SAMPLERATE)) * bytes);
+    Audio::Resampler* r = nullptr;
+    switch (codec->samplerate())
+    {
+    case 8000:   r = &mCaptureResampler8; break;
+    case 16000:  r = &mCaptureResampler16; break;
+    case 32000:  r = &mCaptureResampler32; break;
+    case 48000:  r = &mCaptureResampler48; break;
+    default:
+        assert(0);
+    }
+
+    size_t processedInput = 0;
+    dstlen = r->processBuffer(buffer, bytes, processedInput, mResampleBuffer, dstlen);
+    // ProcessedInput output value is ignored - because sample rate of input is always 8/16/32/48K - so all buffer is processed
+
+    // See if we need stereo <-> mono conversions
+    unsigned stereolen = 0;
+    if (codec->channels() != AUDIO_CHANNELS)
+    {
+        if (codec->channels() == 2)
+            stereolen = Audio::ChannelConverter::monoToStereo(mResampleBuffer, dstlen, mStereoBuffer, dstlen * 2);
+        else
+            dstlen = Audio::ChannelConverter::stereoToMono(mResampleBuffer, dstlen, mResampleBuffer, dstlen / 2);
+    }
+
+    // See if inband dtmf audio should be sent instead
+    ByteBuffer dtmf;
+    if (mDtmfContext.type() == DtmfContext::Dtmf_Inband && mDtmfContext.getInband(AUDIO_MIC_BUFFER_LENGTH, codec->samplerate(), dtmf))
+        mCapturedAudio.add(dtmf.data(), dtmf.size());
     else
-      dstlen = Audio::ChannelConverter::stereoToMono(mResampleBuffer, dstlen, mResampleBuffer, dstlen / 2);
+        mCapturedAudio.add(stereolen ? mStereoBuffer : mResampleBuffer, stereolen ? stereolen : dstlen);
-  }
 
-  // See if inband dtmf audio should be sent instead
+    // See if it is time to send RFC2833 tone
-  ByteBuffer dtmf;
+    ByteBuffer rfc2833, stopPacket;
-  if (mDtmfContext.type() == DtmfContext::Dtmf_Inband && mDtmfContext.getInband(AUDIO_MIC_BUFFER_LENGTH, codec->samplerate(), dtmf))
+    if (mDtmfContext.type() == DtmfContext::Dtmf_Rfc2833 && mDtmfContext.getRfc2833(AUDIO_MIC_BUFFER_LENGTH, rfc2833, stopPacket))
-    mCapturedAudio.add(dtmf.data(), dtmf.size());
-  else
-    mCapturedAudio.add(stereolen ? mStereoBuffer : mResampleBuffer, stereolen ? stereolen : dstlen);
-
-  // See if it is time to send RFC2833 tone
-  ByteBuffer rfc2833, stopPacket;
-  if (mDtmfContext.type() == DtmfContext::Dtmf_Rfc2833 && mDtmfContext.getRfc2833(AUDIO_MIC_BUFFER_LENGTH, rfc2833, stopPacket))
-  {
-    if (rfc2833.size())
-      mRtpDtmfSession.SendPacket(rfc2833.data(), rfc2833.size(), mRemoteTelephoneCodec, true, AUDIO_MIC_BUFFER_LENGTH * 8);
-    
-    if (stopPacket.size())
     {
-      for (int i=0; i<3; i++)
+        if (rfc2833.size())
-        mRtpDtmfSession.SendPacket(stopPacket.data(), stopPacket.size(), mRemoteTelephoneCodec, true, AUDIO_MIC_BUFFER_LENGTH * 8);
+            mRtpDtmfSession.SendPacket(rfc2833.data(), rfc2833.size(), mRemoteTelephoneCodec, true, AUDIO_MIC_BUFFER_LENGTH * 8);
+
+        if (stopPacket.size())
+        {
+            for (int i=0; i<3; i++)
+                mRtpDtmfSession.SendPacket(stopPacket.data(), stopPacket.size(), mRemoteTelephoneCodec, true, AUDIO_MIC_BUFFER_LENGTH * 8);
+        }
     }
-  }
 
-  int processed = 0;
+    int processed = 0;
-  int encodedTime = 0;
+    int encodedTime = 0;
-  int packetTime = mPacketTime ? mPacketTime : codec->frameTime();
+    int packetTime = mPacketTime ? mPacketTime : codec->frameTime();
 
-  // Make stereo version if required
+    // Make stereo version if required
-  for (int i=0; i<mCapturedAudio.filled() / codec->pcmLength(); i++)
+    for (int i=0; i<mCapturedAudio.filled() / codec->pcmLength(); i++)
-  {
-    if (mSendingDump)
-      mSendingDump->write((const char*)mCapturedAudio.data() + codec->pcmLength() * i, codec->pcmLength());
-
-    int produced;
-    produced = codec->encode((const char*)mCapturedAudio.data() + codec->pcmLength()*i,
-        codec->pcmLength(), mFrameBuffer, MT_MAXAUDIOFRAME);
-        
-    // Counter of processed input bytes of raw pcm data from microphone
-    processed += codec->pcmLength();
-    encodedTime += codec->frameTime();
-    mEncodedTime += codec->frameTime();
-
-    if (produced)
     {
-      mEncodedAudio.appendBuffer(mFrameBuffer, produced);
+        if (mSendingDump)
-      if (packetTime <= encodedTime)
+            mSendingDump->write((const char*)mCapturedAudio.data() + codec->pcmLength() * i, codec->pcmLength());
-      {
+
-        // Time to send packet
+        int produced;
-        ICELogMedia(<< "Sending RTP packet pt = " << mTransmittingPayloadType << ", plength = " << (int)mEncodedAudio.size());
+        produced = codec->encode((const char*)mCapturedAudio.data() + codec->pcmLength()*i,
-        mRtpSession.SendPacketEx(mEncodedAudio.data(), mEncodedAudio.size(), mTransmittingPayloadType, false, 
+                                 codec->pcmLength(), mFrameBuffer, MT_MAXAUDIOFRAME);
-          packetTime * codec->samplerate()/1000, 0, NULL, 0);
+        
-        mEncodedAudio.clear();
+        // Counter of processed input bytes of raw pcm data from microphone
-        encodedTime = 0;
+        processed += codec->pcmLength();
-      }
+        encodedTime += codec->frameTime();
+        mEncodedTime += codec->frameTime();
+
+        if (produced)
+        {
+            mEncodedAudio.appendBuffer(mFrameBuffer, produced);
+            if (packetTime <= encodedTime)
+            {
+                // Time to send packet
+                ICELogMedia(<< "Sending RTP packet pt = " << mTransmittingPayloadType << ", plength = " << (int)mEncodedAudio.size());
+                mRtpSession.SendPacketEx(mEncodedAudio.data(), mEncodedAudio.size(), mTransmittingPayloadType, false,
+                                         packetTime * codec->samplerate()/1000, 0, NULL, 0);
+                mEncodedAudio.clear();
+                encodedTime = 0;
+            }
+        }
     }
-  }
+    if (processed > 0)
-  if (processed > 0)
+        mCapturedAudio.erase(processed);
-    mCapturedAudio.erase(processed);
 }
 
 void AudioStream::copyDataTo(Audio::Mixer& mixer, int needed)
 {
-  // Local audio mixer - used to send audio to media observer
+    // Local audio mixer - used to send audio to media observer
-  Audio::Mixer localMixer;
+    Audio::Mixer localMixer;
-  Audio::DataWindow forObserver;
+    Audio::DataWindow forObserver;
 
-  // Iterate
+    // Iterate
-  for (auto& streamIter: mStreamMap)
+    for (auto& streamIter: mStreamMap)
-  {
-    Audio::DataWindow w;
-    w.setCapacity(32768);
-    
-    SingleAudioStream* sas = streamIter.second;
-    if (sas)
     {
-      sas->copyPcmTo(w, needed);
+        Audio::DataWindow w;
+        w.setCapacity(32768);
 
-      // Provide mirroring if needed
+        SingleAudioStream* sas = streamIter.second;
-      if (mMirror)
+        if (sas)
-      {
-        mMirrorBuffer.add(w.data(), w.filled());
-        if (!mMirrorPrebuffered)
-          mMirrorPrebuffered = mMirrorBuffer.filled() >= MT_MIRROR_PREBUFFER;
-      }
-
-      if (!(state() & (int)StreamState::Receiving))
-        w.zero(needed);
-
-      // Check if we do not need input from this stream
-      if (w.filled())
-      {
-        if (mDumpStreams.mStreamForRecordingIncoming)
         {
-          if (mDumpStreams.mStreamForRecordingIncoming->isOpened())
+            sas->copyPcmTo(w, needed);
-            mDumpStreams.mStreamForRecordingIncoming->write(w.data(), w.filled());
+
+            // Provide mirroring if needed
+            if (mMirror)
+            {
+                mMirrorBuffer.add(w.data(), w.filled());
+                if (!mMirrorPrebuffered)
+                    mMirrorPrebuffered = mMirrorBuffer.filled() >= MT_MIRROR_PREBUFFER;
+            }
+
+            if (!(state() & (int)StreamState::Receiving))
+                w.zero(needed);
+
+            // Check if we do not need input from this stream
+            if (w.filled())
+            {
+                if (mDumpStreams.mStreamForRecordingIncoming)
+                {
+                    if (mDumpStreams.mStreamForRecordingIncoming->isOpened())
+                        mDumpStreams.mStreamForRecordingIncoming->write(w.data(), w.filled());
+                }
+                mixer.addPcm(this, streamIter.first, w, AUDIO_SAMPLERATE, false);
+
+                if (mMediaObserver)
+                    localMixer.addPcm(this, streamIter.first, w, AUDIO_SAMPLERATE, false);
+            }
         }
-        mixer.addPcm(this, streamIter.first, w, AUDIO_SAMPLERATE, false);
-
-        if (mMediaObserver)
-          localMixer.addPcm(this, streamIter.first, w, AUDIO_SAMPLERATE, false);
-      }
     }
-  }
 
-  if (mMediaObserver)
+    if (mMediaObserver)
-  {
+    {
-    localMixer.mixAndGetPcm(forObserver);
+        localMixer.mixAndGetPcm(forObserver);
-    mMediaObserver->onMedia(forObserver.data(), forObserver.capacity(), MT::Stream::MediaDirection::Incoming, this, mMediaObserverTag);
+        mMediaObserver->onMedia(forObserver.data(), forObserver.capacity(), MT::Stream::MediaDirection::Incoming, this, mMediaObserverTag);
-  }
+    }
 }
 
 void AudioStream::dataArrived(PDatagramSocket s, const void* buffer, int length, InternetAddress& source)
 {
-  jrtplib::RTPIPv6Address addr6;
+    jrtplib::RTPIPv6Address addr6;
-  jrtplib::RTPIPv4Address addr4;
+    jrtplib::RTPIPv4Address addr4;
-  jrtplib::RTPExternalTransmissionInfo* info = dynamic_cast<jrtplib::RTPExternalTransmissionInfo*>(mRtpSession.GetTransmissionInfo());
+    jrtplib::RTPExternalTransmissionInfo* info = dynamic_cast<jrtplib::RTPExternalTransmissionInfo*>(mRtpSession.GetTransmissionInfo());
-  assert(info);
+    assert(info);
 
-  // Drop RTP packets if stream is not receiving now; let RTCP go
+    // Drop RTP packets if stream is not receiving now; let RTCP go
-  if (!(state() & (int)StreamState::Receiving) && RtpHelper::isRtp(buffer, length))
+    if (!(state() & (int)StreamState::Receiving) && RtpHelper::isRtpOrRtcp(buffer, length))
-  {
-    ICELogMedia(<< "Stream is not allowed to receive RTP stream. Ignore the packet");
-    return;
-  }
-
-  // Copy incoming data to temp buffer to perform possible srtp unprotect
-  int receiveLength = length;
-  memcpy(mReceiveBuffer, buffer, length);
-
-  bool srtpResult;
-  if (mSrtpSession.active())
-  {
-    if (RtpHelper::isRtp(mReceiveBuffer, receiveLength))
-      srtpResult = mSrtpSession.unprotectRtp(mReceiveBuffer, &receiveLength);
-    else
-      srtpResult = mSrtpSession.unprotectRtcp(mReceiveBuffer, &receiveLength);
-    if (!srtpResult)
     {
-      ICELogError(<<"Cannot decrypt SRTP packet.");
+        ICELogMedia(<< "Stream is not allowed to receive RTP stream. Ignore the RT(C)P packet");
-      return;
+        return;
     }
-  }
 
-  //ICELogDebug(<< "Packet no: " << RtpHelper::findPacketNo(mReceiveBuffer, receiveLength));
+    // Copy incoming data to temp buffer to perform possible srtp unprotect
+    int receiveLength = length;
+    memcpy(mReceiveBuffer, buffer, length);
 
-  switch (source.family())
+    if (mSrtpSession.active())
-  {
-  case AF_INET:
-    addr4.SetIP(source.sockaddr4()->sin_addr.s_addr);
-    addr4.SetPort(source.port());
-    ICELogMedia(<< "Injecting RTP/RTCP packet into jrtplib");
-    info->GetPacketInjector()->InjectRTPorRTCP(mReceiveBuffer, receiveLength, addr4);
-    break;
-
-  case AF_INET6:
-    addr6.SetIP(source.sockaddr6()->sin6_addr);
-    addr6.SetPort(source.port());
-    ICELogMedia(<< "Injecting RTP/RTCP packet into jrtplib");
-    info->GetPacketInjector()->InjectRTPorRTCP(mReceiveBuffer, receiveLength, addr6);
-    break;
-
-  default:
-    assert(0);
-  }
-  
-  mStat.mReceived += length;
-  if (RtpHelper::isRtp(mReceiveBuffer, receiveLength))
-  {
-    if (!mStat.mFirstRtpTime.is_initialized())
-      mStat.mFirstRtpTime = std::chrono::system_clock::now();
-    mStat.mReceivedRtp++;
-  }
-  else
-    mStat.mReceivedRtcp++;
-
-  mRtpSession.Poll(); // maybe it is extra with external transmitter
-  bool hasData = mRtpSession.GotoFirstSourceWithData();
-  while (hasData)
-  {
-    std::shared_ptr<jrtplib::RTPPacket> packet(mRtpSession.GetNextPacket());
-    if (packet)
     {
-        ICELogMedia(<< "jrtplib returned packet");
+        bool srtpResult;
-        // Find right handler for rtp stream
+        size_t srcLength = length; size_t dstLength = sizeof mSrtpDecodeBuffer;
-        SingleAudioStream* rtpStream = nullptr;
+        if (RtpHelper::isRtp(mReceiveBuffer, receiveLength))
-        AudioStreamMap::iterator streamIter = mStreamMap.find(packet->GetSSRC());
+            srtpResult = mSrtpSession.unprotectRtp(mReceiveBuffer, srcLength, mSrtpDecodeBuffer, &dstLength);
-        if (streamIter == mStreamMap.end())
-          mStreamMap[packet->GetSSRC()] = rtpStream = new SingleAudioStream(mCodecSettings, mStat);
         else
-          rtpStream = streamIter->second;
+            srtpResult = mSrtpSession.unprotectRtcp(mReceiveBuffer, srcLength, mSrtpDecodeBuffer, &dstLength);
+        if (!srtpResult)
+        {
+            ICELogError(<<"Cannot decrypt SRTP packet.");
+            return;
+        }
 
-        // Process incoming data packet
+        memcpy(mReceiveBuffer, mSrtpDecodeBuffer, dstLength);
-        rtpStream->process(packet);
+        receiveLength = dstLength;
-        
+    }
-        double rtt = mRtpSession.GetCurrentSourceInfo()->INF_GetRoundtripTime().GetDouble();
+
-        if (rtt > 0)
+    switch (source.family())
-          mStat.mRttDelay.process(rtt);
+    {
+    case AF_INET:
+        addr4.SetIP(source.sockaddr4()->sin_addr.s_addr);
+        addr4.SetPort(source.port());
+        ICELogMedia(<< "Injecting RTP/RTCP packet into jrtplib");
+        info->GetPacketInjector()->InjectRTPorRTCP(mReceiveBuffer, receiveLength, addr4);
+        break;
+
+    case AF_INET6:
+        addr6.SetIP(source.sockaddr6()->sin6_addr);
+        addr6.SetPort(source.port());
+        ICELogMedia(<< "Injecting RTP/RTCP packet into jrtplib");
+        info->GetPacketInjector()->InjectRTPorRTCP(mReceiveBuffer, receiveLength, addr6);
+        break;
+
+    default:
+        assert(0);
+    }
+
+    mStat.mReceived += length;
+    if (RtpHelper::isRtp(mReceiveBuffer, receiveLength))
+    {
+        if (!mStat.mFirstRtpTime)
+            mStat.mFirstRtpTime = std::chrono::steady_clock::now();
+        mStat.mReceivedRtp++;
+    }
+    else
+        mStat.mReceivedRtcp++;
+
+    mRtpSession.Poll(); // maybe it is extra with external transmitter
+    bool hasData = mRtpSession.GotoFirstSourceWithData();
+    while (hasData)
+    {
+        std::shared_ptr<jrtplib::RTPPacket> packet(mRtpSession.GetNextPacket());
+        if (packet)
+        {
+            ICELogMedia(<< "jrtplib returned packet");
+
+            // Find right handler for rtp stream
+            SingleAudioStream* rtpStream = nullptr;
+            AudioStreamMap::iterator streamIter = mStreamMap.find(packet->GetSSRC());
+            if (streamIter == mStreamMap.end())
+                mStreamMap[packet->GetSSRC()] = rtpStream = new SingleAudioStream(mCodecSettings, mStat);
+            else
+                rtpStream = streamIter->second;
+
+            // Process incoming data packet
+            rtpStream->process(packet);
+
+            double rtt = mRtpSession.GetCurrentSourceInfo()->INF_GetRoundtripTime().GetDouble();
+            if (rtt > 0)
+                mStat.mRttDelay.process(rtt);
+        }
+        hasData = mRtpSession.GotoNextSourceWithData();
     }
-    hasData = mRtpSession.GotoNextSourceWithData();
-  }
 }
 
 void AudioStream::setState(unsigned state)
 {
-  Stream::setState(state);
+    Stream::setState(state);
 }
 
 void AudioStream::setTelephoneCodec(int payloadType)
 {
-  mRemoteTelephoneCodec = payloadType;
+    mRemoteTelephoneCodec = payloadType;
 }
 
 void AudioStream::setSocket(const RtpPair<PDatagramSocket>& socket)
 {
-  Stream::setSocket(socket);
+    Stream::setSocket(socket);
-  mRtpSender.setSocket(socket);
+    mRtpSender.setSocket(socket);
 }
 
 DtmfContext& AudioStream::queueOfDtmf()
 {
-  return mDtmfContext;
+    return mDtmfContext;
 }
 
 void AudioStream::readFile(const Audio::PWavFileReader& stream, MediaDirection direction)
 {
-  switch (direction)
+    switch (direction)
-  {
+    {
-  case MediaDirection::Outgoing: mDumpStreams.mStreamForReadingOutgoing = stream; break;
+    case MediaDirection::Outgoing: mDumpStreams.mStreamForReadingOutgoing = stream; break;
-  case MediaDirection::Incoming: mDumpStreams.mStreamForReadingIncoming = stream; break;
+    case MediaDirection::Incoming: mDumpStreams.mStreamForReadingIncoming = stream; break;
-  }
+    }
 }
 
 void AudioStream::writeFile(const Audio::PWavFileWriter& writer, MediaDirection direction)
 {
-  switch (direction)
+    switch (direction)
-  {
+    {
-  case MediaDirection::Outgoing: mDumpStreams.mStreamForRecordingOutgoing = writer; break;
+    case MediaDirection::Outgoing: mDumpStreams.mStreamForRecordingOutgoing = writer; break;
-  case MediaDirection::Incoming: mDumpStreams.mStreamForRecordingIncoming = writer; break;
+    case MediaDirection::Incoming: mDumpStreams.mStreamForRecordingIncoming = writer; break;
-  }
+    }
 }
 
 void AudioStream::setupMirror(bool enable)
 {
-  if (!mMirror && enable)
+    if (!mMirror && enable)
-  {
+    {
-    mMirrorBuffer.setCapacity(MT_MIRROR_CAPACITY);
+        mMirrorBuffer.setCapacity(MT_MIRROR_CAPACITY);
-    mMirrorPrebuffered = false;
+        mMirrorPrebuffered = false;
-  }
+    }
-  mMirror = enable;
+    mMirror = enable;
 }
 
 void AudioStream::setFinalStatisticsOutput(Statistics* stats)
 {
-  mFinalStatistics = stats;
+    mFinalStatistics = stats;
 }

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"
@@ -26,9 +26,9 @@
 namespace MT
 {
 
-  class AudioStream: public Stream
+class AudioStream: public Stream
-  {
+{
-  public:
+public:
     AudioStream(const CodecList::Settings& codecSettings);
     ~AudioStream();
 
@@ -59,7 +59,7 @@ namespace MT
 
     void setFinalStatisticsOutput(Statistics* stats);
 
-  protected:
+protected:
     Audio::DataWindow mCapturedAudio;     // Data from microphone
     Audio::DataWindow mStereoCapturedAudio;
     char mIncomingPcmBuffer[AUDIO_MIC_BUFFER_SIZE]; // Temporary buffer to allow reading from file
@@ -83,18 +83,19 @@ namespace MT
     RtpDump* mRtpDump = nullptr;
 #endif
     Audio::Resampler  mCaptureResampler8,
-                      mCaptureResampler16,
+    mCaptureResampler16,
-                      mCaptureResampler32,
+    mCaptureResampler32,
-                      mCaptureResampler48;
+    mCaptureResampler48;
     DtmfContext mDtmfContext;
-    char mReceiveBuffer[MAX_VALID_UDPPACKET_SIZE];
+    char mReceiveBuffer[MAX_VALID_UDPPACKET_SIZE],
+         mSrtpDecodeBuffer[MAX_VALID_UDPPACKET_SIZE];
 
     struct
     {
-      Audio::PWavFileWriter  mStreamForRecordingIncoming,
+        Audio::PWavFileWriter  mStreamForRecordingIncoming,
-                      mStreamForRecordingOutgoing;
+        mStreamForRecordingOutgoing;
-      Audio::PWavFileReader  mStreamForReadingIncoming,
+        Audio::PWavFileReader  mStreamForReadingIncoming,
-                      mStreamForReadingOutgoing;
+        mStreamForReadingOutgoing;
     } mDumpStreams;
 
     Audio::PWavFileWriter mSendingDump;
@@ -106,7 +107,7 @@ namespace MT
     Statistics* mFinalStatistics = nullptr;
 
     bool decryptSrtp(void* data, int* len);
-  };
+};
 };
 
 #endif

src/engine/media/MT_Box.cpp

@@ -34,13 +34,13 @@ Terminal::~Terminal()
   mAudioPair.reset();
 }
 
-PStream Terminal::createStream(int type, VariantMap& config)
+PStream Terminal::createStream(int type, VariantMap& /*config*/)
 {
   PStream result;
   switch (type)
   {
   case Stream::Audio:
-    result = PStream(new AudioStream(MT::CodecList::Settings::DefaultSettings));
+    result = std::make_shared<AudioStream>(MT::CodecList::Settings::DefaultSettings);
     mAudioList.add(result);
     break;
 
@@ -52,7 +52,7 @@ PStream Terminal::createStream(int type, VariantMap& config)
   return result;
 }
 
-void Terminal::freeStream(PStream stream)
+void Terminal::freeStream(const PStream& stream)
 {
   if (AudioStream* audio = dynamic_cast<AudioStream*>(stream.get()))
   {

src/engine/media/MT_Box.h

@@ -26,10 +26,11 @@ namespace MT
     CodecList& codeclist();  
 
     PStream createStream(int type, VariantMap& config);
-    void freeStream(PStream s);
+    void freeStream(const PStream& s);
     
     Audio::PDevicePair audio();
     void setAudio(const Audio::PDevicePair& audio);
+
   protected:
     StreamList mAudioList;
     std::mutex mAudioListMutex;

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
+