diff --git a/CMakeLists.txt b/CMakeLists.txt
index a2209c2958c..f3812641907 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -225,6 +225,8 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
         MIXED
     )
     add_compile_options(-Og)
+elseif (CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
+    add_compile_definitions(RELEASE)
 endif()
 
 add_compile_definitions(
diff --git a/Externals/BugTrap b/Externals/BugTrap
new file mode 160000
index 00000000000..c619077b40e
--- /dev/null
+++ b/Externals/BugTrap
@@ -0,0 +1 @@
+Subproject commit c619077b40ee6e7ad6ffc5a194a5d3583af8f78e
diff --git a/Externals/FreeMagic b/Externals/FreeMagic
new file mode 160000
index 00000000000..ba39f90bef4
--- /dev/null
+++ b/Externals/FreeMagic
@@ -0,0 +1 @@
+Subproject commit ba39f90bef46fd79166ccdb661e902f45d48560e
diff --git a/Externals/OpenAutomate b/Externals/OpenAutomate
new file mode 160000
index 00000000000..9ee089894c6
--- /dev/null
+++ b/Externals/OpenAutomate
@@ -0,0 +1 @@
+Subproject commit 9ee089894c6d403aba5968ce1c8c26578b8e2b0a
diff --git a/Externals/cryptopp b/Externals/cryptopp
new file mode 160000
index 00000000000..78a64e37d3e
--- /dev/null
+++ b/Externals/cryptopp
@@ -0,0 +1 @@
+Subproject commit 78a64e37d3ec8aa1fd941a1309b1a2eef43b0bb0
diff --git a/Externals/jpeg b/Externals/jpeg
new file mode 160000
index 00000000000..5c1582820d0
--- /dev/null
+++ b/Externals/jpeg
@@ -0,0 +1 @@
+Subproject commit 5c1582820d06a81d3f9991520b9c193f0eb2786f
diff --git a/Externals/libogg b/Externals/libogg
new file mode 160000
index 00000000000..db5c7a49ce7
--- /dev/null
+++ b/Externals/libogg
@@ -0,0 +1 @@
+Subproject commit db5c7a49ce7ebda47b15b78471e78fb7f2483e22
diff --git a/Externals/libtheora b/Externals/libtheora
new file mode 160000
index 00000000000..7180717276a
--- /dev/null
+++ b/Externals/libtheora
@@ -0,0 +1 @@
+Subproject commit 7180717276af1ebc7da15c83162d6c5d6203aabf
diff --git a/Externals/libvorbis b/Externals/libvorbis
new file mode 160000
index 00000000000..84c023699cd
--- /dev/null
+++ b/Externals/libvorbis
@@ -0,0 +1 @@
+Subproject commit 84c023699cdf023a32fa4ded32019f194afcdad0
diff --git a/Externals/lzo b/Externals/lzo
new file mode 160000
index 00000000000..9cd30c85a95
--- /dev/null
+++ b/Externals/lzo
@@ -0,0 +1 @@
+Subproject commit 9cd30c85a9518569278d0b221f234c141f85b495
diff --git a/Externals/mimalloc b/Externals/mimalloc
new file mode 160000
index 00000000000..762e1dc67b9
--- /dev/null
+++ b/Externals/mimalloc
@@ -0,0 +1 @@
+Subproject commit 762e1dc67b9bc6bbb3f4620c06b1eb0723553f40
diff --git a/Externals/zlib b/Externals/zlib
new file mode 160000
index 00000000000..21767c654d3
--- /dev/null
+++ b/Externals/zlib
@@ -0,0 +1 @@
+Subproject commit 21767c654d31d2dccdde4330529775c6c5fd5389
diff --git a/res/gamedata/configs/text/eng/openxray.xml b/res/gamedata/configs/text/eng/openxray.xml
index 61b16ec7296..7d1e2d7aff4 100644
--- a/res/gamedata/configs/text/eng/openxray.xml
+++ b/res/gamedata/configs/text/eng/openxray.xml
@@ -135,6 +135,9 @@
 	<string id="ui_mm_color_grading_warm">
 		<text>warm</text>
 	</string>
+	<string id="ui_mm_snd_input_device">
+		<text>Input Device</text>
+	</string>
 	<string id="eng">
 		<text>English</text>
 	</string>
diff --git a/res/gamedata/configs/text/ger/openxray.xml b/res/gamedata/configs/text/ger/openxray.xml
index 2c112d4c471..6e9ae0f5b6c 100644
--- a/res/gamedata/configs/text/ger/openxray.xml
+++ b/res/gamedata/configs/text/ger/openxray.xml
@@ -79,7 +79,7 @@
 		<text>Spiel-FPS-Limit</text>
 	</string>
 	<string id="ui_mm_fps_limit_in_menu">
-		<text>Menь-FPS-Limit</text>
+		<text>MenРїС—Р…-FPS-Limit</text>
 	</string>
 	<string id="ui_mm_localization">
 		<text>Sprache</text>
@@ -126,6 +126,9 @@
 	<string id="ui_mm_color_grading_warm">
 		<text>warm</text>
 	</string>
+	<string id="ui_mm_snd_input_device">
+		<text>Eingabegerät</text>
+	</string>
 	<string id="eng">
 		<text>Englisch (English)</text>
 	</string>
diff --git a/res/gamedata/configs/text/pol/openxray.xml b/res/gamedata/configs/text/pol/openxray.xml
index e254e3e8070..38a19f8205d 100644
--- a/res/gamedata/configs/text/pol/openxray.xml
+++ b/res/gamedata/configs/text/pol/openxray.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="windows-1251" ?>
 <string_table>
 	<string id="st_unload_magazine_all">
-		<text>rozіaduj wszystkie bronie</text>
+		<text>rozпїЅaduj wszystkie bronie</text>
 	</string>
 	<string id="st_unequip">
 		<text>Zdejmij</text>
@@ -10,7 +10,7 @@
 		<text>Podaruj</text>
 	</string>
 	<string id="st_loading_lights">
-		<text>Wczytywanie oњwietlenia</text>
+		<text>Wczytywanie oпїЅwietlenia</text>
 	</string>
 	<string id="st_client_connecting_to">
 		<text>Klient: Czenie z</text>
@@ -25,10 +25,10 @@
 		<text>Tworzenie nowej gry</text>
 	</string>
 	<string id="ui_mm_always_active">
-		<text>Dziaіanie w tle (Alt+Tab)</text>
+		<text>DziaпїЅanie w tle (Alt+Tab)</text>
 	</string>
 	<string id="ui_mm_detail_radius">
-		<text>Odlegіoњж rys. trawy</text>
+		<text>OdlegпїЅoпїЅпїЅ rys. trawy</text>
 	</string>
 	<string id="ui_mm_ui_style">
 		<text>Styl interfejsu</text>
@@ -37,19 +37,19 @@
 		<text>Zew Prypeci</text>
 	</string>
 	<string id="ui_mm_simplified_item_pickup">
-		<text>Uproszczone podn. przedmiotуw</text>
+		<text>Uproszczone podn. przedmiotпїЅw</text>
 	</string>
 	<string id="ui_mm_multi_item_pickup">
-		<text>Podn. wsz. przedmiotуw na raz</text>
+		<text>Podn. wsz. przedmiotпїЅw na raz</text>
 	</string>
 	<string id="ui_mm_loadingstages">
-		<text>Postкp wczytywania</text>
+		<text>PostпїЅp wczytywania</text>
 	</string>
 	<string id="renderer_rgl">
-		<text>Rozsz. peіne oњw. dynam. (OpenGL)</text>
+		<text>Rozsz. peпїЅne oпїЅw. dynam. (OpenGL)</text>
 	</string>
 	<string id="ui_mm_window_mode">
-		<text>Tryb wyњwietlania</text>
+		<text>Tryb wyпїЅwietlania</text>
 	</string>
 	<string id="st_opt_windowed">
 		<text>Okienkowy</text>
@@ -58,28 +58,28 @@
 		<text>Okienkowy (bez ramek)</text>
 	</string>
 	<string id="st_opt_fullscreen">
-		<text>Peіnoekranowy</text>
+		<text>PeпїЅnoekranowy</text>
 	</string>
 	<string id="st_opt_fullscreen_borderless">
-		<text>Peіnoekranowy (szybki Alt+Tab)</text>
+		<text>PeпїЅnoekranowy (szybki Alt+Tab)</text>
 	</string>
 	<string id="ui_mm_r2_smap_size">
-		<text>Jakoњж cieni map</text>
+		<text>JakoпїЅпїЅ cieni map</text>
 	</string>
 	<string id="ui_mm_r3_dynamic_wet_surfaces_near">
-		<text>Mokre pow. na blisk. odlegіoњci</text>
+		<text>Mokre pow. na blisk. odlegпїЅoпїЅci</text>
 	</string>
 	<string id="ui_mm_r3_dynamic_wet_surfaces_far">
-		<text>Mokre pow. na dal. odlegіoњci</text>
+		<text>Mokre pow. na dal. odlegпїЅoпїЅci</text>
 	</string>
 	<string id="ui_mm_r3_dynamic_wet_surfaces_sm_res">
-		<text>Jakoњж mokrych powierzchni</text>
+		<text>JakoпїЅпїЅ mokrych powierzchni</text>
 	</string>
 	<string id="ui_mm_fov">
 		<text>Pole widzenia</text>
 	</string>
 	<string id="ui_mm_localization">
-		<text>Jкzyk</text>
+		<text>JпїЅzyk</text>
 	</string>
 	<string id="ui_mm_gamepad_setup">
 		<text>Konfiguracja gamepada</text>
@@ -132,6 +132,9 @@
 	<string id="ui_mm_color_grading_warm">
 		<text>warm</text>
 	</string>
+	<string id="ui_mm_snd_input_device">
+		<text>UrzД…dzenie wejЕ›cia</text>
+	</string>
 	<string id="eng">
 		<text>Angielski (English)</text>
 	</string>
@@ -142,7 +145,7 @@
 		<text>Niemiecki (German)</text>
 	</string>
 	<string id="ita">
-		<text>Wіoski (Italian)</text>
+		<text>WпїЅoski (Italian)</text>
 	</string>
 	<string id="pol">
 		<text>Polski (Polish)</text>
@@ -151,7 +154,7 @@
 		<text>Rosyjski (Russian)</text>
 	</string>
 	<string id="spa">
-		<text>Hiszpaсski (Spanish)</text>
+		<text>HiszpaпїЅski (Spanish)</text>
 	</string>
 	<string id="ukr">
 		<text>Ukrainski (Ukrainian)</text>
diff --git a/res/gamedata/configs/text/rus/openxray.xml b/res/gamedata/configs/text/rus/openxray.xml
index f509b4eb0a4..fb7a8882c28 100644
--- a/res/gamedata/configs/text/rus/openxray.xml
+++ b/res/gamedata/configs/text/rus/openxray.xml
@@ -1,124 +1,124 @@
 <?xml version="1.0" encoding="windows-1251" ?>
 <string_table>
 	<string id="st_unload_magazine_after_pickup">
-		<text>Разряжать ор. при поднятии</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅ. пїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="st_unload_magazine_all">
-		<text>разрядить всё оружие</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="st_unequip">
-		<text>убрать в рюкзак</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅ пїЅ пїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="st_donate">
-		<text>Подарить</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="st_loading_lights">
-		<text>Загрузка освещения</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="st_client_connecting_to">
-		<text>Клиент: Соединение с</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅ: пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ пїЅ</text>
 	</string>
 	<string id="st_client_spawning">
-		<text>Клиент: Создание</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅ: пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="st_client_synchronising">
-		<text>Клиент: Синхронизация</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅ: пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="st_creating_new_game">
-		<text>Создание новой игры</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="ui_mm_always_active">
-		<text>Не ставить на паузу при Alt+Tab</text>
+		<text>пїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅ пїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅ Alt+Tab</text>
 	</string>
 	<string id="ui_mm_detail_radius">
-		<text>Дальность прор. травы</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅ. пїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="ui_mm_ui_style">
-		<text>Стиль интерфейса</text>
+		<text>пїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="ui_style_default">
-		<text>Зов Припяти</text>
+		<text>пїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="ui_mm_simplified_item_pickup">
-		<text>Упр. подбор предметов</text>
+		<text>пїЅпїЅпїЅ. пїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="ui_mm_multi_item_pickup">
-		<text>Множ. подбор предметов</text>
+		<text>пїЅпїЅпїЅпїЅ. пїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="ui_mm_loadingstages">
-		<text>Стадии загрузки</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="renderer_rgl">
-		<text>Ул. полное освещение (OpenGL)</text>
+		<text>пїЅпїЅ. пїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ (OpenGL)</text>
 	</string>
 	<string id="ui_mm_window_mode">
-		<text>Режим окна</text>
+		<text>пїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="st_opt_windowed">
-		<text>Оконный</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="st_opt_windowed_borderless">
-		<text>Оконный без рамок</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="st_opt_fullscreen">
-		<text>Полноэкранный</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="st_opt_fullscreen_borderless">
-		<text>Полноэкранный (быстрый Alt+Tab)</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ (пїЅпїЅпїЅпїЅпїЅпїЅпїЅ Alt+Tab)</text>
 	</string>
 	<string id="ui_mm_r2_fxaa">
 		<text>FXAA</text>
 	</string>
 	<string id="ui_mm_r2_smap_size">
-		<text>Качество теневых карт</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="ui_mm_r3_dynamic_wet_surfaces_opt">
-		<text>Оптимизация намокания</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="ui_mm_r3_dynamic_wet_surfaces_near">
-		<text>Намокание вблизи</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="ui_mm_r3_dynamic_wet_surfaces_far">
-		<text>Намокание вдали</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="ui_mm_r3_dynamic_wet_surfaces_sm_res">
-		<text>Качество намокания</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="ui_mm_fov">
-		<text>Поле зрения</text>
+		<text>пїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="ui_mm_localization">
-		<text>Язык</text>
+		<text>пїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="ui_mm_gamepad_setup">
-		<text>Настройка геймпада</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="ui_mm_fps_limit">
-		<text>Ограничение FPS в игре</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ FPS пїЅ пїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="ui_mm_fps_limit_in_menu">
-		<text>Ограничение FPS в меню</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ FPS пїЅ пїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="ui_mm_shader_preset">
-		<text>Режим графики</text>
+		<text>пїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="ui_mm_shader_preset_vanilla">
-		<text>оригинальная</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="ui_mm_shader_preset_enhanced_default">
-		<text>улучшенная (стандарт)</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ (пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ)</text>
 	</string>
 	<string id="ui_mm_shader_preset_enhanced_high">
-		<text>улучшенная (высоко)</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ (пїЅпїЅпїЅпїЅпїЅпїЅ)</text>
 	</string>
 	<string id="ui_mm_color_grading_preset">
-		<text>Градация цветов</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="ui_mm_color_grading_default">
-		<text>стандартная</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="ui_mm_color_grading_cold">
-		<text>холодная</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="ui_mm_color_grading_filmic_01">
 		<text>Filmic 1</text>
@@ -133,36 +133,39 @@
 		<text>Hollywood</text>
 	</string>
 	<string id="ui_mm_color_grading_vanilla">
-		<text>оригинальная</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="ui_mm_color_grading_vibrant">
 		<text>Vibrant</text>
 	</string>
 	<string id="ui_mm_color_grading_warm">
-		<text>тёплая</text>
+		<text>пїЅпїЅпїЅпїЅпїЅ</text>
+	</string>
+	<string id="ui_mm_snd_input_device">
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="eng">
-		<text>Английский (English)</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ (English)</text>
 	</string>
 	<string id="fra">
-		<text>Французский (French)</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ (French)</text>
 	</string>
 	<string id="ger">
-		<text>Немецкий (German)</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ (German)</text>
 	</string>
 	<string id="ita">
-		<text>Итальянский (Italian)</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ (Italian)</text>
 	</string>
 	<string id="pol">
-		<text>Польский (Polish)</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ (Polish)</text>
 	</string>
 	<string id="rus">
-		<text>Русский (Russian)</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅ (Russian)</text>
 	</string>
 	<string id="spa">
-		<text>Испанский (Spanish)</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ (Spanish)</text>
 	</string>
 	<string id="ukr">
-		<text>Украинский (Ukrainian)</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ (Ukrainian)</text>
 	</string>
 </string_table>
diff --git a/res/gamedata/configs/text/ukr/openxray.xml b/res/gamedata/configs/text/ukr/openxray.xml
index 87d87767fe1..59999bc94ab 100644
--- a/res/gamedata/configs/text/ukr/openxray.xml
+++ b/res/gamedata/configs/text/ukr/openxray.xml
@@ -1,124 +1,124 @@
 <?xml version="1.0" encoding="windows-1251" ?>
 <string_table>
 	<string id="st_unload_magazine_after_pickup">
-		<text>Розряд. зброю при піднятті</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅ. пїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="st_unload_magazine_all">
-		<text>розрядити всю зброю</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="st_unequip">
-		<text>сховати в рюкзак</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅ пїЅ пїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="st_donate">
-		<text>Подарувати</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="st_loading_lights">
-		<text>Завантаження освітлення</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="st_client_connecting_to">
-		<text>Клієнт: З'єднання с</text>
+		<text>пїЅлієпїЅпїЅ: пїЅ'пїЅпїЅпїЅпїЅпїЅпїЅпїЅ пїЅ</text>
 	</string>
 	<string id="st_client_spawning">
-		<text>Клієнт: Створення</text>
+		<text>пїЅлієпїЅпїЅ: пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="st_client_synchronising">
-		<text>Клієнт: Синхронізація</text>
+		<text>пїЅлієпїЅпїЅ: пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="st_creating_new_game">
-		<text>Створення нової гри</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅ пїЅпїЅпїЅ</text>
 	</string>
 	<string id="ui_mm_always_active">
-		<text>Не ставити гру на пазу при Alt+Tab</text>
+		<text>пїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅ пїЅпїЅ пїЅпїЅпїЅпїЅ пїЅпїЅпїЅ Alt+Tab</text>
 	</string>
 	<string id="ui_mm_detail_radius">
-		<text>Відстань промальовування трави</text>
+		<text>ВіпїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="ui_mm_ui_style">
-		<text>Стиль інтерфейсу</text>
+		<text>пїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="ui_style_default">
-		<text>Поклик Прип'яті</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅ'пїЅпїЅ</text>
 	</string>
 	<string id="ui_mm_simplified_item_pickup">
-		<text>Спрощ. підбір предметів</text>
+		<text>пїЅпїЅпїЅпїЅпїЅ. пїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="ui_mm_multi_item_pickup">
-		<text>Множ. підбір предметів</text>
+		<text>пїЅпїЅпїЅпїЅ. пїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="ui_mm_loadingstages">
-		<text>Стадії завантаження</text>
+		<text>пїЅпїЅпїЅдії пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="renderer_rgl">
-		<text>Покр. повне освітлення (OpenGL)</text>
+		<text>пїЅпїЅпїЅпїЅ. пїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ (OpenGL)</text>
 	</string>
 	<string id="ui_mm_window_mode">
-		<text>Режим вікна</text>
+		<text>пїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="st_opt_windowed">
-		<text>Віконний</text>
+		<text>ВіпїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="st_opt_windowed_borderless">
-		<text>Віконний без рамок</text>
+		<text>ВіпїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="st_opt_fullscreen">
-		<text>Повноекранний</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="st_opt_fullscreen_borderless">
-		<text>Повноекранний (швидкий Alt+Tab)</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ (пїЅпїЅпїЅпїЅпїЅпїЅпїЅ Alt+Tab)</text>
 	</string>
 	<string id="ui_mm_r2_fxaa">
 		<text>FXAA</text>
 	</string>
 	<string id="ui_mm_r2_smap_size">
-		<text>Якість карт тіней</text>
+		<text>пїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="ui_mm_r3_dynamic_wet_surfaces_opt">
-		<text>Оптимізація намокання</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="ui_mm_r3_dynamic_wet_surfaces_near">
-		<text>Намокання поблизу</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="ui_mm_r3_dynamic_wet_surfaces_far">
-		<text>Намокання вдалині</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="ui_mm_r3_dynamic_wet_surfaces_sm_res">
-		<text>Якість намокання</text>
+		<text>пїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="ui_mm_fov">
-		<text>Поле зору</text>
+		<text>пїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="ui_mm_localization">
-		<text>Мова</text>
+		<text>пїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="ui_mm_gamepad_setup">
-		<text>Налаштування геймпаду</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="ui_mm_fps_limit">
-		<text>Обмеження FPS у грі</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ FPS пїЅ пїЅпїЅ</text>
 	</string>
 	<string id="ui_mm_fps_limit_in_menu">
-		<text>Обмеження FPS в меню</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ FPS пїЅ пїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="ui_mm_shader_preset">
-		<text>Режим графіки</text>
+		<text>пїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="ui_mm_shader_preset_vanilla">
-		<text>оригінальна</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="ui_mm_shader_preset_enhanced_default">
-		<text>покращена (стандарт)</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ (пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ)</text>
 	</string>
 	<string id="ui_mm_shader_preset_enhanced_high">
-		<text>покращена (високо)</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ (пїЅпїЅпїЅпїЅпїЅпїЅ)</text>
 	</string>
 	<string id="ui_mm_color_grading_preset">
-		<text>Градація кольорів</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="ui_mm_color_grading_default">
-		<text>стандартна</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="ui_mm_color_grading_cold">
-		<text>холодна</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="ui_mm_color_grading_filmic_01">
 		<text>Filmic 1</text>
@@ -133,39 +133,42 @@
 		<text>Hollywood</text>
 	</string>
 	<string id="ui_mm_color_grading_vanilla">
-		<text>оригінальна</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="ui_mm_color_grading_vibrant">
 		<text>Vibrant</text>
 	</string>
 	<string id="ui_mm_color_grading_warm">
-		<text>тепла</text>
+		<text>пїЅпїЅпїЅпїЅпїЅ</text>
+	</string>
+	<string id="ui_mm_snd_input_device">
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ</text>
 	</string>
 	<string id="eng">
-		<text>Англійська (English)</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ (English)</text>
 	</string>
 	<string id="fra">
-		<text>Французька (French)</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ (French)</text>
 	</string>
 	<string id="ger">
-		<text>Німецька (German)</text>
+		<text>НіпїЅпїЅпїЅпїЅпїЅпїЅ (German)</text>
 	</string>
 	<string id="ita">
-		<text>Італійська (Italian)</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ (Italian)</text>
 	</string>
 	<string id="pol">
-		<text>Польська (Polish)</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ (Polish)</text>
 	</string>
 	<string id="rus">
-		<text>Російська (Russian)</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ (Russian)</text>
 	</string>
 	<string id="spa">
-		<text>Іспанська (Spanish)</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ (Spanish)</text>
 	</string>
 	<string id="ukr">
-		<text>Українська (Ukrainian)</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ (Ukrainian)</text>
 	</string>
 	<string id="jpn">
-		<text>Японська (Japanese)</text>
+		<text>пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ (Japanese)</text>
 	</string>
 </string_table>
diff --git a/res/gamedata/configs/ui/maingame.xml b/res/gamedata/configs/ui/maingame.xml
new file mode 100644
index 00000000000..3565659358c
--- /dev/null
+++ b/res/gamedata/configs/ui/maingame.xml
@@ -0,0 +1,220 @@
+<w>
+	<main x="0" y="0" width="1024" height="768"/>
+	<speech_menu x="260" y="550" width="300" height="265" always_show_scroll="0">
+		<text font="letterica16" r="238" g="224" b="198"/>
+	</speech_menu>
+
+	<quick_info x="1" y="670" width="1022" height="50" complex_mode="1" light_anim="ui_btn_hint"  la_cyclic="0" la_texture="0" la_text="1" la_alpha="1">
+		<text align="c" font="graffiti22" r="225" g="225" b="250" a="255" />
+	</quick_info>
+
+	<icons_scroll_view  x="900" y="350" width="65" height="270" right_ident="2" always_show_scroll="0" vert_interval="16" inverse_dir="1" flip_vert="0"/>
+
+	<weapon_jammed_static x="0" y="0" width="64" height="64">
+		<texture>ui_hud_icon_weapon</texture>
+	</weapon_jammed_static>
+
+  <icon_microphone x="748" y="716" width="36" height="36" stretch="1">
+    <texture>ui_microphone_icon</texture>
+  </icon_microphone>
+  <voice_distance x="768" y="736" width="32" height="20" stretch="1">
+    <text align="c" font="letterica16" color="white"/>
+  </voice_distance>
+
+    <indicator_starvation x="980" y="350" width="33" height="35"/>
+    <indicator_helmet_broken x="980" y="390" width="33" height="35"/>
+    <indicator_outfit_broken x="980" y="430" width="33" height="35"/>
+    <indicator_weapon_broken x="980" y="470" width="33" height="35"/>
+    <indicator_overweight x="980" y="510" width="33" height="35"/>
+    <indicator_radiation x="980" y="550" width="33" height="35"/>
+    <indicator_bleeding x="980" y="590" width="33" height="35"/>
+
+    <indicator_booster_psy x="20" y="660" width="31" height="41">
+		<texture>ui_inGame2_shield_Psy</texture>
+	</indicator_booster_psy>
+    <indicator_booster_radia x="62" y="660" width="31" height="41">
+		<texture>ui_inGame2_shield_Radiation</texture>
+	</indicator_booster_radia>
+    <indicator_booster_chem x="104" y="660" width="31" height="41">
+		<texture>ui_inGame2_shield_biological</texture>
+	</indicator_booster_chem>
+    <indicator_booster_wound x="146" y="660" width="31" height="41">
+		<texture>ui_inGame2_shield_blood</texture>
+	</indicator_booster_wound>
+    <indicator_booster_weight x="188" y="660" width="31" height="41">
+		<texture>ui_inGame2_shield_force</texture>
+	</indicator_booster_weight>
+    <indicator_booster_health x="230" y="660" width="31" height="41">
+		<texture>ui_inGame2_shield_health</texture>
+	</indicator_booster_health>
+    <indicator_booster_power x="272" y="660" width="31" height="41">
+		<texture>ui_inGame2_shield_stamina</texture>
+	</indicator_booster_power>
+    <indicator_booster_rad x="314" y="660" width="31" height="41">
+		<texture>ui_inGame2_shield_radiation_cleanup</texture>
+	</indicator_booster_rad>
+<!--
+	<radiation_static x="0" y="0" width="64" height="64">
+		<texture>ui_hud_icon_radiation</texture>
+	</radiation_static>
+
+	<wound_static x="0" y="0" width="64" height="64">
+		<texture>ui_hud_icon_drop</texture>
+	</wound_static>
+
+	<starvation_static x="0" y="0" width="64" height="64">
+		<texture>ui_hud_icon_eat</texture>
+	</starvation_static>
+
+	<psy_health_static x="0" y="0" width="64" height="64">
+		<texture>ui_hud_icon_psycho</texture>
+	</psy_health_static>
+
+	<can_sleep_static x="0" y="0" width="64" height="64" stretch="1">
+		<texture>ui_hud_icon_sleep</texture>
+	</can_sleep_static>
+
+-->
+	<invincible_static x="0" y="0" width="64" height="64">
+		<texture>ui_hud_icon_goodmode</texture>
+	</invincible_static>
+
+	<artefact_static x="0" y="0" width="64" height="64">
+		<texture>ui_hud_icon_artefact</texture>
+	</artefact_static>
+
+	<disk_io x="690" y="750" width="16" height="16" stretch="1">
+<!--		<texture>ui\ui_disk_io</texture> -->
+	</disk_io>
+
+	<flashing_icons>
+		<flashing_icon x="13" y="210" width="48" height="29" type="pda" light_anim="ui_slow_blinking_alpha">
+			<texture>ui_hud_icon_PDA</texture>
+		</flashing_icon>
+	</flashing_icons>
+
+	<pick_up_item x="437" y="400" width="150" height="100"/>
+
+	<new_contact_snd>detectors\contact_1</new_contact_snd>
+
+    <quick_slot0 x="20" y="710" width="40" height="40">
+	    <counter x="1" y="1" width="29" height="16">
+			<window_name>counter</window_name>
+	        <texture a="200">ui_item_count_back</texture>
+	        <text font="letterica16" color="ui_2" align="c" vert_align="c"/>
+	    </counter>
+        <auto_frameline x="20" y="34" width="27" height="23">
+			<texture>ui_inGame2_Patroni_HUD_active_items_icon</texture>
+        </auto_frameline>
+    </quick_slot0>
+    <quick_slot1 x="70" y="710" width="41" height="41">
+	    <counter x="1" y="1" width="29" height="16">
+			<window_name>counter</window_name>
+	        <texture a="200">ui_item_count_back</texture>
+	        <text font="letterica16" align="c" vert_align="c"/>
+	    </counter>
+        <auto_frameline x="20" y="34" width="27" height="23">
+			<texture>ui_inGame2_Patroni_HUD_active_items_icon</texture>
+        </auto_frameline>
+    </quick_slot1>
+    <quick_slot2 x="120" y="710" width="41" height="41">
+	    <counter x="1" y="1" width="29" height="16">
+			<window_name>counter</window_name>
+	        <texture a="200">ui_item_count_back</texture>
+	        <text font="letterica16" align="c" vert_align="c"/>
+	    </counter>
+        <auto_frameline x="20" y="34" width="27" height="23">
+			<texture>ui_inGame2_Patroni_HUD_active_items_icon</texture>
+        </auto_frameline>
+    </quick_slot2>
+    <quick_slot3 x="170" y="710" width="41" height="41">
+	    <counter x="1" y="1" width="29" height="16">
+			<window_name>counter</window_name>
+	        <texture a="200">ui_item_count_back</texture>
+	        <text font="letterica16" align="c" vert_align="c"/>
+	    </counter>
+        <auto_frameline x="20" y="34" width="27" height="23">
+			<texture>ui_inGame2_Patroni_HUD_active_items_icon</texture>
+        </auto_frameline>
+    </quick_slot3>
+    <quick_slot0_text x="42" y="746" width="21" height="13">
+        <text align="c" vert_align="c" font="letterica16">quick_use_str_1</text>
+    </quick_slot0_text>
+    <quick_slot1_text x="92" y="746" width="21" height="13">
+        <text align="c" vert_align="c" font="letterica16">quick_use_str_2</text>
+    </quick_slot1_text>
+    <quick_slot2_text x="142" y="746" width="21" height="13">
+        <text align="c" vert_align="c" font="letterica16">quick_use_str_3</text>
+    </quick_slot2_text>
+    <quick_slot3_text x="192" y="746" width="21" height="13">
+        <text align="c" vert_align="c" font="letterica16">quick_use_str_4</text>
+    </quick_slot3_text>
+
+	<hud_states x="0" y="0" width="1024" height="768">
+<!--
+		<bleeding_level_1 x="186" y="-42" width="18" height="26" light_anim="ui_slow_blinking" la_cyclic="1" la_texture="1" la_text="0" la_alpha="1" stretch="1">
+			<texture r="255" g="0"  b="0" a="255">ui_inGame2_blood_icon_part_1</texture>
+		</bleeding_level_1>
+		<bleeding_level_2 x="184" y="-47" width="22" height="34" light_anim="ui_slow_blinking" la_cyclic="1" la_texture="1" la_text="0" la_alpha="1" stretch="1">
+			<texture r="255" g="0"  b="0" a="255">ui_inGame2_blood_icon_part_2</texture>
+		</bleeding_level_2>
+		<bleeding_level_3 x="180" y="-52" width="30" height="43" light_anim="ui_slow_blinking" la_cyclic="1" la_texture="1" la_text="0" la_alpha="1" stretch="1">
+			<texture r="255" g="0"  b="0" a="255">ui_inGame2_blood_icon_part_3</texture>
+		</bleeding_level_3>
+
+		<radiation_level_1 x="180" y="293" width="29" height="29" light_anim="ui_slow_blinking" la_cyclic="1" la_texture="1" la_text="0" la_alpha="1" stretch="1">
+			<texture r="255" g="255" b="0" a="255">ui_inGame2_radiation_icon_part_1</texture>
+		</radiation_level_1>
+		<radiation_level_2 x="177" y="296" width="35" height="35" light_anim="ui_slow_blinking" la_cyclic="1" la_texture="1" la_text="0" la_alpha="1" stretch="1">
+			<texture r="255" g="255" b="0" a="255">ui_inGame2_radiation_icon_part_2</texture>
+		</radiation_level_2>
+		<radiation_level_3 x="173" y="300" width="43" height="43" light_anim="ui_slow_blinking" la_cyclic="1" la_texture="1" la_text="0" la_alpha="1" stretch="1">
+			<texture r="255" g="255" b="0" a="255">ui_inGame2_radiation_icon_part_3</texture>
+		</radiation_level_3>
+-->
+
+		<indik_rad x="30" y="230" width="37" height="33"/>
+		<indik_fire x="75" y="230" width="37" height="33"/>
+		<indik_psi x="120" y="230" width="37" height="33"/>
+		<indik_acid x="165" y="230" width="37" height="33"/>
+
+		<back x="795" y="635" width="266" height="121">
+			<texture>ui_inGame2_Patroni_HUD_main_window</texture>
+		</back>
+		<progress_bar_health x="852" y="649" width="138" height="16" horz="1" min="0" max="100" pos="0">
+			<progress><!-- light_anim="ui_blinking_1" la_cyclic="0" la_texture="1" la_text="0" la_alpha="1"-->
+				<texture>ui_inGame2_Patroni_HUD_red_bar</texture>
+			</progress>
+		</progress_bar_health>
+
+	    <progress_bar_stamina x="852" y="672" width="138" height="10" horz="1" min="0" max="100" pos="0">
+	        <progress><!-- light_anim="ui_blinking_1" la_cyclic="0" la_texture="1" la_text="0" la_alpha="1"-->
+		        <texture>ui_inGame2_Patroni_HUD_blue_bar</texture>
+	        </progress>
+	    </progress_bar_stamina>
+
+		<static_cur_ammo x="852" y="690" width="68" height="37">
+			<text complex_mode="0" font="graffiti32" color="ui_7" align="c" vert_align="c">ammo</text>
+		</static_cur_ammo>
+
+	    <static_fmj_ammo x="852" y="724" width="32" height="15">
+	        <text align="c" complex_mode="0" font="graffiti19" color="ui_7">fmj</text>
+	    </static_fmj_ammo>
+
+	    <static_ap_ammo x="888" y="724" width="32" height="15">
+	        <text align="c" complex_mode="0" font="graffiti19" r="238" g="155" b="23" a="150">ap</text>
+	    </static_ap_ammo>
+
+	    <static_grenade x="824" y="690" width="18" height="19">
+	        <text align="c" complex_mode="0" font="letterica16" color="ui_7" vert_align="c">gr</text>
+	    </static_grenade>
+
+
+		<static_wpn_icon x="971" y="723" width="30" height="30" align="c" alignment="c"/>
+
+	    <static_fire_mode x="824" y="723" width="18" height="19">
+	        <text font="letterica16" color="ui_7" align="c" vert_align="c"/>
+	    </static_fire_mode>
+	</hud_states>
+
+</w>
diff --git a/res/gamedata/configs/ui/maingame_16.xml b/res/gamedata/configs/ui/maingame_16.xml
new file mode 100644
index 00000000000..26b9a2621c1
--- /dev/null
+++ b/res/gamedata/configs/ui/maingame_16.xml
@@ -0,0 +1,232 @@
+<w>
+  <main x="0" y="0" width="1024" height="768">
+    <_auto_static x="512" y="384" width="115" height="115" alignment="c" stretch="1" heading="1" xform_anim="xfrom_rotate_3sec" xform_anim_cyclic="1">
+      <texture>ui_icons_newPDA_Crclbig_h</texture>
+    </_auto_static>
+  </main>
+  <speech_menu x="260" y="550" width="300" height="265" always_show_scroll="0">
+		<text font="letterica16" r="238" g="224" b="198"/>
+	</speech_menu>
+
+	<quick_info x="1" y="670" width="1022" height="50" complex_mode="1" light_anim="ui_btn_hint"  la_cyclic="0" la_texture="0" la_text="1" la_alpha="1">
+		<text align="c" font="graffiti22" r="225" g="225" b="250" a="255" />
+	</quick_info>
+
+	<icons_scroll_view  x="900" y="350" width="55" height="270" right_ident="2" always_show_scroll="0" vert_interval="16" inverse_dir="1" flip_vert="0"/>
+
+	<weapon_jammed_static x="0" y="0" width="53" height="64" stretch="1">
+		<texture>ui_hud_icon_weapon</texture>
+	</weapon_jammed_static>
+
+  <icon_microphone x="808" y="714" width="27" height="36" stretch="1">
+    <texture>ui_microphone_icon</texture>
+  </icon_microphone>
+  <voice_distance x="822" y="737" width="24" height="20" stretch="1">
+    <text align="c" font="letterica16" color="white"/>
+  </voice_distance>
+
+    <indicator_starvation x="980" y="350" width="26" height="35" stretch="1"/>
+    <indicator_helmet_broken x="980" y="390" width="26" height="35" stretch="1"/>
+    <indicator_outfit_broken x="980" y="430" width="26" height="35" stretch="1"/>
+    <indicator_weapon_broken x="980" y="470" width="26" height="35" stretch="1"/>
+    <indicator_overweight x="980" y="510" width="26" height="35" stretch="1"/>
+    <indicator_radiation x="980" y="550" width="26" height="35" stretch="1"/>
+    <indicator_bleeding x="980" y="590" width="26" height="35" stretch="1"/>
+
+    <indicator_booster_psy x="16" y="660" width="24" height="41" stretch="1">
+		<texture>ui_inGame2_shield_Psy</texture>
+	</indicator_booster_psy>
+    <indicator_booster_radia x="49" y="660" width="24" height="41" stretch="1">
+		<texture>ui_inGame2_shield_Radiation</texture>
+	</indicator_booster_radia>
+    <indicator_booster_chem x="83" y="660" width="24" height="41" stretch="1">
+		<texture>ui_inGame2_shield_biological</texture>
+	</indicator_booster_chem>
+    <indicator_booster_wound x="116" y="660" width="24" height="41" stretch="1">
+		<texture>ui_inGame2_shield_blood</texture>
+	</indicator_booster_wound>
+    <indicator_booster_weight x="150" y="660" width="24" height="41" stretch="1">
+		<texture>ui_inGame2_shield_force</texture>
+	</indicator_booster_weight>
+    <indicator_booster_health x="184" y="660" width="24" height="41" stretch="1">
+		<texture>ui_inGame2_shield_health</texture>
+	</indicator_booster_health>
+    <indicator_booster_power x="217" y="660" width="24" height="41" stretch="1">
+		<texture>ui_inGame2_shield_stamina</texture>
+	</indicator_booster_power>
+    <indicator_booster_rad x="251" y="660" width="24" height="41" stretch="1">
+		<texture>ui_inGame2_shield_radiation_cleanup</texture>
+	</indicator_booster_rad>
+<!--
+	<radiation_static x="0" y="0" width="53" height="64" stretch="1">
+		<texture>ui_hud_icon_radiation</texture>
+	</radiation_static>
+
+	<wound_static x="0" y="0" width="53" height="64" stretch="1">
+		<texture>ui_hud_icon_drop</texture>
+	</wound_static>
+
+	<starvation_static x="0" y="0" width="53" height="64" stretch="1">
+		<texture>ui_hud_icon_eat</texture>
+	</starvation_static>
+
+	<psy_health_static x="0" y="0" width="53" height="64" stretch="1">
+		<texture>ui_hud_icon_psycho</texture>
+	</psy_health_static>
+
+	<can_sleep_static x="0" y="0" width="53" height="64" stretch="1">
+		<texture>ui_hud_icon_sleep</texture>
+	</can_sleep_static>
+
+    <indicator_starvation x="784" y="350" width="26" height="35" stretch="1"/>
+    <indicator_helmet_broken x="784" y="390" width="26" height="35" stretch="1"/>
+    <indicator_outfit_broken x="784" y="430" width="26" height="35" stretch="1"/>
+    <indicator_weapon_broken x="784" y="470" width="26" height="35" stretch="1"/>
+    <indicator_overweight x="784" y="510" width="26" height="35" stretch="1"/>
+    <indicator_radiation x="784" y="550" width="26" height="35" stretch="1"/>
+    <indicator_bleeding x="784" y="590" width="26" height="35" stretch="1"/>
+
+-->
+	<invincible_static x="0" y="0" width="53" height="64" stretch="1">
+		<texture>ui_hud_icon_goodmode</texture>
+	</invincible_static>
+
+	<artefact_static x="0" y="0" width="53" height="64" stretch="1">
+		<texture>ui_hud_icon_artefact</texture>
+	</artefact_static>
+
+	<disk_io x="760" y="750" width="14" height="16" stretch="1">
+<!--		<texture>ui\ui_disk_io</texture> -->
+	</disk_io>
+
+	<flashing_icons>
+		<flashing_icon x="13" y="210" width="48" height="29" type="pda" light_anim="ui_slow_blinking_alpha">
+			<texture>ui_hud_icon_PDA</texture>
+		</flashing_icon>
+	</flashing_icons>
+
+	<pick_up_item x="452" y="400" width="120" height="100"/>
+
+	<new_contact_snd>detectors\contact_1</new_contact_snd>
+
+    <quick_slot0 x="16" y="710" width="33" height="40" stretch="1">
+	    <counter x="1" y="1" width="23" height="16" stretch="1">
+			<window_name>counter</window_name>
+	        <texture a="200">ui_item_count_back</texture>
+	        <text font="letterica16" align="c" vert_align="c"/>
+	    </counter>
+        <auto_frameline x="16" y="34" width="21" height="23">
+			<texture>ui_inGame2_Patroni_HUD_active_items_icon</texture>
+        </auto_frameline>
+    </quick_slot0>
+    <quick_slot1 x="56" y="710" width="33" height="41" stretch="1">
+	    <counter x="1" y="1" width="23" height="16" stretch="1">
+			<window_name>counter</window_name>
+	        <texture a="200">ui_item_count_back</texture>
+	        <text font="letterica16" align="c" vert_align="c"/>
+	    </counter>
+        <auto_frameline x="16" y="34" width="21" height="23">
+			<texture>ui_inGame2_Patroni_HUD_active_items_icon</texture>
+        </auto_frameline>
+    </quick_slot1>
+    <quick_slot2 x="96" y="710" width="33" height="41" stretch="1">
+	    <counter x="1" y="1" width="23" height="16" stretch="1">
+			<window_name>counter</window_name>
+	        <texture a="200">ui_item_count_back</texture>
+	        <text font="letterica16" align="c" vert_align="c"/>
+	    </counter>
+        <auto_frameline x="16" y="34" width="21" height="23">
+			<texture>ui_inGame2_Patroni_HUD_active_items_icon</texture>
+        </auto_frameline>
+    </quick_slot2>
+    <quick_slot3 x="136" y="710" width="33" height="41" stretch="1">
+	    <counter x="1" y="1" width="23" height="16" stretch="1">
+			<window_name>counter</window_name>
+	        <texture a="200">ui_item_count_back</texture>
+	        <text font="letterica16" align="c" vert_align="c"/>
+	    </counter>
+        <auto_frameline x="16" y="34" width="21" height="23">
+			<texture>ui_inGame2_Patroni_HUD_active_items_icon</texture>
+        </auto_frameline>
+    </quick_slot3>
+    <quick_slot0_text x="33" y="747" width="17" height="13">
+        <text align="c" vert_align="c" font="letterica16">quick_use_str_1</text>
+    </quick_slot0_text>
+    <quick_slot1_text x="73" y="747" width="17" height="13">
+        <text align="c" vert_align="c" font="letterica16">quick_use_str_2</text>
+    </quick_slot1_text>
+    <quick_slot2_text x="113" y="747" width="17" height="13">
+        <text align="c" vert_align="c" font="letterica16">quick_use_str_3</text>
+    </quick_slot2_text>
+    <quick_slot3_text x="153" y="747" width="17" height="13">
+        <text align="c" vert_align="c" font="letterica16">quick_use_str_4</text>
+    </quick_slot3_text>
+
+	<hud_states x="0" y="0" width="1024" height="768" stretch="1">
+<!--
+		<bleeding_level_1 x="150" y="-42" width="13" height="26" light_anim="ui_slow_blinking" la_cyclic="1" la_texture="1" la_text="0" la_alpha="1" stretch="1">
+			<texture r="255" g="0"  b="0" a="255">ui_inGame2_blood_icon_part_1</texture>
+		</bleeding_level_1>
+		<bleeding_level_2 x="147" y="-47" width="18" height="34" light_anim="ui_slow_blinking" la_cyclic="1" la_texture="1" la_text="0" la_alpha="1" stretch="1">
+			<texture r="255" g="0"  b="0" a="255">ui_inGame2_blood_icon_part_2</texture>
+		</bleeding_level_2>
+		<bleeding_level_3 x="144" y="-52" width="24" height="43" light_anim="ui_slow_blinking" la_cyclic="1" la_texture="1" la_text="0" la_alpha="1" stretch="1">
+			<texture r="255" g="0"  b="0" a="255">ui_inGame2_blood_icon_part_3</texture>
+		</bleeding_level_3>
+
+		<radiation_level_1 x="143" y="-93" width="23" height="29" light_anim="ui_slow_blinking" la_cyclic="1" la_texture="1" la_text="0" la_alpha="1" stretch="1">
+			<texture r="255" g="255" b="0" a="255">ui_inGame2_radiation_icon_part_1</texture>
+		</radiation_level_1>
+		<radiation_level_2 x="141" y="-96" width="27" height="35" light_anim="ui_slow_blinking" la_cyclic="1" la_texture="1" la_text="0" la_alpha="1" stretch="1">
+			<texture r="255" g="255" b="0" a="255">ui_inGame2_radiation_icon_part_2</texture>
+		</radiation_level_2>
+		<radiation_level_3 x="138" y="-100" width="33" height="43" light_anim="ui_slow_blinking" la_cyclic="1" la_texture="1" la_text="0" la_alpha="1" stretch="1">
+			<texture r="255" g="255" b="0" a="255">ui_inGame2_radiation_icon_part_3</texture>
+		</radiation_level_3>
+-->
+		<indik_rad x="24" y="230" width="29" height="33" stretch="1"/>
+		<indik_fire x="60" y="230" width="29" height="33" stretch="1"/>
+		<indik_psi x="96" y="230" width="29" height="33" stretch="1"/>
+		<indik_acid x="132" y="230" width="29" height="33" stretch="1"/>
+
+		<back x="841" y="635" width="178" height="121" stretch="1">
+			<texture>ui_inGame2_Patroni_HUD_main_window</texture>
+		</back>
+
+		<progress_bar_health x="885" y="648" width="113" height="16" horz="1" min="0" max="100" pos="0">
+			<progress><!-- light_anim="ui_blinking_1" la_cyclic="0" la_texture="1" la_text="0" la_alpha="1" stretch="1"-->
+				<texture>ui_inGame2_Patroni_HUD_red_bar</texture>
+			</progress>
+		</progress_bar_health>
+
+	    <progress_bar_stamina x="885" y="670" width="113" height="10" horz="1" min="0" max="100" pos="0">
+	        <progress><!-- light_anim="ui_blinking_1" la_cyclic="0" la_texture="1" la_text="0" la_alpha="1" stretch="1"-->
+		        <texture>ui_inGame2_Patroni_HUD_blue_bar</texture>
+	        </progress>
+	    </progress_bar_stamina>
+
+		<static_cur_ammo x="887" y="690" width="54" height="37">
+			<text complex_mode="0" font="graffiti32" color="ui_7" align="c" vert_align="c">ammo</text>
+		</static_cur_ammo>
+
+	    <static_fmj_ammo x="887" y="724" width="26" height="15">
+	        <text align="c" complex_mode="0" font="graffiti19" color="ui_7">fmj</text>
+	    </static_fmj_ammo>
+
+	    <static_ap_ammo x="915" y="724" width="26" height="15">
+	        <text align="c" complex_mode="0" font="graffiti19" r="238" g="155" b="23" a="150">ap</text>
+	    </static_ap_ammo>
+
+	    <static_grenade x="864" y="690" width="14" height="19">
+	        <text align="c" complex_mode="0" font="letterica16" color="ui_7" vert_align="c">gr</text>
+	    </static_grenade>
+
+
+		<static_wpn_icon x="982" y="723" width="24" height="30" align="c" alignment="c"/>
+
+	    <static_fire_mode x="864" y="723" width="14" height="19">
+	        <text font="letterica16" color="ui_7" align="c" vert_align="c"/>
+	    </static_fire_mode>
+	</hud_states>
+
+</w>
diff --git a/res/gamedata/configs/ui/styles_/ui_style_cs/ui_mm_opt_16.xml b/res/gamedata/configs/ui/styles_/ui_style_cs/ui_mm_opt_16.xml
index 00288aa15c0..0028bf444db 100644
--- a/res/gamedata/configs/ui/styles_/ui_style_cs/ui_mm_opt_16.xml
+++ b/res/gamedata/configs/ui/styles_/ui_style_cs/ui_mm_opt_16.xml
@@ -8,11 +8,11 @@
     <auto_static x="85" y="0" width="854" height="768" stretch="1">
       <texture>ui_inGame2_back_01</texture>
     </auto_static>
-    
+
     <auto_static x="0" y="0" width="85" height="768" stretch="1">
       <texture>ui_inGame2_back_01w10_l</texture>
     </auto_static>
-    
+
     <auto_static x="939" y="0" width="85" height="768" stretch="1">
       <texture>ui_inGame2_back_01w10_r</texture>
     </auto_static>
@@ -30,7 +30,7 @@
     <cap_options x="38" y="9" width="315" height="33">
 			<text font="graffiti22" color="ui_6">ui_mm_options</text>
 		</cap_options>
-	
+
     <btn_accept x="183" y="429" width="131" height="48">
 			<text font="graffiti19" align="c">ui_mm_apply</text>
 			<texture>ui_button_main02</texture>
@@ -38,7 +38,7 @@
 				<e r="227" g="199" b="178"/> <t r="180" g="153" b="155"/> <d r="106" g="95" b="91"/> <h r="0" g="0" b="0"/>
 			</text_color>
 		</btn_accept>
-		
+
     <btn_cancel x="313" y="429" width="131" height="48">
 			<text font="graffiti19" align="c">ui_mm_cancel</text>
 			<texture>ui_button_main02</texture>
@@ -46,16 +46,16 @@
 				<e r="227" g="199" b="178"/> <t r="180" g="153" b="155"/> <d r="106" g="95" b="91"/> <h r="0" g="0" b="0"/>
 			</text_color>
 		</btn_cancel>
-		
+
     <tab x="46" y="22" width="384" height="52">
 			<button x="0" y="20" width="95" height="44" id="video">
 				<texture>ui_button_tablist</texture>
-				<text font="graffiti19" align="c">ui_mm_video</text>				
+				<text font="graffiti19" align="c">ui_mm_video</text>
 				<text_color>
 					<e r="106" g="95" b="91"/> <t r="227" g="199" b="178"/> <h r="180" g="153" b="155"/>
 				</text_color>
 			</button>
-      
+
 			<button x="97" y="20" width="95" height="44" id="sound" stretch="1">
 				<texture>ui_button_tablist</texture>
 				<text font="graffiti19" align="c">ui_mm_sound</text>
@@ -63,7 +63,7 @@
 					<e r="106" g="95" b="91"/> <t r="227" g="199" b="178"/> <h r="180" g="153" b="155"/>
 				</text_color>
 			</button>
-      
+
 			<button x="193" y="20" width="95" height="44" id="gameplay" stretch="1">
         <texture>ui_button_tablist</texture>
         <text font="graffiti19" align="c">ui_mm_gameplay</text>
@@ -93,7 +93,7 @@
   <tab_size x="46" y="74" width="615" height="416"/>
 	<tab_video>
 		<cap_renderer x="17" y="10" width="119" height="21">
-			<text font="letterica16" color="ui_6">ui_mm_renderer</text>			
+			<text font="letterica16" color="ui_6">ui_mm_renderer</text>
 		</cap_renderer>
 		<list_renderer x="162" y="10" width="218" height="21" list_length="5" always_show_scroll="0">
 			<options_item entry="renderer" group="mm_opt_video" depend="restart"/>
@@ -106,7 +106,7 @@
 		</list_renderer>
 
 		<cap_preset x="17" y="40" width="119" height="21">
-			<text font="letterica16" color="ui_6">ui_mm_quality_presets</text>			
+			<text font="letterica16" color="ui_6">ui_mm_quality_presets</text>
 		</cap_preset>
 		<list_presets x="162" y="40" width="218" height="21" list_length="5"  always_show_scroll="0">
 			<options_item entry="_preset" group="mm_opt_video_preset" depend="vid"/>
@@ -156,17 +156,17 @@
 			<text font="letterica16" color="ui_6">ui_mm_fullscreen</text>
 		</cap_fullscreen>
 		<check_fullscreen x="162" y="190" width="27" height="21" stretch="1">
-			<options_item entry="rs_fullscreen" group="mm_opt_video" depend="vid"/>	
+			<options_item entry="rs_fullscreen" group="mm_opt_video" depend="vid"/>
 		</check_fullscreen>
-		
+
 
 		<btn_advanced x="265" y="325" width="111" height="29">
-			<text align="c" font="letterica16" r="227" g="199" b="178">ui_mm_advanced</text>	
-			<texture>ui_button_ordinary</texture>			
+			<text align="c" font="letterica16" r="227" g="199" b="178">ui_mm_advanced</text>
+			<texture>ui_button_ordinary</texture>
 		</btn_advanced>
-		
+
 	</tab_video>
-  
+
   <con_cmd>
     <scroll_v	x="0" y="10" width="385" height="313"
 					right_ident="0" left_ident="0" top_indent="0" bottom_indent="0"
@@ -586,7 +586,7 @@
       <text align="c" font="letterica16" r="227" g="199" b="178">ui_mm_simply</text>
       <texture>ui_button_ordinary</texture>
     </btn_to_simply>
-  
+
 </video_adv>
 
   <tab_sound>
@@ -596,7 +596,7 @@
 		<cap_musicvolume x="17" y="50" width="119" height="21">
 			<text font="letterica16" color="ui_6">ui_mm_music_volume</text>
 		</cap_musicvolume>
-		
+
 		<check_eax x="17" y="110" width="27" height="21" stretch="1">
 			<options_item entry="snd_efx" group="mm_opt_sound" depend="snd"/>
 			<text font="letterica16" color="ui_6">ui_mm_eax</text>
@@ -626,14 +626,27 @@
       <list_font_s r="240" g="217" b="182"/>
       <list_font	 r="216" g="186" b="140" font="letterica16"/>
     </list_snd_device>
+
+    <cap_snd_input_device x="17" y="105" width="119" height="21">
+      <text font="letterica16" color="ui_6">ui_mm_snd_input_device</text>
+    </cap_snd_input_device>
+    <list_snd_input_device x="162" y="105" width="217" height="21" always_show_scroll="1">
+      <options_item entry="snd_input_device" group="mm_opt_sound" depend="restart"/>
+      <text_color>
+        <e r="216" g="186" b="140"/>
+        <d color="ui_gray"/>
+      </text_color>
+      <list_font_s r="240" g="217" b="182"/>
+      <list_font	 r="216" g="186" b="140" font="letterica16"/>
+    </list_snd_input_device>
   </tab_sound>
 
   <tab_gameplay>
 		<cap_difficulty x="17" y="20" width="203" height="21">
-			<text font="letterica16" color="ui_6">ui_mm_difficulty</text>			
+			<text font="letterica16" color="ui_6">ui_mm_difficulty</text>
 		</cap_difficulty>
 
-		<list_difficulty x="162" y="20" width="217" height="21">	
+		<list_difficulty x="162" y="20" width="217" height="21">
 			<options_item entry="g_game_difficulty" group="mm_opt_gameplay"/>
 			<text_color>
 				<e r="216" g="186" b="140"/>
@@ -641,7 +654,7 @@
 			<list_font_s r="240" g="217" b="182"/>
 			<list_font	 r="216" g="186" b="140" font="letterica16"/>
 		</list_difficulty>
-		
+
 		<check_tips x="17" y="180" width="27" height="21" stretch="1">
 			<options_item entry="hud_info" group="mm_opt_gameplay"/>
 			<text font="letterica16" color="ui_6">ui_mm_tips</text>
@@ -668,10 +681,10 @@
 		</check_dist>
 
 		<btn_check_updates x="270" y="290" width="111" height="29">
-			<text align="c" font="letterica16" r="227" g="199" b="178">ui_mm_check_updates</text>	
-			<texture>ui_button_ordinary</texture>			
+			<text align="c" font="letterica16" r="227" g="199" b="178">ui_mm_check_updates</text>
+			<texture>ui_button_ordinary</texture>
 		</btn_check_updates>
-		
+
 	</tab_gameplay>
 	<tab_controls>
 		<cap_mousesens x="17" y="20" width="125" height="21">
@@ -683,7 +696,7 @@
         <text font="letterica16" color="ui_6">ui_mm_keyboard_setup</text>
       </auto_static>
     </cap_keyboardsetup>
-	
+
 		<track_mousesens x="162" y="20" width="217" height="21" step="0.01">
 			<options_item entry="mouse_sens" group="mm_opt_controls"/>
 		</track_mousesens>
@@ -717,14 +730,14 @@
 			</frame>
 			<list x="0" y="20" width="376" height="181" item_height="18" always_show_scroll="1">
 				<group_name font="letterica16" color="ui_6"/>
-				<item_text font="letterica16" r="215" g="215" b="215"/>				
+				<item_text font="letterica16" r="215" g="215" b="215"/>
 			</list>
-			
+
 			<scroll_view x="0" y="20" width="373" height="181" always_show_scroll="1" vert_interval="3">
 				<item_group x="0" y="0" width="133" height="25">
 					<text font="letterica16" color="ui_6"/>
 				</item_group>
-				
+
 				<item_key x="0" y="0" width="345" height="18">
 					<text font="letterica16" r="215" g="215" b="215"/>
 				</item_key>
@@ -732,36 +745,36 @@
 		</key_binding>
 
 		<btn_default x="265" y="325" width="111" height="29">
-			<text align="c" font="letterica16" r="227" g="199" b="178">ui_mm_default</text>	
-			<texture>ui_button_ordinary</texture>			
+			<text align="c" font="letterica16" r="227" g="199" b="178">ui_mm_default</text>
+			<texture>ui_button_ordinary</texture>
 		</btn_default>
 	</tab_controls>
-	
+
 	<frame x="0" y="0" width="392" height="330">
-		<texture>ui_tablist_textbox</texture>		
+		<texture>ui_tablist_textbox</texture>
 	</frame>
 	<frame_gameplay x="0" y="0" width="392" height="330">
-		<texture>ui_tablist_textbox</texture>		
+		<texture>ui_tablist_textbox</texture>
 	</frame_gameplay>
 	<frame_videoadv x="0" y="0" width="392" height="330">
-		<texture>ui_tablist_textbox</texture>		
+		<texture>ui_tablist_textbox</texture>
 	</frame_videoadv>
 	<download_static x="186" y="717" width="603" height="51">
 		<texture>ui_patch_back</texture>
 	</download_static>
 
 	<download_text x="200" y="730" width="480" height="30">
-		<text align="c" font="letterica16" r="135" g="123" b="116" complex_mode="0">mm_mp_progress</text>	
+		<text align="c" font="letterica16" r="135" g="123" b="116" complex_mode="0">mm_mp_progress</text>
 	</download_text>
-	
+
 	<progress_download x="222" y="754" width="403" height="10" horz="1" min="0" max="100">
 		<progress>
 			<texture>ui_patch_progress</texture>
 		</progress>
 	</progress_download>
-	
+
 	<btn_cancel_download x="652" y="732" width="111" height="29">
-		<text align="c" font="letterica16" r="227" g="199" b="178">mm_mp_cancel</text>	
-		<texture>ui_button_ordinary</texture>			
+		<text align="c" font="letterica16" r="227" g="199" b="178">mm_mp_cancel</text>
+		<texture>ui_button_ordinary</texture>
 	</btn_cancel_download>
 </w>
diff --git a/res/gamedata/configs/ui/textures_descr/ui_communities.xml b/res/gamedata/configs/ui/textures_descr/ui_communities.xml
new file mode 100644
index 00000000000..83b104bc839
--- /dev/null
+++ b/res/gamedata/configs/ui/textures_descr/ui_communities.xml
@@ -0,0 +1,13 @@
+<w>
+    <file name="ui\ui_communities">
+        <texture id="ui_mp_community_icon_1" x="0" y="0" width="52" height="52" />
+        <texture id="ui_mp_community_icon_2" x="52" y="0" width="52" height="52" />
+        <texture id="ui_mp_community_icon_3" x="104" y="0" width="52" height="52" />
+        <texture id="ui_mp_community_icon_4" x="156" y="0" width="52" height="52" />
+        <texture id="ui_mp_community_icon_5" x="208" y="0" width="52" height="52" />	
+        <texture id="ui_mp_community_icon_6" x="0" y="52" width="52" height="52" />
+        <texture id="ui_mp_community_icon_7" x="52"	y="52" width="52" height="52" />
+        <texture id="ui_mp_community_icon_8" x="104" y="52" width="52" height="52" />
+        <texture id="ui_mp_community_icon_9" x="156" y="52" width="52" height="52" />
+   </file>
+</w>
diff --git a/res/gamedata/configs/ui/textures_descr/ui_microphone.xml b/res/gamedata/configs/ui/textures_descr/ui_microphone.xml
new file mode 100644
index 00000000000..ad9f3aa89a0
--- /dev/null
+++ b/res/gamedata/configs/ui/textures_descr/ui_microphone.xml
@@ -0,0 +1,5 @@
+<w>
+    <file name="ui\ui_microphone">
+        <texture id="ui_microphone_icon" x="0" y="0" width="64" height="64" />
+   </file>
+</w>
diff --git a/res/gamedata/configs/ui/ui_keybinding.xml b/res/gamedata/configs/ui/ui_keybinding.xml
index 9d0217ba01a..bbb84acad29 100644
--- a/res/gamedata/configs/ui/ui_keybinding.xml
+++ b/res/gamedata/configs/ui/ui_keybinding.xml
@@ -60,6 +60,8 @@
 		<command id="kb_scores"						exe="scores"/>
 		<command id="kb_chat"						  exe="chat"/>
 		<command id="kb_chat_team"				exe="chat_team"/>
+		<command id="kb_voice_chat"					exe="voice_chat"/>
+		<command id="kb_voice_distanec"				exe="voice_distance"/>
 		<command id="kb_buy_menu"					exe="buy_menu"/>
 		<command id="kb_skin_menu"				exe="skin_menu"/>
 		<command id="kb_team_menu"				exe="team_menu"/>
diff --git a/res/gamedata/configs/ui/ui_mm_opt.xml b/res/gamedata/configs/ui/ui_mm_opt.xml
index 4e76b90b0e8..3d59aad0c33 100644
--- a/res/gamedata/configs/ui/ui_mm_opt.xml
+++ b/res/gamedata/configs/ui/ui_mm_opt.xml
@@ -559,21 +559,67 @@
             </text_color>
         </list_snd_device>
 
-        <cap_check_eax x="15" y="93" width="135" height="24">
+        <cap_snd_input_device x="15" y="93" width="135" height="24">
+            <text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_snd_input_device</text>
+        </cap_snd_input_device>
+        <list_snd_input_device x="175" y="95" width="235" height="20" always_show_scroll="1">
+            <options_item entry="snd_input_device" group="mm_opt_sound" depend="restart"/>
+            <list_font r="170" g="170" b="170" font="letterica16"/>
+            <text_color>
+	            <e r="170" g="170" b="170"/>
+	            <d r="70" g="70" b="70"/>
+            </text_color>
+        </list_snd_input_device>
+
+        <cap_check_eax x="15" y="123" width="135" height="24">
             <text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_eax</text>
         </cap_check_eax>
-        <check_eax x="162" y="90" width="44" height="29">
+        <check_eax x="162" y="120" width="44" height="29">
 	        <texture>ui_inGame2_checkbox</texture>
             <options_item entry="snd_efx" group="mm_opt_sound" depend="snd"/>
         </check_eax>
 
-        <cap_check_dynamic_music x="15" y="123" width="135" height="24">
+        <cap_check_dynamic_music x="15" y="153" width="135" height="24">
             <text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_dynamic_music</text>
         </cap_check_dynamic_music>
-        <check_dynamic_music x="162" y="120" width="44" height="29">
+        <check_dynamic_music x="162" y="150" width="44" height="29">
 	        <texture>ui_inGame2_checkbox</texture>
             <options_item entry="g_dynamic_music" group="mm_opt_sound" depend="snd"/>
         </check_dynamic_music>
+
+        <cap_vc_title x="15" y="213" width="400" height="24">
+          <text r="170" g="170" b="170" font="letterica18" align="c" vert_align="c">ui_mm_voice_chat</text>
+        </cap_vc_title>
+
+        <cap_players_voice_volume x="15" y="247" width="135" height="24">
+          <text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_players_voice_volume</text>
+        </cap_players_voice_volume>
+        <track_players_voice_volume x="175" y="240" width="235" height="16">
+          <options_item entry="snd_volume_players" group="mm_opt_sound"/>
+        </track_players_voice_volume>
+
+        <cap_recorder_volume x="15" y="277" width="135" height="24">
+          <text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_recorder_volume</text>
+        </cap_recorder_volume>
+        <track_recorder_volume x="175" y="280" width="235" height="16">
+          <options_item entry="snd_volume_recorder" group="mm_opt_sound"/>
+        </track_recorder_volume>
+
+        <cap_check_recorder_agc x="15" y="310" width="135" height="24">
+          <text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_recorder_agc</text>
+        </cap_check_recorder_agc>
+        <check_recorder_agc  x="162" y="307" width="44" height="29">
+          <texture>ui_inGame2_checkbox</texture>
+          <options_item entry="snd_recorder_mode" group="mm_opt_sound" depend="snd"/>
+        </check_recorder_agc>
+
+        <cap_check_recorder_denoise x="15" y="343" width="135" height="24">
+          <text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_denoise</text>
+        </cap_check_recorder_denoise>
+        <check_recorder_denoise  x="162" y="340" width="44" height="29">
+          <texture>ui_inGame2_checkbox</texture>
+          <options_item entry="snd_recorder_denoise" group="mm_opt_sound" depend="snd"/>
+        </check_recorder_denoise>
     </tab_sound>
     <tab_gameplay>
         <scroll_v x="-5" y="0" width="450" height="320"
@@ -619,7 +665,7 @@
 	            <d r="70" g="70" b="70"/>
             </text_color>
         </list_ui_style>
-		
+
 		<cap_fov x="20" y="3" width="135" height="24">
 			<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_fov</text>
 		</cap_fov>
@@ -813,7 +859,7 @@
 				<e r="210" g="210" b="210"/>
 			</text_color>
         </btn_default>
-		
+
 		<btn_advanced x="201" y="322" width="133" height="24" stretch="1" accel="ui_action_1">
             <text align="c" font="letterica16">ui_mm_gamepad_setup</text>
             <texture>ui_inGame2_button</texture>
@@ -822,7 +868,7 @@
 			</text_color>
         </btn_advanced>
     </tab_controls>
-	
+
 	<tab_controls_gpad>
 		<cap_gamepadsetup x="0" y="65" width="430" height="15">
             <texture a="150">ui_inGame2_servers_list_button</texture>
@@ -830,7 +876,7 @@
                 <text r="170" g="170" b="170" font="letterica16" vert_align="c">ui_mm_gamepad_setup</text>
             </auto_static>
         </cap_gamepadsetup>
-		
+
 		<key_binding_gamepad x="0" y="85" width="430" height="240" gamepad_bind="1">
             <header_1 x="0" y="0" width="220" height="15">
                 <texture a="150">ui_inGame2_servers_list_button</texture>
@@ -867,7 +913,7 @@
 				<e r="210" g="210" b="210"/>
 			</text_color>
         </btn_default>
-		
+
 		<btn_controls x="191" y="322" width="143" height="24" stretch="1" accel="ui_action_1">
             <text align="c" font="letterica16">ui_mm_keyboard_setup</text>
             <texture>ui_inGame2_button</texture>
@@ -876,7 +922,7 @@
 			</text_color>
         </btn_controls>
 	</tab_controls_gpad>
-	
+
     <download_static x="186" y="717" width="603" height="51">
         <texture>ui_patch_back</texture>
     </download_static>
diff --git a/res/gamedata/configs/ui/ui_mm_opt_16.xml b/res/gamedata/configs/ui/ui_mm_opt_16.xml
index 9ef450d7a56..e89b8ebbf96 100644
--- a/res/gamedata/configs/ui/ui_mm_opt_16.xml
+++ b/res/gamedata/configs/ui/ui_mm_opt_16.xml
@@ -562,21 +562,67 @@
 		    </text_color>
         </list_snd_device>
 
-        <cap_check_eax x="12" y="93" width="108" height="24">
+        <cap_snd_input_device x="12" y="93" width="108" height="24">
+            <text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_snd_input_device</text>
+        </cap_snd_input_device>
+        <list_snd_input_device x="140" y="95" width="188" height="20" always_show_scroll="1">
+            <options_item entry="snd_input_device" group="mm_opt_sound" depend="restart"/>
+            <list_font r="170" g="170" b="170" font="letterica16"/>
+		    <text_color>
+	            <e r="170" g="170" b="170"/>
+	            <d r="70" g="70" b="70"/>
+		    </text_color>
+        </list_snd_input_device>
+
+        <cap_check_eax x="12" y="123" width="108" height="24">
             <text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_eax</text>
         </cap_check_eax>
-        <check_eax x="129" y="90" width="35" stretch="1" height="29">
+        <check_eax x="129" y="120" width="35" stretch="1" height="29">
 	        <texture>ui_inGame2_checkbox</texture>
             <options_item entry="snd_efx" group="mm_opt_sound" depend="snd"/>
         </check_eax>
 
-        <cap_check_dynamic_music x="12" y="123" width="108" height="24">
+        <cap_check_dynamic_music x="12" y="153" width="108" height="24">
             <text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_dynamic_music</text>
         </cap_check_dynamic_music>
-        <check_dynamic_music x="129" y="120" width="35" stretch="1" height="29">
+        <check_dynamic_music x="129" y="150" width="35" stretch="1" height="29">
 	        <texture>ui_inGame2_checkbox</texture>
             <options_item entry="g_dynamic_music" group="mm_opt_sound" depend="snd"/>
         </check_dynamic_music>
+
+        <cap_vc_title x="12" y="213" width="300" height="24">
+          <text r="170" g="170" b="170" font="letterica18" align="c" vert_align="c">ui_mm_voice_chat</text>
+        </cap_vc_title>
+
+        <cap_players_voice_volume x="12" y="247" width="108" height="24">
+          <text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_players_voice_volume</text>
+        </cap_players_voice_volume>
+        <track_players_voice_volume x="140" y="240" width="188" height="16">
+          <options_item entry="snd_volume_players" group="mm_opt_sound"/>
+        </track_players_voice_volume>
+
+        <cap_recorder_volume x="12" y="277" width="108" height="24">
+          <text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_recorder_volume</text>
+        </cap_recorder_volume>
+        <track_recorder_volume x="140" y="280" width="188" height="16">
+          <options_item entry="snd_volume_recorder" group="mm_opt_sound"/>
+        </track_recorder_volume>
+
+        <cap_check_recorder_agc x="12" y="310" width="108" height="24">
+          <text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_recorder_agc</text>
+        </cap_check_recorder_agc>
+        <check_recorder_agc x="129" y="307" width="35" stretch="1" height="29">
+          <texture>ui_inGame2_checkbox</texture>
+          <options_item entry="snd_recorder_mode" group="mm_opt_sound" depend="snd"/>
+        </check_recorder_agc>
+
+        <cap_check_recorder_denoise x="12" y="343" width="108" height="24">
+          <text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_denoise</text>
+        </cap_check_recorder_denoise>
+        <check_recorder_denoise x="129" y="340" width="35" stretch="1" height="29">
+          <texture>ui_inGame2_checkbox</texture>
+          <options_item entry="snd_recorder_denoise" group="mm_opt_sound" depend="snd"/>
+        </check_recorder_denoise>
     </tab_sound>
     <tab_gameplay>
         <templ_item width="360" height="30"/>
@@ -622,7 +668,7 @@
 	            <d r="70" g="70" b="70"/>
             </text_color>
         </list_ui_style>
-		
+
 		<cap_fov x="16" y="3" width="108" height="24">
 			<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_fov</text>
 		</cap_fov>
@@ -815,7 +861,7 @@
 				<e r="210" g="210" b="210"/>
 			</text_color>
         </btn_default>
-		
+
 		<btn_advanced x="156" y="322" width="110" height="24" stretch="1" accel="ui_action_1">
             <text align="c" font="letterica16">ui_mm_gamepad_setup</text>
             <texture>ui_inGame2_button</texture>
@@ -824,7 +870,7 @@
 			</text_color>
         </btn_advanced>
     </tab_controls>
-	
+
 	<tab_controls_gpad>
 		<cap_gamepadsetup x="0" y="65" width="344" height="15">
             <texture a="150">ui_inGame2_servers_list_button</texture>
@@ -832,7 +878,7 @@
                 <text r="170" g="170" b="170" font="letterica16" vert_align="c">ui_mm_gamepad_setup</text>
             </auto_static>
         </cap_gamepadsetup>
-		
+
 		<key_binding_gamepad x="0" y="85" width="344" height="240" gamepad_bind="1">
             <header_1 x="0" y="0" width="176" height="15">
                 <texture a="150">ui_inGame2_servers_list_button</texture>
@@ -869,7 +915,7 @@
 				<e r="210" g="210" b="210"/>
 			</text_color>
         </btn_default>
-		
+
 		<btn_controls x="150" y="322" width="116" height="24" stretch="1" accel="ui_action_1">
             <text align="c" font="letterica16">ui_mm_keyboard_setup</text>
             <texture>ui_inGame2_button</texture>
diff --git a/res/gamedata/scripts/ui_mm_opt_sound.script b/res/gamedata/scripts/ui_mm_opt_sound.script
new file mode 100644
index 00000000000..867c054dad2
--- /dev/null
+++ b/res/gamedata/scripts/ui_mm_opt_sound.script
@@ -0,0 +1,38 @@
+class "opt_sound" (CUIWindow)
+
+function opt_sound:__init() super()
+end
+
+function opt_sound:__finalize()
+
+end
+
+function opt_sound:InitControls(x, y, xml, handler)
+
+	self:SetWndPos(vector2():set(x,y))
+	self:SetWndSize(vector2():set(738,416))
+	self:SetAutoDelete(true)
+
+--	self.bk = xml:InitFrame("frame", self)
+
+	xml:InitStatic("tab_sound:cap_mastervolume",		self)
+	xml:InitStatic("tab_sound:cap_musicvolume",			self)
+
+	xml:InitStatic("tab_sound:cap_check_eax",			self)
+	xml:InitStatic("tab_sound:cap_check_dynamic_music",	self)
+
+	xml:InitCheck("tab_sound:check_eax",				self)
+	xml:InitCheck("tab_sound:check_dynamic_music",		self)
+
+
+	xml:InitTrackBar				("tab_sound:track_musicvolume",	self)
+	xml:InitTrackBar				("tab_sound:track_mastervolume",self)
+
+
+	xml:InitStatic					("tab_sound:cap_snd_device",		self)
+	xml:InitComboBox				("tab_sound:list_snd_device",	self)
+
+	xml:InitStatic					("tab_sound:cap_snd_input_device",		self)
+	xml:InitComboBox				("tab_sound:list_snd_input_device",	self)
+
+end
diff --git a/res/gamedata/textures/ui/ui_communities.dds b/res/gamedata/textures/ui/ui_communities.dds
new file mode 100644
index 00000000000..2ec15f3e11e
Binary files /dev/null and b/res/gamedata/textures/ui/ui_communities.dds differ
diff --git a/res/gamedata/textures/ui/ui_communities.thm b/res/gamedata/textures/ui/ui_communities.thm
new file mode 100644
index 00000000000..19f22342bc0
Binary files /dev/null and b/res/gamedata/textures/ui/ui_communities.thm differ
diff --git a/res/gamedata/textures/ui/ui_microphone.dds b/res/gamedata/textures/ui/ui_microphone.dds
new file mode 100644
index 00000000000..03652c05f5c
Binary files /dev/null and b/res/gamedata/textures/ui/ui_microphone.dds differ
diff --git a/res/gamedata/textures/ui/ui_microphone.thm b/res/gamedata/textures/ui/ui_microphone.thm
new file mode 100644
index 00000000000..fe27fe46262
Binary files /dev/null and b/res/gamedata/textures/ui/ui_microphone.thm differ
diff --git a/res/gamedata/textures/ui/ui_voice.dds b/res/gamedata/textures/ui/ui_voice.dds
new file mode 100644
index 00000000000..771404b1abf
Binary files /dev/null and b/res/gamedata/textures/ui/ui_voice.dds differ
diff --git a/res/gamedata/textures/ui/ui_voice.thm b/res/gamedata/textures/ui/ui_voice.thm
new file mode 100644
index 00000000000..e6e114e872d
Binary files /dev/null and b/res/gamedata/textures/ui/ui_voice.thm differ
diff --git a/sdk/binaries/x64/libspeexdsp-1.dll b/sdk/binaries/x64/libspeexdsp-1.dll
new file mode 100644
index 00000000000..85b2cf4d966
Binary files /dev/null and b/sdk/binaries/x64/libspeexdsp-1.dll differ
diff --git a/sdk/binaries/x64/msys-opus-0.dll b/sdk/binaries/x64/msys-opus-0.dll
new file mode 100644
index 00000000000..823e6025569
Binary files /dev/null and b/sdk/binaries/x64/msys-opus-0.dll differ
diff --git a/sdk/binaries/x86/libspeexdsp-1.dll b/sdk/binaries/x86/libspeexdsp-1.dll
new file mode 100644
index 00000000000..82fb00aeb58
Binary files /dev/null and b/sdk/binaries/x86/libspeexdsp-1.dll differ
diff --git a/sdk/binaries/x86/msys-opus-0.dll b/sdk/binaries/x86/msys-opus-0.dll
new file mode 100644
index 00000000000..d346464292c
Binary files /dev/null and b/sdk/binaries/x86/msys-opus-0.dll differ
diff --git a/sdk/include/opus/opus.h b/sdk/include/opus/opus.h
new file mode 100644
index 00000000000..edf45528919
--- /dev/null
+++ b/sdk/include/opus/opus.h
@@ -0,0 +1,1172 @@
+/* Copyright (c) 2010-2011 Xiph.Org Foundation, Skype Limited
+   Written by Jean-Marc Valin and Koen Vos */
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/**
+ * @file opus.h
+ * @brief Opus reference implementation API
+ */
+
+#ifndef OPUS_H
+#define OPUS_H
+
+#include "opus_types.h"
+#include "opus_defines.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @mainpage Opus
+ *
+ * The Opus codec is designed for interactive speech and audio transmission over the Internet.
+ * It is designed by the IETF Codec Working Group and incorporates technology from
+ * Skype's SILK codec and Xiph.Org's CELT codec.
+ *
+ * The Opus codec is designed to handle a wide range of interactive audio applications,
+ * including Voice over IP, videoconferencing, in-game chat, and even remote live music
+ * performances. It can scale from low bit-rate narrowband speech to very high quality
+ * stereo music. Its main features are:
+
+ * @li Sampling rates from 8 to 48 kHz
+ * @li Bit-rates from 6 kb/s to 510 kb/s
+ * @li Support for both constant bit-rate (CBR) and variable bit-rate (VBR)
+ * @li Audio bandwidth from narrowband to full-band
+ * @li Support for speech and music
+ * @li Support for mono and stereo
+ * @li Support for multichannel (up to 255 channels)
+ * @li Frame sizes from 2.5 ms to 60 ms
+ * @li Good loss robustness and packet loss concealment (PLC)
+ * @li Floating point and fixed-point implementation
+ *
+ * Documentation sections:
+ * @li @ref opus_encoder
+ * @li @ref opus_decoder
+ * @li @ref opus_repacketizer
+ * @li @ref opus_multistream
+ * @li @ref opus_libinfo
+ * @li @ref opus_custom
+ */
+
+/** @defgroup opus_encoder Opus Encoder
+  * @{
+  *
+  * @brief This page describes the process and functions used to encode Opus.
+  *
+  * Since Opus is a stateful codec, the encoding process starts with creating an encoder
+  * state. This can be done with:
+  *
+  * @code
+  * int          error;
+  * OpusEncoder *enc;
+  * enc = opus_encoder_create(Fs, channels, application, &error);
+  * @endcode
+  *
+  * From this point, @c enc can be used for encoding an audio stream. An encoder state
+  * @b must @b not be used for more than one stream at the same time. Similarly, the encoder
+  * state @b must @b not be re-initialized for each frame.
+  *
+  * While opus_encoder_create() allocates memory for the state, it's also possible
+  * to initialize pre-allocated memory:
+  *
+  * @code
+  * int          size;
+  * int          error;
+  * OpusEncoder *enc;
+  * size = opus_encoder_get_size(channels);
+  * enc = malloc(size);
+  * error = opus_encoder_init(enc, Fs, channels, application);
+  * @endcode
+  *
+  * where opus_encoder_get_size() returns the required size for the encoder state. Note that
+  * future versions of this code may change the size, so no assumptions should be made about it.
+  *
+  * The encoder state is always continuous in memory and only a shallow copy is sufficient
+  * to copy it (e.g. memcpy())
+  *
+  * It is possible to change some of the encoder's settings using the opus_encoder_ctl()
+  * interface. All these settings already default to the recommended value, so they should
+  * only be changed when necessary. The most common settings one may want to change are:
+  *
+  * @code
+  * opus_encoder_ctl(enc, OPUS_SET_BITRATE(bitrate));
+  * opus_encoder_ctl(enc, OPUS_SET_COMPLEXITY(complexity));
+  * opus_encoder_ctl(enc, OPUS_SET_SIGNAL(signal_type));
+  * @endcode
+  *
+  * where
+  *
+  * @arg bitrate is in bits per second (b/s)
+  * @arg complexity is a value from 1 to 10, where 1 is the lowest complexity and 10 is the highest
+  * @arg signal_type is either OPUS_AUTO (default), OPUS_SIGNAL_VOICE, or OPUS_SIGNAL_MUSIC
+  *
+  * See @ref opus_encoderctls and @ref opus_genericctls for a complete list of parameters that can be set or queried. Most parameters can be set or changed at any time during a stream.
+  *
+  * To encode a frame, opus_encode() or opus_encode_float() must be called with exactly one frame (2.5, 5, 10, 20, 40 or 60 ms) of audio data:
+  * @code
+  * len = opus_encode(enc, audio_frame, frame_size, packet, max_packet);
+  * @endcode
+  *
+  * where
+  * <ul>
+  * <li>audio_frame is the audio data in opus_int16 (or float for opus_encode_float())</li>
+  * <li>frame_size is the duration of the frame in samples (per channel)</li>
+  * <li>packet is the byte array to which the compressed data is written</li>
+  * <li>max_packet is the maximum number of bytes that can be written in the packet (4000 bytes is recommended).
+  *     Do not use max_packet to control VBR target bitrate, instead use the #OPUS_SET_BITRATE CTL.</li>
+  * </ul>
+  *
+  * opus_encode() and opus_encode_float() return the number of bytes actually written to the packet.
+  * The return value <b>can be negative</b>, which indicates that an error has occurred. If the return value
+  * is 2 bytes or less, then the packet does not need to be transmitted (DTX).
+  *
+  * Once the encoder state if no longer needed, it can be destroyed with
+  *
+  * @code
+  * opus_encoder_destroy(enc);
+  * @endcode
+  *
+  * If the encoder was created with opus_encoder_init() rather than opus_encoder_create(),
+  * then no action is required aside from potentially freeing the memory that was manually
+  * allocated for it (calling free(enc) for the example above)
+  *
+  */
+
+/** Opus encoder state.
+  * This contains the complete state of an Opus encoder.
+  * It is position independent and can be freely copied.
+  * @see opus_encoder_create,opus_encoder_init
+  */
+typedef struct OpusEncoder OpusEncoder;
+
+/** Gets the size of an <code>OpusEncoder</code> structure.
+  * @param[in] channels <tt>int</tt>: Number of channels.
+  *                                   This must be 1 or 2.
+  * @returns The size in bytes.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_encoder_get_size(int channels);
+
+/**
+ */
+
+/** Allocates and initializes an encoder state.
+ * There are three coding modes:
+ *
+ * @ref OPUS_APPLICATION_VOIP gives best quality at a given bitrate for voice
+ *    signals. It enhances the  input signal by high-pass filtering and
+ *    emphasizing formants and harmonics. Optionally  it includes in-band
+ *    forward error correction to protect against packet loss. Use this
+ *    mode for typical VoIP applications. Because of the enhancement,
+ *    even at high bitrates the output may sound different from the input.
+ *
+ * @ref OPUS_APPLICATION_AUDIO gives best quality at a given bitrate for most
+ *    non-voice signals like music. Use this mode for music and mixed
+ *    (music/voice) content, broadcast, and applications requiring less
+ *    than 15 ms of coding delay.
+ *
+ * @ref OPUS_APPLICATION_RESTRICTED_LOWDELAY configures low-delay mode that
+ *    disables the speech-optimized mode in exchange for slightly reduced delay.
+ *    This mode can only be set on an newly initialized or freshly reset encoder
+ *    because it changes the codec delay.
+ *
+ * This is useful when the caller knows that the speech-optimized modes will not be needed (use with caution).
+ * @param [in] Fs <tt>opus_int32</tt>: Sampling rate of input signal (Hz)
+ *                                     This must be one of 8000, 12000, 16000,
+ *                                     24000, or 48000.
+ * @param [in] channels <tt>int</tt>: Number of channels (1 or 2) in input signal
+ * @param [in] application <tt>int</tt>: Coding mode (one of @ref OPUS_APPLICATION_VOIP, @ref OPUS_APPLICATION_AUDIO, or @ref OPUS_APPLICATION_RESTRICTED_LOWDELAY)
+ * @param [out] error <tt>int*</tt>: @ref opus_errorcodes
+ * @note Regardless of the sampling rate and number channels selected, the Opus encoder
+ * can switch to a lower audio bandwidth or number of channels if the bitrate
+ * selected is too low. This also means that it is safe to always use 48 kHz stereo input
+ * and let the encoder optimize the encoding.
+ */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusEncoder *opus_encoder_create(
+    opus_int32 Fs,
+    int channels,
+    int application,
+    int *error
+);
+
+/** Initializes a previously allocated encoder state
+  * The memory pointed to by st must be at least the size returned by opus_encoder_get_size().
+  * This is intended for applications which use their own allocator instead of malloc.
+  * @see opus_encoder_create(),opus_encoder_get_size()
+  * To reset a previously initialized state, use the #OPUS_RESET_STATE CTL.
+  * @param [in] st <tt>OpusEncoder*</tt>: Encoder state
+  * @param [in] Fs <tt>opus_int32</tt>: Sampling rate of input signal (Hz)
+ *                                      This must be one of 8000, 12000, 16000,
+ *                                      24000, or 48000.
+  * @param [in] channels <tt>int</tt>: Number of channels (1 or 2) in input signal
+  * @param [in] application <tt>int</tt>: Coding mode (one of OPUS_APPLICATION_VOIP, OPUS_APPLICATION_AUDIO, or OPUS_APPLICATION_RESTRICTED_LOWDELAY)
+  * @retval #OPUS_OK Success or @ref opus_errorcodes
+  */
+OPUS_EXPORT int opus_encoder_init(
+    OpusEncoder *st,
+    opus_int32 Fs,
+    int channels,
+    int application
+) OPUS_ARG_NONNULL(1);
+
+/** Encodes an Opus frame.
+  * @param [in] st <tt>OpusEncoder*</tt>: Encoder state
+  * @param [in] pcm <tt>opus_int16*</tt>: Input signal (interleaved if 2 channels). length is frame_size*channels*sizeof(opus_int16)
+  * @param [in] frame_size <tt>int</tt>: Number of samples per channel in the
+  *                                      input signal.
+  *                                      This must be an Opus frame size for
+  *                                      the encoder's sampling rate.
+  *                                      For example, at 48 kHz the permitted
+  *                                      values are 120, 240, 480, 960, 1920,
+  *                                      and 2880.
+  *                                      Passing in a duration of less than
+  *                                      10 ms (480 samples at 48 kHz) will
+  *                                      prevent the encoder from using the LPC
+  *                                      or hybrid modes.
+  * @param [out] data <tt>unsigned char*</tt>: Output payload.
+  *                                            This must contain storage for at
+  *                                            least \a max_data_bytes.
+  * @param [in] max_data_bytes <tt>opus_int32</tt>: Size of the allocated
+  *                                                 memory for the output
+  *                                                 payload. This may be
+  *                                                 used to impose an upper limit on
+  *                                                 the instant bitrate, but should
+  *                                                 not be used as the only bitrate
+  *                                                 control. Use #OPUS_SET_BITRATE to
+  *                                                 control the bitrate.
+  * @returns The length of the encoded packet (in bytes) on success or a
+  *          negative error code (see @ref opus_errorcodes) on failure.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_encode(
+    OpusEncoder *st,
+    const opus_int16 *pcm,
+    int frame_size,
+    unsigned char *data,
+    opus_int32 max_data_bytes
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
+
+/** Encodes an Opus frame.
+  * @param [in] st <tt>OpusEncoder*</tt>: Encoder state
+  * @param [in] pcm <tt>opus_int32*</tt>: Input signal (interleaved if 2 channels) representing (or slightly exceeding) 24-bit values. length is frame_size*channels*sizeof(opus_int32)
+  * @param [in] frame_size <tt>int</tt>: Number of samples per channel in the
+  *                                      input signal.
+  *                                      This must be an Opus frame size for
+  *                                      the encoder's sampling rate.
+  *                                      For example, at 48 kHz the permitted
+  *                                      values are 120, 240, 480, 960, 1920,
+  *                                      and 2880.
+  *                                      Passing in a duration of less than
+  *                                      10 ms (480 samples at 48 kHz) will
+  *                                      prevent the encoder from using the LPC
+  *                                      or hybrid modes.
+  * @param [out] data <tt>unsigned char*</tt>: Output payload.
+  *                                            This must contain storage for at
+  *                                            least \a max_data_bytes.
+  * @param [in] max_data_bytes <tt>opus_int32</tt>: Size of the allocated
+  *                                                 memory for the output
+  *                                                 payload. This may be
+  *                                                 used to impose an upper limit on
+  *                                                 the instant bitrate, but should
+  *                                                 not be used as the only bitrate
+  *                                                 control. Use #OPUS_SET_BITRATE to
+  *                                                 control the bitrate.
+  * @returns The length of the encoded packet (in bytes) on success or a
+  *          negative error code (see @ref opus_errorcodes) on failure.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_encode24(
+    OpusEncoder *st,
+    const opus_int32 *pcm,
+    int frame_size,
+    unsigned char *data,
+    opus_int32 max_data_bytes
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
+
+/** Encodes an Opus frame from floating point input.
+  * @param [in] st <tt>OpusEncoder*</tt>: Encoder state
+  * @param [in] pcm <tt>float*</tt>: Input in float format (interleaved if 2 channels), with a normal range of +/-1.0.
+  *          Samples with a range beyond +/-1.0 are supported but will
+  *          be clipped by decoders using the integer API and should
+  *          only be used if it is known that the far end supports
+  *          extended dynamic range.
+  *          length is frame_size*channels*sizeof(float)
+  * @param [in] frame_size <tt>int</tt>: Number of samples per channel in the
+  *                                      input signal.
+  *                                      This must be an Opus frame size for
+  *                                      the encoder's sampling rate.
+  *                                      For example, at 48 kHz the permitted
+  *                                      values are 120, 240, 480, 960, 1920,
+  *                                      and 2880.
+  *                                      Passing in a duration of less than
+  *                                      10 ms (480 samples at 48 kHz) will
+  *                                      prevent the encoder from using the LPC
+  *                                      or hybrid modes.
+  * @param [out] data <tt>unsigned char*</tt>: Output payload.
+  *                                            This must contain storage for at
+  *                                            least \a max_data_bytes.
+  * @param [in] max_data_bytes <tt>opus_int32</tt>: Size of the allocated
+  *                                                 memory for the output
+  *                                                 payload. This may be
+  *                                                 used to impose an upper limit on
+  *                                                 the instant bitrate, but should
+  *                                                 not be used as the only bitrate
+  *                                                 control. Use #OPUS_SET_BITRATE to
+  *                                                 control the bitrate.
+  * @returns The length of the encoded packet (in bytes) on success or a
+  *          negative error code (see @ref opus_errorcodes) on failure.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_encode_float(
+    OpusEncoder *st,
+    const float *pcm,
+    int frame_size,
+    unsigned char *data,
+    opus_int32 max_data_bytes
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
+
+/** Frees an <code>OpusEncoder</code> allocated by opus_encoder_create().
+  * @param[in] st <tt>OpusEncoder*</tt>: State to be freed.
+  */
+OPUS_EXPORT void opus_encoder_destroy(OpusEncoder *st);
+
+/** Perform a CTL function on an Opus encoder.
+  *
+  * Generally the request and subsequent arguments are generated
+  * by a convenience macro.
+  * @param st <tt>OpusEncoder*</tt>: Encoder state.
+  * @param request This and all remaining parameters should be replaced by one
+  *                of the convenience macros in @ref opus_genericctls or
+  *                @ref opus_encoderctls.
+  * @see opus_genericctls
+  * @see opus_encoderctls
+  */
+OPUS_EXPORT int opus_encoder_ctl(OpusEncoder *st, int request, ...) OPUS_ARG_NONNULL(1);
+/**@}*/
+
+/** @defgroup opus_decoder Opus Decoder
+  * @{
+  *
+  * @brief This page describes the process and functions used to decode Opus.
+  *
+  * The decoding process also starts with creating a decoder
+  * state. This can be done with:
+  * @code
+  * int          error;
+  * OpusDecoder *dec;
+  * dec = opus_decoder_create(Fs, channels, &error);
+  * @endcode
+  * where
+  * @li Fs is the sampling rate and must be 8000, 12000, 16000, 24000, or 48000
+  * @li channels is the number of channels (1 or 2)
+  * @li error will hold the error code in case of failure (or #OPUS_OK on success)
+  * @li the return value is a newly created decoder state to be used for decoding
+  *
+  * While opus_decoder_create() allocates memory for the state, it's also possible
+  * to initialize pre-allocated memory:
+  * @code
+  * int          size;
+  * int          error;
+  * OpusDecoder *dec;
+  * size = opus_decoder_get_size(channels);
+  * dec = malloc(size);
+  * error = opus_decoder_init(dec, Fs, channels);
+  * @endcode
+  * where opus_decoder_get_size() returns the required size for the decoder state. Note that
+  * future versions of this code may change the size, so no assumptions should be made about it.
+  *
+  * The decoder state is always continuous in memory and only a shallow copy is sufficient
+  * to copy it (e.g. memcpy())
+  *
+  * To decode a frame, opus_decode() or opus_decode_float() must be called with a packet of compressed audio data:
+  * @code
+  * frame_size = opus_decode(dec, packet, len, decoded, max_size, 0);
+  * @endcode
+  * where
+  *
+  * @li packet is the byte array containing the compressed data
+  * @li len is the exact number of bytes contained in the packet
+  * @li decoded is the decoded audio data in opus_int16 (or float for opus_decode_float())
+  * @li max_size is the max duration of the frame in samples (per channel) that can fit into the decoded_frame array
+  *
+  * opus_decode() and opus_decode_float() return the number of samples (per channel) decoded from the packet.
+  * If that value is negative, then an error has occurred. This can occur if the packet is corrupted or if the audio
+  * buffer is too small to hold the decoded audio.
+  *
+  * Opus is a stateful codec with overlapping blocks and as a result Opus
+  * packets are not coded independently of each other. Packets must be
+  * passed into the decoder serially and in the correct order for a correct
+  * decode. Lost packets can be replaced with loss concealment by calling
+  * the decoder with a null pointer and zero length for the missing packet.
+  *
+  * A single codec state may only be accessed from a single thread at
+  * a time and any required locking must be performed by the caller. Separate
+  * streams must be decoded with separate decoder states and can be decoded
+  * in parallel unless the library was compiled with NONTHREADSAFE_PSEUDOSTACK
+  * defined.
+  *
+  */
+
+/** Opus decoder state.
+  * This contains the complete state of an Opus decoder.
+  * It is position independent and can be freely copied.
+  * @see opus_decoder_create,opus_decoder_init
+  */
+typedef struct OpusDecoder OpusDecoder;
+
+/** Opus DRED decoder.
+  * This contains the complete state of an Opus DRED decoder.
+  * It is position independent and can be freely copied.
+  * @see opus_dred_decoder_create,opus_dred_decoder_init
+  */
+typedef struct OpusDREDDecoder OpusDREDDecoder;
+
+
+/** Opus DRED state.
+  * This contains the complete state of an Opus DRED packet.
+  * It is position independent and can be freely copied.
+  * @see opus_dred_create,opus_dred_init
+  */
+typedef struct OpusDRED OpusDRED;
+
+/** Gets the size of an <code>OpusDecoder</code> structure.
+  * @param [in] channels <tt>int</tt>: Number of channels.
+  *                                    This must be 1 or 2.
+  * @returns The size in bytes.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_decoder_get_size(int channels);
+
+/** Allocates and initializes a decoder state.
+  * @param [in] Fs <tt>opus_int32</tt>: Sample rate to decode at (Hz).
+  *                                     This must be one of 8000, 12000, 16000,
+  *                                     24000, or 48000.
+  * @param [in] channels <tt>int</tt>: Number of channels (1 or 2) to decode
+  * @param [out] error <tt>int*</tt>: #OPUS_OK Success or @ref opus_errorcodes
+  *
+  * Internally Opus stores data at 48000 Hz, so that should be the default
+  * value for Fs. However, the decoder can efficiently decode to buffers
+  * at 8, 12, 16, and 24 kHz so if for some reason the caller cannot use
+  * data at the full sample rate, or knows the compressed data doesn't
+  * use the full frequency range, it can request decoding at a reduced
+  * rate. Likewise, the decoder is capable of filling in either mono or
+  * interleaved stereo pcm buffers, at the caller's request.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusDecoder *opus_decoder_create(
+    opus_int32 Fs,
+    int channels,
+    int *error
+);
+
+/** Initializes a previously allocated decoder state.
+  * The state must be at least the size returned by opus_decoder_get_size().
+  * This is intended for applications which use their own allocator instead of malloc. @see opus_decoder_create,opus_decoder_get_size
+  * To reset a previously initialized state, use the #OPUS_RESET_STATE CTL.
+  * @param [in] st <tt>OpusDecoder*</tt>: Decoder state.
+  * @param [in] Fs <tt>opus_int32</tt>: Sampling rate to decode to (Hz).
+  *                                     This must be one of 8000, 12000, 16000,
+  *                                     24000, or 48000.
+  * @param [in] channels <tt>int</tt>: Number of channels (1 or 2) to decode
+  * @retval #OPUS_OK Success or @ref opus_errorcodes
+  */
+OPUS_EXPORT int opus_decoder_init(
+    OpusDecoder *st,
+    opus_int32 Fs,
+    int channels
+) OPUS_ARG_NONNULL(1);
+
+/** Decode an Opus packet.
+  * @param [in] st <tt>OpusDecoder*</tt>: Decoder state
+  * @param [in] data <tt>char*</tt>: Input payload. Use a NULL pointer to indicate packet loss
+  * @param [in] len <tt>opus_int32</tt>: Number of bytes in payload*
+  * @param [out] pcm <tt>opus_int16*</tt>: Output signal (interleaved if 2 channels). length
+  *  is frame_size*channels*sizeof(opus_int16)
+  * @param [in] frame_size Number of samples per channel of available space in \a pcm.
+  *  If this is less than the maximum packet duration (120ms; 5760 for 48kHz), this function will
+  *  not be capable of decoding some packets. In the case of PLC (data==NULL) or FEC (decode_fec=1),
+  *  then frame_size needs to be exactly the duration of audio that is missing, otherwise the
+  *  decoder will not be in the optimal state to decode the next incoming packet. For the PLC and
+  *  FEC cases, frame_size <b>must</b> be a multiple of 2.5 ms.
+  * @param [in] decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band forward error correction data be
+  *  decoded. If no such data is available, the frame is decoded as if it were lost.
+  * @returns Number of decoded samples or @ref opus_errorcodes
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_decode(
+    OpusDecoder *st,
+    const unsigned char *data,
+    opus_int32 len,
+    opus_int16 *pcm,
+    int frame_size,
+    int decode_fec
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
+
+/** Decode an Opus packet.
+  * @param [in] st <tt>OpusDecoder*</tt>: Decoder state
+  * @param [in] data <tt>char*</tt>: Input payload. Use a NULL pointer to indicate packet loss
+  * @param [in] len <tt>opus_int32</tt>: Number of bytes in payload*
+  * @param [out] pcm <tt>opus_int32*</tt>: Output signal (interleaved if 2 channels) representing (or slightly exceeding) 24-bit values. length
+  *  is frame_size*channels*sizeof(opus_int32)
+  * @param [in] frame_size Number of samples per channel of available space in \a pcm.
+  *  If this is less than the maximum packet duration (120ms; 5760 for 48kHz), this function will
+  *  not be capable of decoding some packets. In the case of PLC (data==NULL) or FEC (decode_fec=1),
+  *  then frame_size needs to be exactly the duration of audio that is missing, otherwise the
+  *  decoder will not be in the optimal state to decode the next incoming packet. For the PLC and
+  *  FEC cases, frame_size <b>must</b> be a multiple of 2.5 ms.
+  * @param [in] decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band forward error correction data be
+  *  decoded. If no such data is available, the frame is decoded as if it were lost.
+  * @returns Number of decoded samples or @ref opus_errorcodes
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_decode24(
+    OpusDecoder *st,
+    const unsigned char *data,
+    opus_int32 len,
+    opus_int32 *pcm,
+    int frame_size,
+    int decode_fec
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
+
+/** Decode an Opus packet with floating point output.
+  * @param [in] st <tt>OpusDecoder*</tt>: Decoder state
+  * @param [in] data <tt>char*</tt>: Input payload. Use a NULL pointer to indicate packet loss
+  * @param [in] len <tt>opus_int32</tt>: Number of bytes in payload
+  * @param [out] pcm <tt>float*</tt>: Output signal (interleaved if 2 channels). length
+  *  is frame_size*channels*sizeof(float)
+  * @param [in] frame_size Number of samples per channel of available space in \a pcm.
+  *  If this is less than the maximum packet duration (120ms; 5760 for 48kHz), this function will
+  *  not be capable of decoding some packets. In the case of PLC (data==NULL) or FEC (decode_fec=1),
+  *  then frame_size needs to be exactly the duration of audio that is missing, otherwise the
+  *  decoder will not be in the optimal state to decode the next incoming packet. For the PLC and
+  *  FEC cases, frame_size <b>must</b> be a multiple of 2.5 ms.
+  * @param [in] decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band forward error correction data be
+  *  decoded. If no such data is available the frame is decoded as if it were lost.
+  * @returns Number of decoded samples or @ref opus_errorcodes
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_decode_float(
+    OpusDecoder *st,
+    const unsigned char *data,
+    opus_int32 len,
+    float *pcm,
+    int frame_size,
+    int decode_fec
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
+
+/** Perform a CTL function on an Opus decoder.
+  *
+  * Generally the request and subsequent arguments are generated
+  * by a convenience macro.
+  * @param st <tt>OpusDecoder*</tt>: Decoder state.
+  * @param request This and all remaining parameters should be replaced by one
+  *                of the convenience macros in @ref opus_genericctls or
+  *                @ref opus_decoderctls.
+  * @see opus_genericctls
+  * @see opus_decoderctls
+  */
+OPUS_EXPORT int opus_decoder_ctl(OpusDecoder *st, int request, ...) OPUS_ARG_NONNULL(1);
+
+/** Frees an <code>OpusDecoder</code> allocated by opus_decoder_create().
+  * @param[in] st <tt>OpusDecoder*</tt>: State to be freed.
+  */
+OPUS_EXPORT void opus_decoder_destroy(OpusDecoder *st);
+
+/** Gets the size of an <code>OpusDREDDecoder</code> structure.
+  * @returns The size in bytes.
+  */
+OPUS_EXPORT int opus_dred_decoder_get_size(void);
+
+/** Allocates and initializes an OpusDREDDecoder state.
+  * @param [out] error <tt>int*</tt>: #OPUS_OK Success or @ref opus_errorcodes
+  */
+OPUS_EXPORT OpusDREDDecoder *opus_dred_decoder_create(int *error);
+
+/** Initializes an <code>OpusDREDDecoder</code> state.
+  * @param[in] dec <tt>OpusDREDDecoder*</tt>: State to be initialized.
+  */
+OPUS_EXPORT int opus_dred_decoder_init(OpusDREDDecoder *dec);
+
+/** Frees an <code>OpusDREDDecoder</code> allocated by opus_dred_decoder_create().
+  * @param[in] dec <tt>OpusDREDDecoder*</tt>: State to be freed.
+  */
+OPUS_EXPORT void opus_dred_decoder_destroy(OpusDREDDecoder *dec);
+
+/** Perform a CTL function on an Opus DRED decoder.
+  *
+  * Generally the request and subsequent arguments are generated
+  * by a convenience macro.
+  * @param dred_dec <tt>OpusDREDDecoder*</tt>: DRED Decoder state.
+  * @param request This and all remaining parameters should be replaced by one
+  *                of the convenience macros in @ref opus_genericctls or
+  *                @ref opus_decoderctls.
+  * @see opus_genericctls
+  * @see opus_decoderctls
+  */
+OPUS_EXPORT int opus_dred_decoder_ctl(OpusDREDDecoder *dred_dec, int request, ...);
+
+/** Gets the size of an <code>OpusDRED</code> structure.
+  * @returns The size in bytes.
+  */
+OPUS_EXPORT int opus_dred_get_size(void);
+
+/** Allocates and initializes a DRED state.
+  * @param [out] error <tt>int*</tt>: #OPUS_OK Success or @ref opus_errorcodes
+  */
+OPUS_EXPORT OpusDRED *opus_dred_alloc(int *error);
+
+/** Frees an <code>OpusDRED</code> allocated by opus_dred_create().
+  * @param[in] dec <tt>OpusDRED*</tt>: State to be freed.
+  */
+OPUS_EXPORT void opus_dred_free(OpusDRED *dec);
+
+/** Decode an Opus DRED packet.
+  * @param [in] dred_dec <tt>OpusDRED*</tt>: DRED Decoder state
+  * @param [in] dred <tt>OpusDRED*</tt>: DRED state
+  * @param [in] data <tt>char*</tt>: Input payload
+  * @param [in] len <tt>opus_int32</tt>: Number of bytes in payload
+  * @param [in] max_dred_samples <tt>opus_int32</tt>: Maximum number of DRED samples that may be needed (if available in the packet).
+  * @param [in] sampling_rate <tt>opus_int32</tt>: Sampling rate used for max_dred_samples argument. Needs not match the actual sampling rate of the decoder.
+  * @param [out] dred_end <tt>opus_int32*</tt>: Number of non-encoded (silence) samples between the DRED timestamp and the last DRED sample.
+  * @param [in] defer_processing <tt>int</tt>: Flag (0 or 1). If set to one, the CPU-intensive part of the DRED decoding is deferred until opus_dred_process() is called.
+  * @returns Offset (positive) of the first decoded DRED samples, zero if no DRED is present, or @ref opus_errorcodes
+  */
+OPUS_EXPORT int opus_dred_parse(OpusDREDDecoder *dred_dec, OpusDRED *dred, const unsigned char *data, opus_int32 len, opus_int32 max_dred_samples, opus_int32 sampling_rate, int *dred_end, int defer_processing) OPUS_ARG_NONNULL(1);
+
+/** Finish decoding an Opus DRED packet. The function only needs to be called if opus_dred_parse() was called with defer_processing=1.
+  * The source and destination will often be the same DRED state.
+  * @param [in] dred_dec <tt>OpusDRED*</tt>: DRED Decoder state
+  * @param [in] src <tt>OpusDRED*</tt>: Source DRED state to start the processing from.
+  * @param [out] dst <tt>OpusDRED*</tt>: Destination DRED state to store the updated state after processing.
+  * @returns @ref opus_errorcodes
+  */
+OPUS_EXPORT int opus_dred_process(OpusDREDDecoder *dred_dec, const OpusDRED *src, OpusDRED *dst);
+
+/** Decode audio from an Opus DRED packet with 16-bit output.
+  * @param [in] st <tt>OpusDecoder*</tt>: Decoder state
+  * @param [in] dred <tt>OpusDRED*</tt>: DRED state
+  * @param [in] dred_offset <tt>opus_int32</tt>: position of the redundancy to decode (in samples before the beginning of the real audio data in the packet).
+  * @param [out] pcm <tt>opus_int16*</tt>: Output signal (interleaved if 2 channels). length
+  *  is frame_size*channels*sizeof(opus_int16)
+  * @param [in] frame_size Number of samples per channel to decode in \a pcm.
+  *  frame_size <b>must</b> be a multiple of 2.5 ms.
+  * @returns Number of decoded samples or @ref opus_errorcodes
+  */
+OPUS_EXPORT int opus_decoder_dred_decode(OpusDecoder *st, const OpusDRED *dred, opus_int32 dred_offset, opus_int16 *pcm, opus_int32 frame_size);
+
+/** Decode audio from an Opus DRED packet with 24-bit output.
+  * @param [in] st <tt>OpusDecoder*</tt>: Decoder state
+  * @param [in] dred <tt>OpusDRED*</tt>: DRED state
+  * @param [in] dred_offset <tt>opus_int32</tt>: position of the redundancy to decode (in samples before the beginning of the real audio data in the packet).
+  * @param [out] pcm <tt>opus_int32*</tt>: Output signal (interleaved if 2 channels). length
+  *  is frame_size*channels*sizeof(opus_int16)
+  * @param [in] frame_size Number of samples per channel to decode in \a pcm.
+  *  frame_size <b>must</b> be a multiple of 2.5 ms.
+  * @returns Number of decoded samples or @ref opus_errorcodes
+  */
+OPUS_EXPORT int opus_decoder_dred_decode24(OpusDecoder *st, const OpusDRED *dred, opus_int32 dred_offset, opus_int32 *pcm, opus_int32 frame_size);
+
+/** Decode audio from an Opus DRED packet with floating point output.
+  * @param [in] st <tt>OpusDecoder*</tt>: Decoder state
+  * @param [in] dred <tt>OpusDRED*</tt>: DRED state
+  * @param [in] dred_offset <tt>opus_int32</tt>: position of the redundancy to decode (in samples before the beginning of the real audio data in the packet).
+  * @param [out] pcm <tt>float*</tt>: Output signal (interleaved if 2 channels). length
+  *  is frame_size*channels*sizeof(float)
+  * @param [in] frame_size Number of samples per channel to decode in \a pcm.
+  *  frame_size <b>must</b> be a multiple of 2.5 ms.
+  * @returns Number of decoded samples or @ref opus_errorcodes
+  */
+OPUS_EXPORT int opus_decoder_dred_decode_float(OpusDecoder *st, const OpusDRED *dred, opus_int32 dred_offset, float *pcm, opus_int32 frame_size);
+
+
+/** Parse an opus packet into one or more frames.
+  * Opus_decode will perform this operation internally so most applications do
+  * not need to use this function.
+  * This function does not copy the frames, the returned pointers are pointers into
+  * the input packet.
+  * @param [in] data <tt>char*</tt>: Opus packet to be parsed
+  * @param [in] len <tt>opus_int32</tt>: size of data
+  * @param [out] out_toc <tt>char*</tt>: TOC pointer
+  * @param [out] frames <tt>char*[48]</tt> encapsulated frames
+  * @param [out] size <tt>opus_int16[48]</tt> sizes of the encapsulated frames
+  * @param [out] payload_offset <tt>int*</tt>: returns the position of the payload within the packet (in bytes)
+  * @returns number of frames
+  */
+OPUS_EXPORT int opus_packet_parse(
+   const unsigned char *data,
+   opus_int32 len,
+   unsigned char *out_toc,
+   const unsigned char *frames[48],
+   opus_int16 size[48],
+   int *payload_offset
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(5);
+
+/** Gets the bandwidth of an Opus packet.
+  * @param [in] data <tt>char*</tt>: Opus packet
+  * @retval OPUS_BANDWIDTH_NARROWBAND Narrowband (4kHz bandpass)
+  * @retval OPUS_BANDWIDTH_MEDIUMBAND Mediumband (6kHz bandpass)
+  * @retval OPUS_BANDWIDTH_WIDEBAND Wideband (8kHz bandpass)
+  * @retval OPUS_BANDWIDTH_SUPERWIDEBAND Superwideband (12kHz bandpass)
+  * @retval OPUS_BANDWIDTH_FULLBAND Fullband (20kHz bandpass)
+  * @retval OPUS_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_packet_get_bandwidth(const unsigned char *data) OPUS_ARG_NONNULL(1);
+
+/** Gets the number of samples per frame from an Opus packet.
+  * @param [in] data <tt>char*</tt>: Opus packet.
+  *                                  This must contain at least one byte of
+  *                                  data.
+  * @param [in] Fs <tt>opus_int32</tt>: Sampling rate in Hz.
+  *                                     This must be a multiple of 400, or
+  *                                     inaccurate results will be returned.
+  * @returns Number of samples per frame.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_packet_get_samples_per_frame(const unsigned char *data, opus_int32 Fs) OPUS_ARG_NONNULL(1);
+
+/** Gets the number of channels from an Opus packet.
+  * @param [in] data <tt>char*</tt>: Opus packet
+  * @returns Number of channels
+  * @retval OPUS_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_packet_get_nb_channels(const unsigned char *data) OPUS_ARG_NONNULL(1);
+
+/** Gets the number of frames in an Opus packet.
+  * @param [in] packet <tt>char*</tt>: Opus packet
+  * @param [in] len <tt>opus_int32</tt>: Length of packet
+  * @returns Number of frames
+  * @retval OPUS_BAD_ARG Insufficient data was passed to the function
+  * @retval OPUS_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_packet_get_nb_frames(const unsigned char packet[], opus_int32 len) OPUS_ARG_NONNULL(1);
+
+/** Gets the number of samples of an Opus packet.
+  * @param [in] packet <tt>char*</tt>: Opus packet
+  * @param [in] len <tt>opus_int32</tt>: Length of packet
+  * @param [in] Fs <tt>opus_int32</tt>: Sampling rate in Hz.
+  *                                     This must be a multiple of 400, or
+  *                                     inaccurate results will be returned.
+  * @returns Number of samples
+  * @retval OPUS_BAD_ARG Insufficient data was passed to the function
+  * @retval OPUS_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_packet_get_nb_samples(const unsigned char packet[], opus_int32 len, opus_int32 Fs) OPUS_ARG_NONNULL(1);
+
+/** Checks whether an Opus packet has LBRR.
+  * @param [in] packet <tt>char*</tt>: Opus packet
+  * @param [in] len <tt>opus_int32</tt>: Length of packet
+  * @returns 1 is LBRR is present, 0 otherwise
+  * @retval OPUS_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_packet_has_lbrr(const unsigned char packet[], opus_int32 len);
+
+/** Gets the number of samples of an Opus packet.
+  * @param [in] dec <tt>OpusDecoder*</tt>: Decoder state
+  * @param [in] packet <tt>char*</tt>: Opus packet
+  * @param [in] len <tt>opus_int32</tt>: Length of packet
+  * @returns Number of samples
+  * @retval OPUS_BAD_ARG Insufficient data was passed to the function
+  * @retval OPUS_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_decoder_get_nb_samples(const OpusDecoder *dec, const unsigned char packet[], opus_int32 len) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2);
+
+/** Applies soft-clipping to bring a float signal within the [-1,1] range. If
+  * the signal is already in that range, nothing is done. If there are values
+  * outside of [-1,1], then the signal is clipped as smoothly as possible to
+  * both fit in the range and avoid creating excessive distortion in the
+  * process.
+  * @param [in,out] pcm <tt>float*</tt>: Input PCM and modified PCM
+  * @param [in] frame_size <tt>int</tt> Number of samples per channel to process
+  * @param [in] channels <tt>int</tt>: Number of channels
+  * @param [in,out] softclip_mem <tt>float*</tt>: State memory for the soft clipping process (one float per channel, initialized to zero)
+  */
+OPUS_EXPORT void opus_pcm_soft_clip(float *pcm, int frame_size, int channels, float *softclip_mem);
+
+
+/**@}*/
+
+/** @defgroup opus_repacketizer Repacketizer
+  * @{
+  *
+  * The repacketizer can be used to merge multiple Opus packets into a single
+  * packet or alternatively to split Opus packets that have previously been
+  * merged. Splitting valid Opus packets is always guaranteed to succeed,
+  * whereas merging valid packets only succeeds if all frames have the same
+  * mode, bandwidth, and frame size, and when the total duration of the merged
+  * packet is no more than 120 ms. The 120 ms limit comes from the
+  * specification and limits decoder memory requirements at a point where
+  * framing overhead becomes negligible.
+  *
+  * The repacketizer currently only operates on elementary Opus
+  * streams. It will not manipualte multistream packets successfully, except in
+  * the degenerate case where they consist of data from a single stream.
+  *
+  * The repacketizing process starts with creating a repacketizer state, either
+  * by calling opus_repacketizer_create() or by allocating the memory yourself,
+  * e.g.,
+  * @code
+  * OpusRepacketizer *rp;
+  * rp = (OpusRepacketizer*)malloc(opus_repacketizer_get_size());
+  * if (rp != NULL)
+  *     opus_repacketizer_init(rp);
+  * @endcode
+  *
+  * Then the application should submit packets with opus_repacketizer_cat(),
+  * extract new packets with opus_repacketizer_out() or
+  * opus_repacketizer_out_range(), and then reset the state for the next set of
+  * input packets via opus_repacketizer_init().
+  *
+  * For example, to split a sequence of packets into individual frames:
+  * @code
+  * unsigned char *data;
+  * int len;
+  * while (get_next_packet(&data, &len))
+  * {
+  *   unsigned char out[1276];
+  *   opus_int32 out_len;
+  *   int nb_frames;
+  *   int err;
+  *   int i;
+  *   err = opus_repacketizer_cat(rp, data, len);
+  *   if (err != OPUS_OK)
+  *   {
+  *     release_packet(data);
+  *     return err;
+  *   }
+  *   nb_frames = opus_repacketizer_get_nb_frames(rp);
+  *   for (i = 0; i < nb_frames; i++)
+  *   {
+  *     out_len = opus_repacketizer_out_range(rp, i, i+1, out, sizeof(out));
+  *     if (out_len < 0)
+  *     {
+  *        release_packet(data);
+  *        return (int)out_len;
+  *     }
+  *     output_next_packet(out, out_len);
+  *   }
+  *   opus_repacketizer_init(rp);
+  *   release_packet(data);
+  * }
+  * @endcode
+  *
+  * Alternatively, to combine a sequence of frames into packets that each
+  * contain up to <code>TARGET_DURATION_MS</code> milliseconds of data:
+  * @code
+  * // The maximum number of packets with duration TARGET_DURATION_MS occurs
+  * // when the frame size is 2.5 ms, for a total of (TARGET_DURATION_MS*2/5)
+  * // packets.
+  * unsigned char *data[(TARGET_DURATION_MS*2/5)+1];
+  * opus_int32 len[(TARGET_DURATION_MS*2/5)+1];
+  * int nb_packets;
+  * unsigned char out[1277*(TARGET_DURATION_MS*2/2)];
+  * opus_int32 out_len;
+  * int prev_toc;
+  * nb_packets = 0;
+  * while (get_next_packet(data+nb_packets, len+nb_packets))
+  * {
+  *   int nb_frames;
+  *   int err;
+  *   nb_frames = opus_packet_get_nb_frames(data[nb_packets], len[nb_packets]);
+  *   if (nb_frames < 1)
+  *   {
+  *     release_packets(data, nb_packets+1);
+  *     return nb_frames;
+  *   }
+  *   nb_frames += opus_repacketizer_get_nb_frames(rp);
+  *   // If adding the next packet would exceed our target, or it has an
+  *   // incompatible TOC sequence, output the packets we already have before
+  *   // submitting it.
+  *   // N.B., The nb_packets > 0 check ensures we've submitted at least one
+  *   // packet since the last call to opus_repacketizer_init(). Otherwise a
+  *   // single packet longer than TARGET_DURATION_MS would cause us to try to
+  *   // output an (invalid) empty packet. It also ensures that prev_toc has
+  *   // been set to a valid value. Additionally, len[nb_packets] > 0 is
+  *   // guaranteed by the call to opus_packet_get_nb_frames() above, so the
+  *   // reference to data[nb_packets][0] should be valid.
+  *   if (nb_packets > 0 && (
+  *       ((prev_toc & 0xFC) != (data[nb_packets][0] & 0xFC)) ||
+  *       opus_packet_get_samples_per_frame(data[nb_packets], 48000)*nb_frames >
+  *       TARGET_DURATION_MS*48))
+  *   {
+  *     out_len = opus_repacketizer_out(rp, out, sizeof(out));
+  *     if (out_len < 0)
+  *     {
+  *        release_packets(data, nb_packets+1);
+  *        return (int)out_len;
+  *     }
+  *     output_next_packet(out, out_len);
+  *     opus_repacketizer_init(rp);
+  *     release_packets(data, nb_packets);
+  *     data[0] = data[nb_packets];
+  *     len[0] = len[nb_packets];
+  *     nb_packets = 0;
+  *   }
+  *   err = opus_repacketizer_cat(rp, data[nb_packets], len[nb_packets]);
+  *   if (err != OPUS_OK)
+  *   {
+  *     release_packets(data, nb_packets+1);
+  *     return err;
+  *   }
+  *   prev_toc = data[nb_packets][0];
+  *   nb_packets++;
+  * }
+  * // Output the final, partial packet.
+  * if (nb_packets > 0)
+  * {
+  *   out_len = opus_repacketizer_out(rp, out, sizeof(out));
+  *   release_packets(data, nb_packets);
+  *   if (out_len < 0)
+  *     return (int)out_len;
+  *   output_next_packet(out, out_len);
+  * }
+  * @endcode
+  *
+  * An alternate way of merging packets is to simply call opus_repacketizer_cat()
+  * unconditionally until it fails. At that point, the merged packet can be
+  * obtained with opus_repacketizer_out() and the input packet for which
+  * opus_repacketizer_cat() needs to be re-added to a newly reinitialized
+  * repacketizer state.
+  */
+
+typedef struct OpusRepacketizer OpusRepacketizer;
+
+/** Gets the size of an <code>OpusRepacketizer</code> structure.
+  * @returns The size in bytes.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_repacketizer_get_size(void);
+
+/** (Re)initializes a previously allocated repacketizer state.
+  * The state must be at least the size returned by opus_repacketizer_get_size().
+  * This can be used for applications which use their own allocator instead of
+  * malloc().
+  * It must also be called to reset the queue of packets waiting to be
+  * repacketized, which is necessary if the maximum packet duration of 120 ms
+  * is reached or if you wish to submit packets with a different Opus
+  * configuration (coding mode, audio bandwidth, frame size, or channel count).
+  * Failure to do so will prevent a new packet from being added with
+  * opus_repacketizer_cat().
+  * @see opus_repacketizer_create
+  * @see opus_repacketizer_get_size
+  * @see opus_repacketizer_cat
+  * @param rp <tt>OpusRepacketizer*</tt>: The repacketizer state to
+  *                                       (re)initialize.
+  * @returns A pointer to the same repacketizer state that was passed in.
+  */
+OPUS_EXPORT OpusRepacketizer *opus_repacketizer_init(OpusRepacketizer *rp) OPUS_ARG_NONNULL(1);
+
+/** Allocates memory and initializes the new repacketizer with
+ * opus_repacketizer_init().
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusRepacketizer *opus_repacketizer_create(void);
+
+/** Frees an <code>OpusRepacketizer</code> allocated by
+  * opus_repacketizer_create().
+  * @param[in] rp <tt>OpusRepacketizer*</tt>: State to be freed.
+  */
+OPUS_EXPORT void opus_repacketizer_destroy(OpusRepacketizer *rp);
+
+/** Add a packet to the current repacketizer state.
+  * This packet must match the configuration of any packets already submitted
+  * for repacketization since the last call to opus_repacketizer_init().
+  * This means that it must have the same coding mode, audio bandwidth, frame
+  * size, and channel count.
+  * This can be checked in advance by examining the top 6 bits of the first
+  * byte of the packet, and ensuring they match the top 6 bits of the first
+  * byte of any previously submitted packet.
+  * The total duration of audio in the repacketizer state also must not exceed
+  * 120 ms, the maximum duration of a single packet, after adding this packet.
+  *
+  * The contents of the current repacketizer state can be extracted into new
+  * packets using opus_repacketizer_out() or opus_repacketizer_out_range().
+  *
+  * In order to add a packet with a different configuration or to add more
+  * audio beyond 120 ms, you must clear the repacketizer state by calling
+  * opus_repacketizer_init().
+  * If a packet is too large to add to the current repacketizer state, no part
+  * of it is added, even if it contains multiple frames, some of which might
+  * fit.
+  * If you wish to be able to add parts of such packets, you should first use
+  * another repacketizer to split the packet into pieces and add them
+  * individually.
+  * @see opus_repacketizer_out_range
+  * @see opus_repacketizer_out
+  * @see opus_repacketizer_init
+  * @param rp <tt>OpusRepacketizer*</tt>: The repacketizer state to which to
+  *                                       add the packet.
+  * @param[in] data <tt>const unsigned char*</tt>: The packet data.
+  *                                                The application must ensure
+  *                                                this pointer remains valid
+  *                                                until the next call to
+  *                                                opus_repacketizer_init() or
+  *                                                opus_repacketizer_destroy().
+  * @param len <tt>opus_int32</tt>: The number of bytes in the packet data.
+  * @returns An error code indicating whether or not the operation succeeded.
+  * @retval #OPUS_OK The packet's contents have been added to the repacketizer
+  *                  state.
+  * @retval #OPUS_INVALID_PACKET The packet did not have a valid TOC sequence,
+  *                              the packet's TOC sequence was not compatible
+  *                              with previously submitted packets (because
+  *                              the coding mode, audio bandwidth, frame size,
+  *                              or channel count did not match), or adding
+  *                              this packet would increase the total amount of
+  *                              audio stored in the repacketizer state to more
+  *                              than 120 ms.
+  */
+OPUS_EXPORT int opus_repacketizer_cat(OpusRepacketizer *rp, const unsigned char *data, opus_int32 len) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2);
+
+
+/** Construct a new packet from data previously submitted to the repacketizer
+  * state via opus_repacketizer_cat().
+  * @param rp <tt>OpusRepacketizer*</tt>: The repacketizer state from which to
+  *                                       construct the new packet.
+  * @param begin <tt>int</tt>: The index of the first frame in the current
+  *                            repacketizer state to include in the output.
+  * @param end <tt>int</tt>: One past the index of the last frame in the
+  *                          current repacketizer state to include in the
+  *                          output.
+  * @param[out] data <tt>const unsigned char*</tt>: The buffer in which to
+  *                                                 store the output packet.
+  * @param maxlen <tt>opus_int32</tt>: The maximum number of bytes to store in
+  *                                    the output buffer. In order to guarantee
+  *                                    success, this should be at least
+  *                                    <code>1276</code> for a single frame,
+  *                                    or for multiple frames,
+  *                                    <code>1277*(end-begin)</code>.
+  *                                    However, <code>1*(end-begin)</code> plus
+  *                                    the size of all packet data submitted to
+  *                                    the repacketizer since the last call to
+  *                                    opus_repacketizer_init() or
+  *                                    opus_repacketizer_create() is also
+  *                                    sufficient, and possibly much smaller.
+  * @returns The total size of the output packet on success, or an error code
+  *          on failure.
+  * @retval #OPUS_BAD_ARG <code>[begin,end)</code> was an invalid range of
+  *                       frames (begin < 0, begin >= end, or end >
+  *                       opus_repacketizer_get_nb_frames()).
+  * @retval #OPUS_BUFFER_TOO_SMALL \a maxlen was insufficient to contain the
+  *                                complete output packet.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_repacketizer_out_range(OpusRepacketizer *rp, int begin, int end, unsigned char *data, opus_int32 maxlen) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
+
+/** Return the total number of frames contained in packet data submitted to
+  * the repacketizer state so far via opus_repacketizer_cat() since the last
+  * call to opus_repacketizer_init() or opus_repacketizer_create().
+  * This defines the valid range of packets that can be extracted with
+  * opus_repacketizer_out_range() or opus_repacketizer_out().
+  * @param rp <tt>OpusRepacketizer*</tt>: The repacketizer state containing the
+  *                                       frames.
+  * @returns The total number of frames contained in the packet data submitted
+  *          to the repacketizer state.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_repacketizer_get_nb_frames(OpusRepacketizer *rp) OPUS_ARG_NONNULL(1);
+
+/** Construct a new packet from data previously submitted to the repacketizer
+  * state via opus_repacketizer_cat().
+  * This is a convenience routine that returns all the data submitted so far
+  * in a single packet.
+  * It is equivalent to calling
+  * @code
+  * opus_repacketizer_out_range(rp, 0, opus_repacketizer_get_nb_frames(rp),
+  *                             data, maxlen)
+  * @endcode
+  * @param rp <tt>OpusRepacketizer*</tt>: The repacketizer state from which to
+  *                                       construct the new packet.
+  * @param[out] data <tt>const unsigned char*</tt>: The buffer in which to
+  *                                                 store the output packet.
+  * @param maxlen <tt>opus_int32</tt>: The maximum number of bytes to store in
+  *                                    the output buffer. In order to guarantee
+  *                                    success, this should be at least
+  *                                    <code>1277*opus_repacketizer_get_nb_frames(rp)</code>.
+  *                                    However,
+  *                                    <code>1*opus_repacketizer_get_nb_frames(rp)</code>
+  *                                    plus the size of all packet data
+  *                                    submitted to the repacketizer since the
+  *                                    last call to opus_repacketizer_init() or
+  *                                    opus_repacketizer_create() is also
+  *                                    sufficient, and possibly much smaller.
+  * @returns The total size of the output packet on success, or an error code
+  *          on failure.
+  * @retval #OPUS_BUFFER_TOO_SMALL \a maxlen was insufficient to contain the
+  *                                complete output packet.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_repacketizer_out(OpusRepacketizer *rp, unsigned char *data, opus_int32 maxlen) OPUS_ARG_NONNULL(1);
+
+/** Pads a given Opus packet to a larger size (possibly changing the TOC sequence).
+  * @param[in,out] data <tt>const unsigned char*</tt>: The buffer containing the
+  *                                                   packet to pad.
+  * @param len <tt>opus_int32</tt>: The size of the packet.
+  *                                 This must be at least 1.
+  * @param new_len <tt>opus_int32</tt>: The desired size of the packet after padding.
+  *                                 This must be at least as large as len.
+  * @returns an error code
+  * @retval #OPUS_OK \a on success.
+  * @retval #OPUS_BAD_ARG \a len was less than 1 or new_len was less than len.
+  * @retval #OPUS_INVALID_PACKET \a data did not contain a valid Opus packet.
+  */
+OPUS_EXPORT int opus_packet_pad(unsigned char *data, opus_int32 len, opus_int32 new_len);
+
+/** Remove all padding from a given Opus packet and rewrite the TOC sequence to
+  * minimize space usage.
+  * @param[in,out] data <tt>const unsigned char*</tt>: The buffer containing the
+  *                                                   packet to strip.
+  * @param len <tt>opus_int32</tt>: The size of the packet.
+  *                                 This must be at least 1.
+  * @returns The new size of the output packet on success, or an error code
+  *          on failure.
+  * @retval #OPUS_BAD_ARG \a len was less than 1.
+  * @retval #OPUS_INVALID_PACKET \a data did not contain a valid Opus packet.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_packet_unpad(unsigned char *data, opus_int32 len);
+
+/** Pads a given Opus multi-stream packet to a larger size (possibly changing the TOC sequence).
+  * @param[in,out] data <tt>const unsigned char*</tt>: The buffer containing the
+  *                                                   packet to pad.
+  * @param len <tt>opus_int32</tt>: The size of the packet.
+  *                                 This must be at least 1.
+  * @param new_len <tt>opus_int32</tt>: The desired size of the packet after padding.
+  *                                 This must be at least 1.
+  * @param nb_streams <tt>opus_int32</tt>: The number of streams (not channels) in the packet.
+  *                                 This must be at least as large as len.
+  * @returns an error code
+  * @retval #OPUS_OK \a on success.
+  * @retval #OPUS_BAD_ARG \a len was less than 1.
+  * @retval #OPUS_INVALID_PACKET \a data did not contain a valid Opus packet.
+  */
+OPUS_EXPORT int opus_multistream_packet_pad(unsigned char *data, opus_int32 len, opus_int32 new_len, int nb_streams);
+
+/** Remove all padding from a given Opus multi-stream packet and rewrite the TOC sequence to
+  * minimize space usage.
+  * @param[in,out] data <tt>const unsigned char*</tt>: The buffer containing the
+  *                                                   packet to strip.
+  * @param len <tt>opus_int32</tt>: The size of the packet.
+  *                                 This must be at least 1.
+  * @param nb_streams <tt>opus_int32</tt>: The number of streams (not channels) in the packet.
+  *                                 This must be at least 1.
+  * @returns The new size of the output packet on success, or an error code
+  *          on failure.
+  * @retval #OPUS_BAD_ARG \a len was less than 1 or new_len was less than len.
+  * @retval #OPUS_INVALID_PACKET \a data did not contain a valid Opus packet.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_multistream_packet_unpad(unsigned char *data, opus_int32 len, int nb_streams);
+
+/**@}*/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* OPUS_H */
diff --git a/sdk/include/opus/opus_custom.h b/sdk/include/opus/opus_custom.h
new file mode 100644
index 00000000000..9464377cdc8
--- /dev/null
+++ b/sdk/include/opus/opus_custom.h
@@ -0,0 +1,381 @@
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Copyright (c) 2008-2012 Gregory Maxwell
+   Written by Jean-Marc Valin and Gregory Maxwell */
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/**
+  @file opus_custom.h
+  @brief Opus-Custom reference implementation API
+ */
+
+#ifndef OPUS_CUSTOM_H
+#define OPUS_CUSTOM_H
+
+#include "opus_defines.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef CUSTOM_MODES
+# define OPUS_CUSTOM_EXPORT OPUS_EXPORT
+# define OPUS_CUSTOM_EXPORT_STATIC OPUS_EXPORT
+#else
+# define OPUS_CUSTOM_EXPORT
+# ifdef OPUS_BUILD
+#  define OPUS_CUSTOM_EXPORT_STATIC static OPUS_INLINE
+# else
+#  define OPUS_CUSTOM_EXPORT_STATIC
+# endif
+#endif
+
+/** @defgroup opus_custom Opus Custom
+  * @{
+  *  Opus Custom is an optional part of the Opus specification and
+  * reference implementation which uses a distinct API from the regular
+  * API and supports frame sizes that are not normally supported.\ Use
+  * of Opus Custom is discouraged for all but very special applications
+  * for which a frame size different from 2.5, 5, 10, or 20 ms is needed
+  * (for either complexity or latency reasons) and where interoperability
+  * is less important.
+  *
+  * In addition to the interoperability limitations the use of Opus custom
+  * disables a substantial chunk of the codec and generally lowers the
+  * quality available at a given bitrate. Normally when an application needs
+  * a different frame size from the codec it should buffer to match the
+  * sizes but this adds a small amount of delay which may be important
+  * in some very low latency applications. Some transports (especially
+  * constant rate RF transports) may also work best with frames of
+  * particular durations.
+  *
+  * Libopus only supports custom modes if they are enabled at compile time.
+  *
+  * The Opus Custom API is similar to the regular API but the
+  * @ref opus_encoder_create and @ref opus_decoder_create calls take
+  * an additional mode parameter which is a structure produced by
+  * a call to @ref opus_custom_mode_create. Both the encoder and decoder
+  * must create a mode using the same sample rate (fs) and frame size
+  * (frame size) so these parameters must either be signaled out of band
+  * or fixed in a particular implementation.
+  *
+  * Similar to regular Opus the custom modes support on the fly frame size
+  * switching, but the sizes available depend on the particular frame size in
+  * use. For some initial frame sizes on a single on the fly size is available.
+  */
+
+/** Contains the state of an encoder. One encoder state is needed
+    for each stream. It is initialized once at the beginning of the
+    stream. Do *not* re-initialize the state for every frame.
+   @brief Encoder state
+ */
+typedef struct OpusCustomEncoder OpusCustomEncoder;
+
+/** State of the decoder. One decoder state is needed for each stream.
+    It is initialized once at the beginning of the stream. Do *not*
+    re-initialize the state for every frame.
+   @brief Decoder state
+ */
+typedef struct OpusCustomDecoder OpusCustomDecoder;
+
+/** The mode contains all the information necessary to create an
+    encoder. Both the encoder and decoder need to be initialized
+    with exactly the same mode, otherwise the output will be
+    corrupted. The mode MUST NOT BE DESTROYED until the encoders and
+    decoders that use it are destroyed as well.
+   @brief Mode configuration
+ */
+typedef struct OpusCustomMode OpusCustomMode;
+
+/** Creates a new mode struct. This will be passed to an encoder or
+  * decoder. The mode MUST NOT BE DESTROYED until the encoders and
+  * decoders that use it are destroyed as well.
+  * @param [in] Fs <tt>int</tt>: Sampling rate (8000 to 96000 Hz)
+  * @param [in] frame_size <tt>int</tt>: Number of samples (per channel) to encode in each
+  *        packet (64 - 1024, prime factorization must contain zero or more 2s, 3s, or 5s and no other primes)
+  * @param [out] error <tt>int*</tt>: Returned error code (if NULL, no error will be returned)
+  * @return A newly created mode
+  */
+OPUS_CUSTOM_EXPORT OPUS_WARN_UNUSED_RESULT OpusCustomMode *opus_custom_mode_create(opus_int32 Fs, int frame_size, int *error);
+
+/** Destroys a mode struct. Only call this after all encoders and
+  * decoders using this mode are destroyed as well.
+  * @param [in] mode <tt>OpusCustomMode*</tt>: Mode to be freed.
+  */
+OPUS_CUSTOM_EXPORT void opus_custom_mode_destroy(OpusCustomMode *mode);
+
+
+#if !defined(OPUS_BUILD) || defined(CELT_ENCODER_C)
+
+/* Encoder */
+/** Gets the size of an OpusCustomEncoder structure.
+  * @param [in] mode <tt>OpusCustomMode *</tt>: Mode configuration
+  * @param [in] channels <tt>int</tt>: Number of channels
+  * @returns size
+  */
+OPUS_CUSTOM_EXPORT_STATIC OPUS_WARN_UNUSED_RESULT int opus_custom_encoder_get_size(
+    const OpusCustomMode *mode,
+    int channels
+) OPUS_ARG_NONNULL(1);
+
+# ifdef CUSTOM_MODES
+/** Initializes a previously allocated encoder state
+  * The memory pointed to by st must be the size returned by opus_custom_encoder_get_size.
+  * This is intended for applications which use their own allocator instead of malloc.
+  * @see opus_custom_encoder_create(),opus_custom_encoder_get_size()
+  * To reset a previously initialized state use the OPUS_RESET_STATE CTL.
+  * @param [in] st <tt>OpusCustomEncoder*</tt>: Encoder state
+  * @param [in] mode <tt>OpusCustomMode *</tt>: Contains all the information about the characteristics of
+  *  the stream (must be the same characteristics as used for the
+  *  decoder)
+  * @param [in] channels <tt>int</tt>: Number of channels
+  * @return OPUS_OK Success or @ref opus_errorcodes
+  */
+OPUS_CUSTOM_EXPORT int opus_custom_encoder_init(
+    OpusCustomEncoder *st,
+    const OpusCustomMode *mode,
+    int channels
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2);
+# endif
+#endif
+
+
+/** Creates a new encoder state. Each stream needs its own encoder
+  * state (can't be shared across simultaneous streams).
+  * @param [in] mode <tt>OpusCustomMode*</tt>: Contains all the information about the characteristics of
+  *  the stream (must be the same characteristics as used for the
+  *  decoder)
+  * @param [in] channels <tt>int</tt>: Number of channels
+  * @param [out] error <tt>int*</tt>: Returns an error code
+  * @return Newly created encoder state.
+*/
+OPUS_CUSTOM_EXPORT OPUS_WARN_UNUSED_RESULT OpusCustomEncoder *opus_custom_encoder_create(
+    const OpusCustomMode *mode,
+    int channels,
+    int *error
+) OPUS_ARG_NONNULL(1);
+
+
+/** Destroys an encoder state.
+  * @param[in] st <tt>OpusCustomEncoder*</tt>: State to be freed.
+  */
+OPUS_CUSTOM_EXPORT void opus_custom_encoder_destroy(OpusCustomEncoder *st);
+
+/** Encodes a frame of audio.
+  * @param [in] st <tt>OpusCustomEncoder*</tt>: Encoder state
+  * @param [in] pcm <tt>float*</tt>: PCM audio in float format, with a normal range of +/-1.0.
+  *          Samples with a range beyond +/-1.0 are supported but will
+  *          be clipped by decoders using the integer API and should
+  *          only be used if it is known that the far end supports
+  *          extended dynamic range. There must be exactly
+  *          frame_size samples per channel.
+  * @param [in] frame_size <tt>int</tt>: Number of samples per frame of input signal
+  * @param [out] compressed <tt>char *</tt>: The compressed data is written here. This may not alias pcm and must be at least maxCompressedBytes long.
+  * @param [in] maxCompressedBytes <tt>int</tt>: Maximum number of bytes to use for compressing the frame
+  *          (can change from one frame to another)
+  * @return Number of bytes written to "compressed".
+  *       If negative, an error has occurred (see error codes). It is IMPORTANT that
+  *       the length returned be somehow transmitted to the decoder. Otherwise, no
+  *       decoding is possible.
+  */
+OPUS_CUSTOM_EXPORT OPUS_WARN_UNUSED_RESULT int opus_custom_encode_float(
+    OpusCustomEncoder *st,
+    const float *pcm,
+    int frame_size,
+    unsigned char *compressed,
+    int maxCompressedBytes
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
+
+/** Encodes a frame of audio.
+  * @param [in] st <tt>OpusCustomEncoder*</tt>: Encoder state
+  * @param [in] pcm <tt>opus_int16*</tt>: PCM audio in signed 16-bit format (native endian).
+  *          There must be exactly frame_size samples per channel.
+  * @param [in] frame_size <tt>int</tt>: Number of samples per frame of input signal
+  * @param [out] compressed <tt>char *</tt>: The compressed data is written here. This may not alias pcm and must be at least maxCompressedBytes long.
+  * @param [in] maxCompressedBytes <tt>int</tt>: Maximum number of bytes to use for compressing the frame
+  *          (can change from one frame to another)
+  * @return Number of bytes written to "compressed".
+  *       If negative, an error has occurred (see error codes). It is IMPORTANT that
+  *       the length returned be somehow transmitted to the decoder. Otherwise, no
+  *       decoding is possible.
+ */
+OPUS_CUSTOM_EXPORT OPUS_WARN_UNUSED_RESULT int opus_custom_encode(
+    OpusCustomEncoder *st,
+    const opus_int16 *pcm,
+    int frame_size,
+    unsigned char *compressed,
+    int maxCompressedBytes
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
+
+/** Encodes a frame of audio.
+  * @param [in] st <tt>OpusCustomEncoder*</tt>: Encoder state
+  * @param [in] pcm <tt>opus_int32*</tt>: PCM audio in signed 32-bit format (native endian) representing (or slightly exceeding) 24-bit values.
+  *          There must be exactly frame_size samples per channel.
+  * @param [in] frame_size <tt>int</tt>: Number of samples per frame of input signal
+  * @param [out] compressed <tt>char *</tt>: The compressed data is written here. This may not alias pcm and must be at least maxCompressedBytes long.
+  * @param [in] maxCompressedBytes <tt>int</tt>: Maximum number of bytes to use for compressing the frame
+  *          (can change from one frame to another)
+  * @return Number of bytes written to "compressed".
+  *       If negative, an error has occurred (see error codes). It is IMPORTANT that
+  *       the length returned be somehow transmitted to the decoder. Otherwise, no
+  *       decoding is possible.
+ */
+OPUS_CUSTOM_EXPORT OPUS_WARN_UNUSED_RESULT int opus_custom_encode24(
+    OpusCustomEncoder *st,
+    const opus_int32 *pcm,
+    int frame_size,
+    unsigned char *compressed,
+    int maxCompressedBytes
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
+
+/** Perform a CTL function on an Opus custom encoder.
+  *
+  * Generally the request and subsequent arguments are generated
+  * by a convenience macro.
+  * @see opus_encoderctls
+  */
+OPUS_CUSTOM_EXPORT int opus_custom_encoder_ctl(OpusCustomEncoder * OPUS_RESTRICT st, int request, ...) OPUS_ARG_NONNULL(1);
+
+
+#if !defined(OPUS_BUILD) || defined(CELT_DECODER_C)
+/* Decoder */
+
+/** Gets the size of an OpusCustomDecoder structure.
+  * @param [in] mode <tt>OpusCustomMode *</tt>: Mode configuration
+  * @param [in] channels <tt>int</tt>: Number of channels
+  * @returns size
+  */
+OPUS_CUSTOM_EXPORT_STATIC OPUS_WARN_UNUSED_RESULT int opus_custom_decoder_get_size(
+    const OpusCustomMode *mode,
+    int channels
+) OPUS_ARG_NONNULL(1);
+
+/** Initializes a previously allocated decoder state
+  * The memory pointed to by st must be the size returned by opus_custom_decoder_get_size.
+  * This is intended for applications which use their own allocator instead of malloc.
+  * @see opus_custom_decoder_create(),opus_custom_decoder_get_size()
+  * To reset a previously initialized state use the OPUS_RESET_STATE CTL.
+  * @param [in] st <tt>OpusCustomDecoder*</tt>: Decoder state
+  * @param [in] mode <tt>OpusCustomMode *</tt>: Contains all the information about the characteristics of
+  *  the stream (must be the same characteristics as used for the
+  *  encoder)
+  * @param [in] channels <tt>int</tt>: Number of channels
+  * @return OPUS_OK Success or @ref opus_errorcodes
+  */
+OPUS_CUSTOM_EXPORT_STATIC int opus_custom_decoder_init(
+    OpusCustomDecoder *st,
+    const OpusCustomMode *mode,
+    int channels
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2);
+
+#endif
+
+
+/** Creates a new decoder state. Each stream needs its own decoder state (can't
+  * be shared across simultaneous streams).
+  * @param [in] mode <tt>OpusCustomMode</tt>: Contains all the information about the characteristics of the
+  *          stream (must be the same characteristics as used for the encoder)
+  * @param [in] channels <tt>int</tt>: Number of channels
+  * @param [out] error <tt>int*</tt>: Returns an error code
+  * @return Newly created decoder state.
+  */
+OPUS_CUSTOM_EXPORT OPUS_WARN_UNUSED_RESULT OpusCustomDecoder *opus_custom_decoder_create(
+    const OpusCustomMode *mode,
+    int channels,
+    int *error
+) OPUS_ARG_NONNULL(1);
+
+/** Destroys a decoder state.
+  * @param[in] st <tt>OpusCustomDecoder*</tt>: State to be freed.
+  */
+OPUS_CUSTOM_EXPORT void opus_custom_decoder_destroy(OpusCustomDecoder *st);
+
+/** Decode an opus custom frame with floating point output
+  * @param [in] st <tt>OpusCustomDecoder*</tt>: Decoder state
+  * @param [in] data <tt>char*</tt>: Input payload. Use a NULL pointer to indicate packet loss
+  * @param [in] len <tt>int</tt>: Number of bytes in payload
+  * @param [out] pcm <tt>float*</tt>: Output signal (interleaved if 2 channels). length
+  *  is frame_size*channels*sizeof(float)
+  * @param [in] frame_size Number of samples per channel of available space in *pcm.
+  * @returns Number of decoded samples or @ref opus_errorcodes
+  */
+OPUS_CUSTOM_EXPORT OPUS_WARN_UNUSED_RESULT int opus_custom_decode_float(
+    OpusCustomDecoder *st,
+    const unsigned char *data,
+    int len,
+    float *pcm,
+    int frame_size
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
+
+/** Decode an opus custom frame
+  * @param [in] st <tt>OpusCustomDecoder*</tt>: Decoder state
+  * @param [in] data <tt>char*</tt>: Input payload. Use a NULL pointer to indicate packet loss
+  * @param [in] len <tt>int</tt>: Number of bytes in payload
+  * @param [out] pcm <tt>opus_int16*</tt>: Output signal (interleaved if 2 channels). length
+  *  is frame_size*channels*sizeof(opus_int16)
+  * @param [in] frame_size Number of samples per channel of available space in *pcm.
+  * @returns Number of decoded samples or @ref opus_errorcodes
+  */
+OPUS_CUSTOM_EXPORT OPUS_WARN_UNUSED_RESULT int opus_custom_decode(
+    OpusCustomDecoder *st,
+    const unsigned char *data,
+    int len,
+    opus_int16 *pcm,
+    int frame_size
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
+
+/** Decode an opus custom frame
+  * @param [in] st <tt>OpusCustomDecoder*</tt>: Decoder state
+  * @param [in] data <tt>char*</tt>: Input payload. Use a NULL pointer to indicate packet loss
+  * @param [in] len <tt>int</tt>: Number of bytes in payload
+  * @param [out] pcm <tt>opus_int32*</tt>: Output signal (interleaved if 2 channels) representing (or slightly exceeding) 24-bit values. length
+  *  is frame_size*channels*sizeof(opus_int32)
+  * @param [in] frame_size Number of samples per channel of available space in *pcm.
+  * @returns Number of decoded samples or @ref opus_errorcodes
+  */
+OPUS_CUSTOM_EXPORT OPUS_WARN_UNUSED_RESULT int opus_custom_decode24(
+    OpusCustomDecoder *st,
+    const unsigned char *data,
+    int len,
+    opus_int32 *pcm,
+    int frame_size
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
+
+/** Perform a CTL function on an Opus custom decoder.
+  *
+  * Generally the request and subsequent arguments are generated
+  * by a convenience macro.
+  * @see opus_genericctls
+  */
+OPUS_CUSTOM_EXPORT int opus_custom_decoder_ctl(OpusCustomDecoder * OPUS_RESTRICT st, int request, ...) OPUS_ARG_NONNULL(1);
+
+/**@}*/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* OPUS_CUSTOM_H */
diff --git a/sdk/include/opus/opus_defines.h b/sdk/include/opus/opus_defines.h
new file mode 100644
index 00000000000..cd8f4dde867
--- /dev/null
+++ b/sdk/include/opus/opus_defines.h
@@ -0,0 +1,830 @@
+/* Copyright (c) 2010-2011 Xiph.Org Foundation, Skype Limited
+   Written by Jean-Marc Valin and Koen Vos */
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/**
+ * @file opus_defines.h
+ * @brief Opus reference implementation constants
+ */
+
+#ifndef OPUS_DEFINES_H
+#define OPUS_DEFINES_H
+
+#include "opus_types.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @defgroup opus_errorcodes Error codes
+ * @{
+ */
+/** No error @hideinitializer*/
+#define OPUS_OK                0
+/** One or more invalid/out of range arguments @hideinitializer*/
+#define OPUS_BAD_ARG          -1
+/** Not enough bytes allocated in the buffer @hideinitializer*/
+#define OPUS_BUFFER_TOO_SMALL -2
+/** An internal error was detected @hideinitializer*/
+#define OPUS_INTERNAL_ERROR   -3
+/** The compressed data passed is corrupted @hideinitializer*/
+#define OPUS_INVALID_PACKET   -4
+/** Invalid/unsupported request number @hideinitializer*/
+#define OPUS_UNIMPLEMENTED    -5
+/** An encoder or decoder structure is invalid or already freed @hideinitializer*/
+#define OPUS_INVALID_STATE    -6
+/** Memory allocation has failed @hideinitializer*/
+#define OPUS_ALLOC_FAIL       -7
+/**@}*/
+
+/** @cond OPUS_INTERNAL_DOC */
+/**Export control for opus functions */
+
+#ifndef OPUS_EXPORT
+# if defined(_WIN32)
+#  if defined(OPUS_BUILD) && defined(DLL_EXPORT)
+#   define OPUS_EXPORT __declspec(dllexport)
+#  else
+#   define OPUS_EXPORT
+#  endif
+# elif defined(__GNUC__) && defined(OPUS_BUILD)
+#  define OPUS_EXPORT __attribute__ ((visibility ("default")))
+# else
+#  define OPUS_EXPORT
+# endif
+#endif
+
+# if !defined(OPUS_GNUC_PREREQ)
+#  if defined(__GNUC__)&&defined(__GNUC_MINOR__)
+#   define OPUS_GNUC_PREREQ(_maj,_min) \
+ ((__GNUC__<<16)+__GNUC_MINOR__>=((_maj)<<16)+(_min))
+#  else
+#   define OPUS_GNUC_PREREQ(_maj,_min) 0
+#  endif
+# endif
+
+#if (!defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L) )
+# if OPUS_GNUC_PREREQ(3,0)
+#  define OPUS_RESTRICT __restrict__
+# elif (defined(_MSC_VER) && _MSC_VER >= 1400)
+#  define OPUS_RESTRICT __restrict
+# else
+#  define OPUS_RESTRICT
+# endif
+#else
+# define OPUS_RESTRICT restrict
+#endif
+
+#if (!defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L) )
+# if OPUS_GNUC_PREREQ(2,7)
+#  define OPUS_INLINE __inline__
+# elif (defined(_MSC_VER))
+#  define OPUS_INLINE __inline
+# else
+#  define OPUS_INLINE
+# endif
+#else
+# define OPUS_INLINE inline
+#endif
+
+/**Warning attributes for opus functions
+  * NONNULL is not used in OPUS_BUILD to avoid the compiler optimizing out
+  * some paranoid null checks. */
+#if defined(__GNUC__) && OPUS_GNUC_PREREQ(3, 4)
+# define OPUS_WARN_UNUSED_RESULT __attribute__ ((__warn_unused_result__))
+#else
+# define OPUS_WARN_UNUSED_RESULT
+#endif
+#if !defined(OPUS_BUILD) && defined(__GNUC__) && OPUS_GNUC_PREREQ(3, 4)
+# define OPUS_ARG_NONNULL(_x)  __attribute__ ((__nonnull__(_x)))
+#else
+# define OPUS_ARG_NONNULL(_x)
+#endif
+
+/** These are the actual Encoder CTL ID numbers.
+  * They should not be used directly by applications.
+  * In general, SETs should be even and GETs should be odd.*/
+#define OPUS_SET_APPLICATION_REQUEST         4000
+#define OPUS_GET_APPLICATION_REQUEST         4001
+#define OPUS_SET_BITRATE_REQUEST             4002
+#define OPUS_GET_BITRATE_REQUEST             4003
+#define OPUS_SET_MAX_BANDWIDTH_REQUEST       4004
+#define OPUS_GET_MAX_BANDWIDTH_REQUEST       4005
+#define OPUS_SET_VBR_REQUEST                 4006
+#define OPUS_GET_VBR_REQUEST                 4007
+#define OPUS_SET_BANDWIDTH_REQUEST           4008
+#define OPUS_GET_BANDWIDTH_REQUEST           4009
+#define OPUS_SET_COMPLEXITY_REQUEST          4010
+#define OPUS_GET_COMPLEXITY_REQUEST          4011
+#define OPUS_SET_INBAND_FEC_REQUEST          4012
+#define OPUS_GET_INBAND_FEC_REQUEST          4013
+#define OPUS_SET_PACKET_LOSS_PERC_REQUEST    4014
+#define OPUS_GET_PACKET_LOSS_PERC_REQUEST    4015
+#define OPUS_SET_DTX_REQUEST                 4016
+#define OPUS_GET_DTX_REQUEST                 4017
+#define OPUS_SET_VBR_CONSTRAINT_REQUEST      4020
+#define OPUS_GET_VBR_CONSTRAINT_REQUEST      4021
+#define OPUS_SET_FORCE_CHANNELS_REQUEST      4022
+#define OPUS_GET_FORCE_CHANNELS_REQUEST      4023
+#define OPUS_SET_SIGNAL_REQUEST              4024
+#define OPUS_GET_SIGNAL_REQUEST              4025
+#define OPUS_GET_LOOKAHEAD_REQUEST           4027
+/* #define OPUS_RESET_STATE 4028 */
+#define OPUS_GET_SAMPLE_RATE_REQUEST         4029
+#define OPUS_GET_FINAL_RANGE_REQUEST         4031
+#define OPUS_GET_PITCH_REQUEST               4033
+#define OPUS_SET_GAIN_REQUEST                4034
+#define OPUS_GET_GAIN_REQUEST                4045 /* Should have been 4035 */
+#define OPUS_SET_LSB_DEPTH_REQUEST           4036
+#define OPUS_GET_LSB_DEPTH_REQUEST           4037
+#define OPUS_GET_LAST_PACKET_DURATION_REQUEST 4039
+#define OPUS_SET_EXPERT_FRAME_DURATION_REQUEST 4040
+#define OPUS_GET_EXPERT_FRAME_DURATION_REQUEST 4041
+#define OPUS_SET_PREDICTION_DISABLED_REQUEST 4042
+#define OPUS_GET_PREDICTION_DISABLED_REQUEST 4043
+/* Don't use 4045, it's already taken by OPUS_GET_GAIN_REQUEST */
+#define OPUS_SET_PHASE_INVERSION_DISABLED_REQUEST 4046
+#define OPUS_GET_PHASE_INVERSION_DISABLED_REQUEST 4047
+#define OPUS_GET_IN_DTX_REQUEST              4049
+#define OPUS_SET_DRED_DURATION_REQUEST 4050
+#define OPUS_GET_DRED_DURATION_REQUEST 4051
+#define OPUS_SET_DNN_BLOB_REQUEST 4052
+/*#define OPUS_GET_DNN_BLOB_REQUEST 4053 */
+
+/** Defines for the presence of extended APIs. */
+#define OPUS_HAVE_OPUS_PROJECTION_H
+
+/* Macros to trigger compilation errors when the wrong types are provided to a CTL */
+#define __opus_check_int(x) (((void)((x) == (opus_int32)0)), (opus_int32)(x))
+
+#ifdef DISABLE_PTR_CHECK
+/* Disable checks to prevent ubsan from complaining about NULL checks
+   in test_opus_api. */
+#define __opus_check_int_ptr(ptr) (ptr)
+#define __opus_check_uint_ptr(ptr) (ptr)
+#define __opus_check_uint8_ptr(ptr) (ptr)
+#define __opus_check_val16_ptr(ptr) (ptr)
+#define __opus_check_void_ptr(ptr) (ptr)
+#else
+#define __opus_check_int_ptr(ptr) ((ptr) + ((ptr) - (opus_int32*)(ptr)))
+#define __opus_check_uint_ptr(ptr) ((ptr) + ((ptr) - (opus_uint32*)(ptr)))
+#define __opus_check_uint8_ptr(ptr) ((ptr) + ((ptr) - (opus_uint8*)(ptr)))
+#define __opus_check_val16_ptr(ptr) ((ptr) + ((ptr) - (opus_val16*)(ptr)))
+#define __opus_check_void_ptr(x) ((void)((void *)0 == (x)), (x))
+#endif
+/** @endcond */
+
+/** @defgroup opus_ctlvalues Pre-defined values for CTL interface
+  * @see opus_genericctls, opus_encoderctls
+  * @{
+  */
+/* Values for the various encoder CTLs */
+#define OPUS_AUTO                           -1000 /**<Auto/default setting @hideinitializer*/
+#define OPUS_BITRATE_MAX                       -1 /**<Maximum bitrate @hideinitializer*/
+
+/** Best for most VoIP/videoconference applications where listening quality and intelligibility matter most
+ * @hideinitializer */
+#define OPUS_APPLICATION_VOIP                2048
+/** Best for broadcast/high-fidelity application where the decoded audio should be as close as possible to the input
+ * @hideinitializer */
+#define OPUS_APPLICATION_AUDIO               2049
+/** Only use when lowest-achievable latency is what matters most. Voice-optimized modes cannot be used.
+ * @hideinitializer */
+#define OPUS_APPLICATION_RESTRICTED_LOWDELAY 2051
+
+#define OPUS_SIGNAL_VOICE                    3001 /**< Signal being encoded is voice */
+#define OPUS_SIGNAL_MUSIC                    3002 /**< Signal being encoded is music */
+#define OPUS_BANDWIDTH_NARROWBAND            1101 /**< 4 kHz bandpass @hideinitializer*/
+#define OPUS_BANDWIDTH_MEDIUMBAND            1102 /**< 6 kHz bandpass @hideinitializer*/
+#define OPUS_BANDWIDTH_WIDEBAND              1103 /**< 8 kHz bandpass @hideinitializer*/
+#define OPUS_BANDWIDTH_SUPERWIDEBAND         1104 /**<12 kHz bandpass @hideinitializer*/
+#define OPUS_BANDWIDTH_FULLBAND              1105 /**<20 kHz bandpass @hideinitializer*/
+
+#define OPUS_FRAMESIZE_ARG                   5000 /**< Select frame size from the argument (default) */
+#define OPUS_FRAMESIZE_2_5_MS                5001 /**< Use 2.5 ms frames */
+#define OPUS_FRAMESIZE_5_MS                  5002 /**< Use 5 ms frames */
+#define OPUS_FRAMESIZE_10_MS                 5003 /**< Use 10 ms frames */
+#define OPUS_FRAMESIZE_20_MS                 5004 /**< Use 20 ms frames */
+#define OPUS_FRAMESIZE_40_MS                 5005 /**< Use 40 ms frames */
+#define OPUS_FRAMESIZE_60_MS                 5006 /**< Use 60 ms frames */
+#define OPUS_FRAMESIZE_80_MS                 5007 /**< Use 80 ms frames */
+#define OPUS_FRAMESIZE_100_MS                5008 /**< Use 100 ms frames */
+#define OPUS_FRAMESIZE_120_MS                5009 /**< Use 120 ms frames */
+
+/**@}*/
+
+
+/** @defgroup opus_encoderctls Encoder related CTLs
+  *
+  * These are convenience macros for use with the \c opus_encode_ctl
+  * interface. They are used to generate the appropriate series of
+  * arguments for that call, passing the correct type, size and so
+  * on as expected for each particular request.
+  *
+  * Some usage examples:
+  *
+  * @code
+  * int ret;
+  * ret = opus_encoder_ctl(enc_ctx, OPUS_SET_BANDWIDTH(OPUS_AUTO));
+  * if (ret != OPUS_OK) return ret;
+  *
+  * opus_int32 rate;
+  * opus_encoder_ctl(enc_ctx, OPUS_GET_BANDWIDTH(&rate));
+  *
+  * opus_encoder_ctl(enc_ctx, OPUS_RESET_STATE);
+  * @endcode
+  *
+  * @see opus_genericctls, opus_encoder
+  * @{
+  */
+
+/** Configures the encoder's computational complexity.
+  * The supported range is 0-10 inclusive with 10 representing the highest complexity.
+  * @see OPUS_GET_COMPLEXITY
+  * @param[in] x <tt>opus_int32</tt>: Allowed values: 0-10, inclusive.
+  *
+  * @hideinitializer */
+#define OPUS_SET_COMPLEXITY(x) OPUS_SET_COMPLEXITY_REQUEST, __opus_check_int(x)
+/** Gets the encoder's complexity configuration.
+  * @see OPUS_SET_COMPLEXITY
+  * @param[out] x <tt>opus_int32 *</tt>: Returns a value in the range 0-10,
+  *                                      inclusive.
+  * @hideinitializer */
+#define OPUS_GET_COMPLEXITY(x) OPUS_GET_COMPLEXITY_REQUEST, __opus_check_int_ptr(x)
+
+/** Configures the bitrate in the encoder.
+  * Rates from 500 to 512000 bits per second are meaningful, as well as the
+  * special values #OPUS_AUTO and #OPUS_BITRATE_MAX.
+  * The value #OPUS_BITRATE_MAX can be used to cause the codec to use as much
+  * rate as it can, which is useful for controlling the rate by adjusting the
+  * output buffer size.
+  * @see OPUS_GET_BITRATE
+  * @param[in] x <tt>opus_int32</tt>: Bitrate in bits per second. The default
+  *                                   is determined based on the number of
+  *                                   channels and the input sampling rate.
+  * @hideinitializer */
+#define OPUS_SET_BITRATE(x) OPUS_SET_BITRATE_REQUEST, __opus_check_int(x)
+/** Gets the encoder's bitrate configuration.
+  * @see OPUS_SET_BITRATE
+  * @param[out] x <tt>opus_int32 *</tt>: Returns the bitrate in bits per second.
+  *                                      The default is determined based on the
+  *                                      number of channels and the input
+  *                                      sampling rate.
+  * @hideinitializer */
+#define OPUS_GET_BITRATE(x) OPUS_GET_BITRATE_REQUEST, __opus_check_int_ptr(x)
+
+/** Enables or disables variable bitrate (VBR) in the encoder.
+  * The configured bitrate may not be met exactly because frames must
+  * be an integer number of bytes in length.
+  * @see OPUS_GET_VBR
+  * @see OPUS_SET_VBR_CONSTRAINT
+  * @param[in] x <tt>opus_int32</tt>: Allowed values:
+  * <dl>
+  * <dt>0</dt><dd>Hard CBR. For LPC/hybrid modes at very low bit-rate, this can
+  *               cause noticeable quality degradation.</dd>
+  * <dt>1</dt><dd>VBR (default). The exact type of VBR is controlled by
+  *               #OPUS_SET_VBR_CONSTRAINT.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_SET_VBR(x) OPUS_SET_VBR_REQUEST, __opus_check_int(x)
+/** Determine if variable bitrate (VBR) is enabled in the encoder.
+  * @see OPUS_SET_VBR
+  * @see OPUS_GET_VBR_CONSTRAINT
+  * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
+  * <dl>
+  * <dt>0</dt><dd>Hard CBR.</dd>
+  * <dt>1</dt><dd>VBR (default). The exact type of VBR may be retrieved via
+  *               #OPUS_GET_VBR_CONSTRAINT.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_GET_VBR(x) OPUS_GET_VBR_REQUEST, __opus_check_int_ptr(x)
+
+/** Enables or disables constrained VBR in the encoder.
+  * This setting is ignored when the encoder is in CBR mode.
+  * @warning Only the MDCT mode of Opus currently heeds the constraint.
+  *  Speech mode ignores it completely, hybrid mode may fail to obey it
+  *  if the LPC layer uses more bitrate than the constraint would have
+  *  permitted.
+  * @see OPUS_GET_VBR_CONSTRAINT
+  * @see OPUS_SET_VBR
+  * @param[in] x <tt>opus_int32</tt>: Allowed values:
+  * <dl>
+  * <dt>0</dt><dd>Unconstrained VBR.</dd>
+  * <dt>1</dt><dd>Constrained VBR (default). This creates a maximum of one
+  *               frame of buffering delay assuming a transport with a
+  *               serialization speed of the nominal bitrate.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_SET_VBR_CONSTRAINT(x) OPUS_SET_VBR_CONSTRAINT_REQUEST, __opus_check_int(x)
+/** Determine if constrained VBR is enabled in the encoder.
+  * @see OPUS_SET_VBR_CONSTRAINT
+  * @see OPUS_GET_VBR
+  * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
+  * <dl>
+  * <dt>0</dt><dd>Unconstrained VBR.</dd>
+  * <dt>1</dt><dd>Constrained VBR (default).</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_GET_VBR_CONSTRAINT(x) OPUS_GET_VBR_CONSTRAINT_REQUEST, __opus_check_int_ptr(x)
+
+/** Configures mono/stereo forcing in the encoder.
+  * This can force the encoder to produce packets encoded as either mono or
+  * stereo, regardless of the format of the input audio. This is useful when
+  * the caller knows that the input signal is currently a mono source embedded
+  * in a stereo stream.
+  * @see OPUS_GET_FORCE_CHANNELS
+  * @param[in] x <tt>opus_int32</tt>: Allowed values:
+  * <dl>
+  * <dt>#OPUS_AUTO</dt><dd>Not forced (default)</dd>
+  * <dt>1</dt>         <dd>Forced mono</dd>
+  * <dt>2</dt>         <dd>Forced stereo</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_SET_FORCE_CHANNELS(x) OPUS_SET_FORCE_CHANNELS_REQUEST, __opus_check_int(x)
+/** Gets the encoder's forced channel configuration.
+  * @see OPUS_SET_FORCE_CHANNELS
+  * @param[out] x <tt>opus_int32 *</tt>:
+  * <dl>
+  * <dt>#OPUS_AUTO</dt><dd>Not forced (default)</dd>
+  * <dt>1</dt>         <dd>Forced mono</dd>
+  * <dt>2</dt>         <dd>Forced stereo</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_GET_FORCE_CHANNELS(x) OPUS_GET_FORCE_CHANNELS_REQUEST, __opus_check_int_ptr(x)
+
+/** Configures the maximum bandpass that the encoder will select automatically.
+  * Applications should normally use this instead of #OPUS_SET_BANDWIDTH
+  * (leaving that set to the default, #OPUS_AUTO). This allows the
+  * application to set an upper bound based on the type of input it is
+  * providing, but still gives the encoder the freedom to reduce the bandpass
+  * when the bitrate becomes too low, for better overall quality.
+  * @see OPUS_GET_MAX_BANDWIDTH
+  * @param[in] x <tt>opus_int32</tt>: Allowed values:
+  * <dl>
+  * <dt>OPUS_BANDWIDTH_NARROWBAND</dt>    <dd>4 kHz passband</dd>
+  * <dt>OPUS_BANDWIDTH_MEDIUMBAND</dt>    <dd>6 kHz passband</dd>
+  * <dt>OPUS_BANDWIDTH_WIDEBAND</dt>      <dd>8 kHz passband</dd>
+  * <dt>OPUS_BANDWIDTH_SUPERWIDEBAND</dt><dd>12 kHz passband</dd>
+  * <dt>OPUS_BANDWIDTH_FULLBAND</dt>     <dd>20 kHz passband (default)</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_SET_MAX_BANDWIDTH(x) OPUS_SET_MAX_BANDWIDTH_REQUEST, __opus_check_int(x)
+
+/** Gets the encoder's configured maximum allowed bandpass.
+  * @see OPUS_SET_MAX_BANDWIDTH
+  * @param[out] x <tt>opus_int32 *</tt>: Allowed values:
+  * <dl>
+  * <dt>#OPUS_BANDWIDTH_NARROWBAND</dt>    <dd>4 kHz passband</dd>
+  * <dt>#OPUS_BANDWIDTH_MEDIUMBAND</dt>    <dd>6 kHz passband</dd>
+  * <dt>#OPUS_BANDWIDTH_WIDEBAND</dt>      <dd>8 kHz passband</dd>
+  * <dt>#OPUS_BANDWIDTH_SUPERWIDEBAND</dt><dd>12 kHz passband</dd>
+  * <dt>#OPUS_BANDWIDTH_FULLBAND</dt>     <dd>20 kHz passband (default)</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_GET_MAX_BANDWIDTH(x) OPUS_GET_MAX_BANDWIDTH_REQUEST, __opus_check_int_ptr(x)
+
+/** Sets the encoder's bandpass to a specific value.
+  * This prevents the encoder from automatically selecting the bandpass based
+  * on the available bitrate. If an application knows the bandpass of the input
+  * audio it is providing, it should normally use #OPUS_SET_MAX_BANDWIDTH
+  * instead, which still gives the encoder the freedom to reduce the bandpass
+  * when the bitrate becomes too low, for better overall quality.
+  * @see OPUS_GET_BANDWIDTH
+  * @param[in] x <tt>opus_int32</tt>: Allowed values:
+  * <dl>
+  * <dt>#OPUS_AUTO</dt>                    <dd>(default)</dd>
+  * <dt>#OPUS_BANDWIDTH_NARROWBAND</dt>    <dd>4 kHz passband</dd>
+  * <dt>#OPUS_BANDWIDTH_MEDIUMBAND</dt>    <dd>6 kHz passband</dd>
+  * <dt>#OPUS_BANDWIDTH_WIDEBAND</dt>      <dd>8 kHz passband</dd>
+  * <dt>#OPUS_BANDWIDTH_SUPERWIDEBAND</dt><dd>12 kHz passband</dd>
+  * <dt>#OPUS_BANDWIDTH_FULLBAND</dt>     <dd>20 kHz passband</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_SET_BANDWIDTH(x) OPUS_SET_BANDWIDTH_REQUEST, __opus_check_int(x)
+
+/** Configures the type of signal being encoded.
+  * This is a hint which helps the encoder's mode selection.
+  * @see OPUS_GET_SIGNAL
+  * @param[in] x <tt>opus_int32</tt>: Allowed values:
+  * <dl>
+  * <dt>#OPUS_AUTO</dt>        <dd>(default)</dd>
+  * <dt>#OPUS_SIGNAL_VOICE</dt><dd>Bias thresholds towards choosing LPC or Hybrid modes.</dd>
+  * <dt>#OPUS_SIGNAL_MUSIC</dt><dd>Bias thresholds towards choosing MDCT modes.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_SET_SIGNAL(x) OPUS_SET_SIGNAL_REQUEST, __opus_check_int(x)
+/** Gets the encoder's configured signal type.
+  * @see OPUS_SET_SIGNAL
+  * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
+  * <dl>
+  * <dt>#OPUS_AUTO</dt>        <dd>(default)</dd>
+  * <dt>#OPUS_SIGNAL_VOICE</dt><dd>Bias thresholds towards choosing LPC or Hybrid modes.</dd>
+  * <dt>#OPUS_SIGNAL_MUSIC</dt><dd>Bias thresholds towards choosing MDCT modes.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_GET_SIGNAL(x) OPUS_GET_SIGNAL_REQUEST, __opus_check_int_ptr(x)
+
+
+/** Configures the encoder's intended application.
+  * The initial value is a mandatory argument to the encoder_create function.
+  * @see OPUS_GET_APPLICATION
+  * @param[in] x <tt>opus_int32</tt>: Returns one of the following values:
+  * <dl>
+  * <dt>#OPUS_APPLICATION_VOIP</dt>
+  * <dd>Process signal for improved speech intelligibility.</dd>
+  * <dt>#OPUS_APPLICATION_AUDIO</dt>
+  * <dd>Favor faithfulness to the original input.</dd>
+  * <dt>#OPUS_APPLICATION_RESTRICTED_LOWDELAY</dt>
+  * <dd>Configure the minimum possible coding delay by disabling certain modes
+  * of operation.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_SET_APPLICATION(x) OPUS_SET_APPLICATION_REQUEST, __opus_check_int(x)
+/** Gets the encoder's configured application.
+  * @see OPUS_SET_APPLICATION
+  * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
+  * <dl>
+  * <dt>#OPUS_APPLICATION_VOIP</dt>
+  * <dd>Process signal for improved speech intelligibility.</dd>
+  * <dt>#OPUS_APPLICATION_AUDIO</dt>
+  * <dd>Favor faithfulness to the original input.</dd>
+  * <dt>#OPUS_APPLICATION_RESTRICTED_LOWDELAY</dt>
+  * <dd>Configure the minimum possible coding delay by disabling certain modes
+  * of operation.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_GET_APPLICATION(x) OPUS_GET_APPLICATION_REQUEST, __opus_check_int_ptr(x)
+
+/** Gets the total samples of delay added by the entire codec.
+  * This can be queried by the encoder and then the provided number of samples can be
+  * skipped on from the start of the decoder's output to provide time aligned input
+  * and output. From the perspective of a decoding application the real data begins this many
+  * samples late.
+  *
+  * The decoder contribution to this delay is identical for all decoders, but the
+  * encoder portion of the delay may vary from implementation to implementation,
+  * version to version, or even depend on the encoder's initial configuration.
+  * Applications needing delay compensation should call this CTL rather than
+  * hard-coding a value.
+  * @param[out] x <tt>opus_int32 *</tt>:   Number of lookahead samples
+  * @hideinitializer */
+#define OPUS_GET_LOOKAHEAD(x) OPUS_GET_LOOKAHEAD_REQUEST, __opus_check_int_ptr(x)
+
+/** Configures the encoder's use of inband forward error correction (FEC).
+  * @note This is only applicable to the LPC layer
+  * @see OPUS_GET_INBAND_FEC
+  * @param[in] x <tt>opus_int32</tt>: Allowed values:
+  * <dl>
+  * <dt>0</dt><dd>Disable inband FEC (default).</dd>
+  * <dt>1</dt><dd>Inband FEC enabled. If the packet loss rate is sufficiently high, Opus will automatically switch to SILK even at high rates to enable use of that FEC.</dd>
+  * <dt>2</dt><dd>Inband FEC enabled, but does not necessarily switch to SILK if we have music.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_SET_INBAND_FEC(x) OPUS_SET_INBAND_FEC_REQUEST, __opus_check_int(x)
+/** Gets encoder's configured use of inband forward error correction.
+  * @see OPUS_SET_INBAND_FEC
+  * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
+  * <dl>
+  * <dt>0</dt><dd>Inband FEC disabled (default).</dd>
+  * <dt>1</dt><dd>Inband FEC enabled. If the packet loss rate is sufficiently high, Opus will automatically switch to SILK even at high rates to enable use of that FEC.</dd>
+  * <dt>2</dt><dd>Inband FEC enabled, but does not necessarily switch to SILK if we have music.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_GET_INBAND_FEC(x) OPUS_GET_INBAND_FEC_REQUEST, __opus_check_int_ptr(x)
+
+/** Configures the encoder's expected packet loss percentage.
+  * Higher values trigger progressively more loss resistant behavior in the encoder
+  * at the expense of quality at a given bitrate in the absence of packet loss, but
+  * greater quality under loss.
+  * @see OPUS_GET_PACKET_LOSS_PERC
+  * @param[in] x <tt>opus_int32</tt>:   Loss percentage in the range 0-100, inclusive (default: 0).
+  * @hideinitializer */
+#define OPUS_SET_PACKET_LOSS_PERC(x) OPUS_SET_PACKET_LOSS_PERC_REQUEST, __opus_check_int(x)
+/** Gets the encoder's configured packet loss percentage.
+  * @see OPUS_SET_PACKET_LOSS_PERC
+  * @param[out] x <tt>opus_int32 *</tt>: Returns the configured loss percentage
+  *                                      in the range 0-100, inclusive (default: 0).
+  * @hideinitializer */
+#define OPUS_GET_PACKET_LOSS_PERC(x) OPUS_GET_PACKET_LOSS_PERC_REQUEST, __opus_check_int_ptr(x)
+
+/** Configures the encoder's use of discontinuous transmission (DTX).
+  * @note This is only applicable to the LPC layer
+  * @see OPUS_GET_DTX
+  * @param[in] x <tt>opus_int32</tt>: Allowed values:
+  * <dl>
+  * <dt>0</dt><dd>Disable DTX (default).</dd>
+  * <dt>1</dt><dd>Enabled DTX.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_SET_DTX(x) OPUS_SET_DTX_REQUEST, __opus_check_int(x)
+/** Gets encoder's configured use of discontinuous transmission.
+  * @see OPUS_SET_DTX
+  * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
+  * <dl>
+  * <dt>0</dt><dd>DTX disabled (default).</dd>
+  * <dt>1</dt><dd>DTX enabled.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_GET_DTX(x) OPUS_GET_DTX_REQUEST, __opus_check_int_ptr(x)
+/** Configures the depth of signal being encoded.
+  *
+  * This is a hint which helps the encoder identify silence and near-silence.
+  * It represents the number of significant bits of linear intensity below
+  * which the signal contains ignorable quantization or other noise.
+  *
+  * For example, OPUS_SET_LSB_DEPTH(14) would be an appropriate setting
+  * for G.711 u-law input. OPUS_SET_LSB_DEPTH(16) would be appropriate
+  * for 16-bit linear pcm input with opus_encode_float().
+  *
+  * When using opus_encode() instead of opus_encode_float(), or when libopus
+  * is compiled for fixed-point, the encoder uses the minimum of the value
+  * set here and the value 16.
+  *
+  * @see OPUS_GET_LSB_DEPTH
+  * @param[in] x <tt>opus_int32</tt>: Input precision in bits, between 8 and 24
+  *                                   (default: 24).
+  * @hideinitializer */
+#define OPUS_SET_LSB_DEPTH(x) OPUS_SET_LSB_DEPTH_REQUEST, __opus_check_int(x)
+/** Gets the encoder's configured signal depth.
+  * @see OPUS_SET_LSB_DEPTH
+  * @param[out] x <tt>opus_int32 *</tt>: Input precision in bits, between 8 and
+  *                                      24 (default: 24).
+  * @hideinitializer */
+#define OPUS_GET_LSB_DEPTH(x) OPUS_GET_LSB_DEPTH_REQUEST, __opus_check_int_ptr(x)
+
+/** Configures the encoder's use of variable duration frames.
+  * When variable duration is enabled, the encoder is free to use a shorter frame
+  * size than the one requested in the opus_encode*() call.
+  * It is then the user's responsibility
+  * to verify how much audio was encoded by checking the ToC byte of the encoded
+  * packet. The part of the audio that was not encoded needs to be resent to the
+  * encoder for the next call. Do not use this option unless you <b>really</b>
+  * know what you are doing.
+  * @see OPUS_GET_EXPERT_FRAME_DURATION
+  * @param[in] x <tt>opus_int32</tt>: Allowed values:
+  * <dl>
+  * <dt>OPUS_FRAMESIZE_ARG</dt><dd>Select frame size from the argument (default).</dd>
+  * <dt>OPUS_FRAMESIZE_2_5_MS</dt><dd>Use 2.5 ms frames.</dd>
+  * <dt>OPUS_FRAMESIZE_5_MS</dt><dd>Use 5 ms frames.</dd>
+  * <dt>OPUS_FRAMESIZE_10_MS</dt><dd>Use 10 ms frames.</dd>
+  * <dt>OPUS_FRAMESIZE_20_MS</dt><dd>Use 20 ms frames.</dd>
+  * <dt>OPUS_FRAMESIZE_40_MS</dt><dd>Use 40 ms frames.</dd>
+  * <dt>OPUS_FRAMESIZE_60_MS</dt><dd>Use 60 ms frames.</dd>
+  * <dt>OPUS_FRAMESIZE_80_MS</dt><dd>Use 80 ms frames.</dd>
+  * <dt>OPUS_FRAMESIZE_100_MS</dt><dd>Use 100 ms frames.</dd>
+  * <dt>OPUS_FRAMESIZE_120_MS</dt><dd>Use 120 ms frames.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_SET_EXPERT_FRAME_DURATION(x) OPUS_SET_EXPERT_FRAME_DURATION_REQUEST, __opus_check_int(x)
+/** Gets the encoder's configured use of variable duration frames.
+  * @see OPUS_SET_EXPERT_FRAME_DURATION
+  * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
+  * <dl>
+  * <dt>OPUS_FRAMESIZE_ARG</dt><dd>Select frame size from the argument (default).</dd>
+  * <dt>OPUS_FRAMESIZE_2_5_MS</dt><dd>Use 2.5 ms frames.</dd>
+  * <dt>OPUS_FRAMESIZE_5_MS</dt><dd>Use 5 ms frames.</dd>
+  * <dt>OPUS_FRAMESIZE_10_MS</dt><dd>Use 10 ms frames.</dd>
+  * <dt>OPUS_FRAMESIZE_20_MS</dt><dd>Use 20 ms frames.</dd>
+  * <dt>OPUS_FRAMESIZE_40_MS</dt><dd>Use 40 ms frames.</dd>
+  * <dt>OPUS_FRAMESIZE_60_MS</dt><dd>Use 60 ms frames.</dd>
+  * <dt>OPUS_FRAMESIZE_80_MS</dt><dd>Use 80 ms frames.</dd>
+  * <dt>OPUS_FRAMESIZE_100_MS</dt><dd>Use 100 ms frames.</dd>
+  * <dt>OPUS_FRAMESIZE_120_MS</dt><dd>Use 120 ms frames.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_GET_EXPERT_FRAME_DURATION(x) OPUS_GET_EXPERT_FRAME_DURATION_REQUEST, __opus_check_int_ptr(x)
+
+/** If set to 1, disables almost all use of prediction, making frames almost
+  * completely independent. This reduces quality.
+  * @see OPUS_GET_PREDICTION_DISABLED
+  * @param[in] x <tt>opus_int32</tt>: Allowed values:
+  * <dl>
+  * <dt>0</dt><dd>Enable prediction (default).</dd>
+  * <dt>1</dt><dd>Disable prediction.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_SET_PREDICTION_DISABLED(x) OPUS_SET_PREDICTION_DISABLED_REQUEST, __opus_check_int(x)
+/** Gets the encoder's configured prediction status.
+  * @see OPUS_SET_PREDICTION_DISABLED
+  * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
+  * <dl>
+  * <dt>0</dt><dd>Prediction enabled (default).</dd>
+  * <dt>1</dt><dd>Prediction disabled.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_GET_PREDICTION_DISABLED(x) OPUS_GET_PREDICTION_DISABLED_REQUEST, __opus_check_int_ptr(x)
+
+/** If non-zero, enables Deep Redundancy (DRED) and use the specified maximum number of 10-ms redundant frames
+  * @hideinitializer */
+#define OPUS_SET_DRED_DURATION(x) OPUS_SET_DRED_DURATION_REQUEST, __opus_check_int(x)
+/** Gets the encoder's configured Deep Redundancy (DRED) maximum number of frames.
+  * @hideinitializer */
+#define OPUS_GET_DRED_DURATION(x) OPUS_GET_DRED_DURATION_REQUEST, __opus_check_int_ptr(x)
+
+/** Provide external DNN weights from binary object (only when explicitly built without the weights)
+  * @hideinitializer */
+#define OPUS_SET_DNN_BLOB(data, len) OPUS_SET_DNN_BLOB_REQUEST, __opus_check_void_ptr(data), __opus_check_int(len)
+
+
+/**@}*/
+
+/** @defgroup opus_genericctls Generic CTLs
+  *
+  * These macros are used with the \c opus_decoder_ctl and
+  * \c opus_encoder_ctl calls to generate a particular
+  * request.
+  *
+  * When called on an \c OpusDecoder they apply to that
+  * particular decoder instance. When called on an
+  * \c OpusEncoder they apply to the corresponding setting
+  * on that encoder instance, if present.
+  *
+  * Some usage examples:
+  *
+  * @code
+  * int ret;
+  * opus_int32 pitch;
+  * ret = opus_decoder_ctl(dec_ctx, OPUS_GET_PITCH(&pitch));
+  * if (ret == OPUS_OK) return ret;
+  *
+  * opus_encoder_ctl(enc_ctx, OPUS_RESET_STATE);
+  * opus_decoder_ctl(dec_ctx, OPUS_RESET_STATE);
+  *
+  * opus_int32 enc_bw, dec_bw;
+  * opus_encoder_ctl(enc_ctx, OPUS_GET_BANDWIDTH(&enc_bw));
+  * opus_decoder_ctl(dec_ctx, OPUS_GET_BANDWIDTH(&dec_bw));
+  * if (enc_bw != dec_bw) {
+  *   printf("packet bandwidth mismatch!\n");
+  * }
+  * @endcode
+  *
+  * @see opus_encoder, opus_decoder_ctl, opus_encoder_ctl, opus_decoderctls, opus_encoderctls
+  * @{
+  */
+
+/** Resets the codec state to be equivalent to a freshly initialized state.
+  * This should be called when switching streams in order to prevent
+  * the back to back decoding from giving different results from
+  * one at a time decoding.
+  * @hideinitializer */
+#define OPUS_RESET_STATE 4028
+
+/** Gets the final state of the codec's entropy coder.
+  * This is used for testing purposes,
+  * The encoder and decoder state should be identical after coding a payload
+  * (assuming no data corruption or software bugs)
+  *
+  * @param[out] x <tt>opus_uint32 *</tt>: Entropy coder state
+  *
+  * @hideinitializer */
+#define OPUS_GET_FINAL_RANGE(x) OPUS_GET_FINAL_RANGE_REQUEST, __opus_check_uint_ptr(x)
+
+/** Gets the encoder's configured bandpass or the decoder's last bandpass.
+  * @see OPUS_SET_BANDWIDTH
+  * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
+  * <dl>
+  * <dt>#OPUS_AUTO</dt>                    <dd>(default)</dd>
+  * <dt>#OPUS_BANDWIDTH_NARROWBAND</dt>    <dd>4 kHz passband</dd>
+  * <dt>#OPUS_BANDWIDTH_MEDIUMBAND</dt>    <dd>6 kHz passband</dd>
+  * <dt>#OPUS_BANDWIDTH_WIDEBAND</dt>      <dd>8 kHz passband</dd>
+  * <dt>#OPUS_BANDWIDTH_SUPERWIDEBAND</dt><dd>12 kHz passband</dd>
+  * <dt>#OPUS_BANDWIDTH_FULLBAND</dt>     <dd>20 kHz passband</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_GET_BANDWIDTH(x) OPUS_GET_BANDWIDTH_REQUEST, __opus_check_int_ptr(x)
+
+/** Gets the sampling rate the encoder or decoder was initialized with.
+  * This simply returns the <code>Fs</code> value passed to opus_encoder_init()
+  * or opus_decoder_init().
+  * @param[out] x <tt>opus_int32 *</tt>: Sampling rate of encoder or decoder.
+  * @hideinitializer
+  */
+#define OPUS_GET_SAMPLE_RATE(x) OPUS_GET_SAMPLE_RATE_REQUEST, __opus_check_int_ptr(x)
+
+/** If set to 1, disables the use of phase inversion for intensity stereo,
+  * improving the quality of mono downmixes, but slightly reducing normal
+  * stereo quality. Disabling phase inversion in the decoder does not comply
+  * with RFC 6716, although it does not cause any interoperability issue and
+  * is expected to become part of the Opus standard once RFC 6716 is updated
+  * by draft-ietf-codec-opus-update.
+  * @see OPUS_GET_PHASE_INVERSION_DISABLED
+  * @param[in] x <tt>opus_int32</tt>: Allowed values:
+  * <dl>
+  * <dt>0</dt><dd>Enable phase inversion (default).</dd>
+  * <dt>1</dt><dd>Disable phase inversion.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_SET_PHASE_INVERSION_DISABLED(x) OPUS_SET_PHASE_INVERSION_DISABLED_REQUEST, __opus_check_int(x)
+/** Gets the encoder's configured phase inversion status.
+  * @see OPUS_SET_PHASE_INVERSION_DISABLED
+  * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
+  * <dl>
+  * <dt>0</dt><dd>Stereo phase inversion enabled (default).</dd>
+  * <dt>1</dt><dd>Stereo phase inversion disabled.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_GET_PHASE_INVERSION_DISABLED(x) OPUS_GET_PHASE_INVERSION_DISABLED_REQUEST, __opus_check_int_ptr(x)
+/** Gets the DTX state of the encoder.
+  * Returns whether the last encoded frame was either a comfort noise update
+  * during DTX or not encoded because of DTX.
+  * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
+  * <dl>
+  * <dt>0</dt><dd>The encoder is not in DTX.</dd>
+  * <dt>1</dt><dd>The encoder is in DTX.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_GET_IN_DTX(x) OPUS_GET_IN_DTX_REQUEST, __opus_check_int_ptr(x)
+
+/**@}*/
+
+/** @defgroup opus_decoderctls Decoder related CTLs
+  * @see opus_genericctls, opus_encoderctls, opus_decoder
+  * @{
+  */
+
+/** Configures decoder gain adjustment.
+  * Scales the decoded output by a factor specified in Q8 dB units.
+  * This has a maximum range of -32768 to 32767 inclusive, and returns
+  * OPUS_BAD_ARG otherwise. The default is zero indicating no adjustment.
+  * This setting survives decoder reset.
+  *
+  * gain = pow(10, x/(20.0*256))
+  *
+  * @param[in] x <tt>opus_int32</tt>:   Amount to scale PCM signal by in Q8 dB units.
+  * @hideinitializer */
+#define OPUS_SET_GAIN(x) OPUS_SET_GAIN_REQUEST, __opus_check_int(x)
+/** Gets the decoder's configured gain adjustment. @see OPUS_SET_GAIN
+  *
+  * @param[out] x <tt>opus_int32 *</tt>: Amount to scale PCM signal by in Q8 dB units.
+  * @hideinitializer */
+#define OPUS_GET_GAIN(x) OPUS_GET_GAIN_REQUEST, __opus_check_int_ptr(x)
+
+/** Gets the duration (in samples) of the last packet successfully decoded or concealed.
+  * @param[out] x <tt>opus_int32 *</tt>: Number of samples (at current sampling rate).
+  * @hideinitializer */
+#define OPUS_GET_LAST_PACKET_DURATION(x) OPUS_GET_LAST_PACKET_DURATION_REQUEST, __opus_check_int_ptr(x)
+
+/** Gets the pitch of the last decoded frame, if available.
+  * This can be used for any post-processing algorithm requiring the use of pitch,
+  * e.g. time stretching/shortening. If the last frame was not voiced, or if the
+  * pitch was not coded in the frame, then zero is returned.
+  *
+  * This CTL is only implemented for decoder instances.
+  *
+  * @param[out] x <tt>opus_int32 *</tt>: pitch period at 48 kHz (or 0 if not available)
+  *
+  * @hideinitializer */
+#define OPUS_GET_PITCH(x) OPUS_GET_PITCH_REQUEST, __opus_check_int_ptr(x)
+
+/**@}*/
+
+/** @defgroup opus_libinfo Opus library information functions
+  * @{
+  */
+
+/** Converts an opus error code into a human readable string.
+  *
+  * @param[in] error <tt>int</tt>: Error number
+  * @returns Error string
+  */
+OPUS_EXPORT const char *opus_strerror(int error);
+
+/** Gets the libopus version string.
+  *
+  * Applications may look for the substring "-fixed" in the version string to
+  * determine whether they have a fixed-point or floating-point build at
+  * runtime.
+  *
+  * @returns Version string
+  */
+OPUS_EXPORT const char *opus_get_version_string(void);
+/**@}*/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* OPUS_DEFINES_H */
diff --git a/sdk/include/opus/opus_multistream.h b/sdk/include/opus/opus_multistream.h
new file mode 100644
index 00000000000..752703b663d
--- /dev/null
+++ b/sdk/include/opus/opus_multistream.h
@@ -0,0 +1,736 @@
+/* Copyright (c) 2011 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/**
+ * @file opus_multistream.h
+ * @brief Opus reference implementation multistream API
+ */
+
+#ifndef OPUS_MULTISTREAM_H
+#define OPUS_MULTISTREAM_H
+
+#include "opus.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @cond OPUS_INTERNAL_DOC */
+
+/** Macros to trigger compilation errors when the wrong types are provided to a
+  * CTL. */
+/**@{*/
+#define __opus_check_encstate_ptr(ptr) ((ptr) + ((ptr) - (OpusEncoder**)(ptr)))
+#define __opus_check_decstate_ptr(ptr) ((ptr) + ((ptr) - (OpusDecoder**)(ptr)))
+/**@}*/
+
+/** These are the actual encoder and decoder CTL ID numbers.
+  * They should not be used directly by applications.
+  * In general, SETs should be even and GETs should be odd.*/
+/**@{*/
+#define OPUS_MULTISTREAM_GET_ENCODER_STATE_REQUEST 5120
+#define OPUS_MULTISTREAM_GET_DECODER_STATE_REQUEST 5122
+/**@}*/
+
+/** @endcond */
+
+/** @defgroup opus_multistream_ctls Multistream specific encoder and decoder CTLs
+  *
+  * These are convenience macros that are specific to the
+  * opus_multistream_encoder_ctl() and opus_multistream_decoder_ctl()
+  * interface.
+  * The CTLs from @ref opus_genericctls, @ref opus_encoderctls, and
+  * @ref opus_decoderctls may be applied to a multistream encoder or decoder as
+  * well.
+  * In addition, you may retrieve the encoder or decoder state for an specific
+  * stream via #OPUS_MULTISTREAM_GET_ENCODER_STATE or
+  * #OPUS_MULTISTREAM_GET_DECODER_STATE and apply CTLs to it individually.
+  */
+/**@{*/
+
+/** Gets the encoder state for an individual stream of a multistream encoder.
+  * @param[in] x <tt>opus_int32</tt>: The index of the stream whose encoder you
+  *                                   wish to retrieve.
+  *                                   This must be non-negative and less than
+  *                                   the <code>streams</code> parameter used
+  *                                   to initialize the encoder.
+  * @param[out] y <tt>OpusEncoder**</tt>: Returns a pointer to the given
+  *                                       encoder state.
+  * @retval OPUS_BAD_ARG The index of the requested stream was out of range.
+  * @hideinitializer
+  */
+#define OPUS_MULTISTREAM_GET_ENCODER_STATE(x,y) OPUS_MULTISTREAM_GET_ENCODER_STATE_REQUEST, __opus_check_int(x), __opus_check_encstate_ptr(y)
+
+/** Gets the decoder state for an individual stream of a multistream decoder.
+  * @param[in] x <tt>opus_int32</tt>: The index of the stream whose decoder you
+  *                                   wish to retrieve.
+  *                                   This must be non-negative and less than
+  *                                   the <code>streams</code> parameter used
+  *                                   to initialize the decoder.
+  * @param[out] y <tt>OpusDecoder**</tt>: Returns a pointer to the given
+  *                                       decoder state.
+  * @retval OPUS_BAD_ARG The index of the requested stream was out of range.
+  * @hideinitializer
+  */
+#define OPUS_MULTISTREAM_GET_DECODER_STATE(x,y) OPUS_MULTISTREAM_GET_DECODER_STATE_REQUEST, __opus_check_int(x), __opus_check_decstate_ptr(y)
+
+/**@}*/
+
+/** @defgroup opus_multistream Opus Multistream API
+  * @{
+  *
+  * The multistream API allows individual Opus streams to be combined into a
+  * single packet, enabling support for up to 255 channels. Unlike an
+  * elementary Opus stream, the encoder and decoder must negotiate the channel
+  * configuration before the decoder can successfully interpret the data in the
+  * packets produced by the encoder. Some basic information, such as packet
+  * duration, can be computed without any special negotiation.
+  *
+  * The format for multistream Opus packets is defined in
+  * <a href="https://tools.ietf.org/html/rfc7845">RFC 7845</a>
+  * and is based on the self-delimited Opus framing described in Appendix B of
+  * <a href="https://tools.ietf.org/html/rfc6716">RFC 6716</a>.
+  * Normal Opus packets are just a degenerate case of multistream Opus packets,
+  * and can be encoded or decoded with the multistream API by setting
+  * <code>streams</code> to <code>1</code> when initializing the encoder or
+  * decoder.
+  *
+  * Multistream Opus streams can contain up to 255 elementary Opus streams.
+  * These may be either "uncoupled" or "coupled", indicating that the decoder
+  * is configured to decode them to either 1 or 2 channels, respectively.
+  * The streams are ordered so that all coupled streams appear at the
+  * beginning.
+  *
+  * A <code>mapping</code> table defines which decoded channel <code>i</code>
+  * should be used for each input/output (I/O) channel <code>j</code>. This table is
+  * typically provided as an unsigned char array.
+  * Let <code>i = mapping[j]</code> be the index for I/O channel <code>j</code>.
+  * If <code>i < 2*coupled_streams</code>, then I/O channel <code>j</code> is
+  * encoded as the left channel of stream <code>(i/2)</code> if <code>i</code>
+  * is even, or  as the right channel of stream <code>(i/2)</code> if
+  * <code>i</code> is odd. Otherwise, I/O channel <code>j</code> is encoded as
+  * mono in stream <code>(i - coupled_streams)</code>, unless it has the special
+  * value 255, in which case it is omitted from the encoding entirely (the
+  * decoder will reproduce it as silence). Each value <code>i</code> must either
+  * be the special value 255 or be less than <code>streams + coupled_streams</code>.
+  *
+  * The output channels specified by the encoder
+  * should use the
+  * <a href="https://www.xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-810004.3.9">Vorbis
+  * channel ordering</a>. A decoder may wish to apply an additional permutation
+  * to the mapping the encoder used to achieve a different output channel
+  * order (e.g. for outputting in WAV order).
+  *
+  * Each multistream packet contains an Opus packet for each stream, and all of
+  * the Opus packets in a single multistream packet must have the same
+  * duration. Therefore the duration of a multistream packet can be extracted
+  * from the TOC sequence of the first stream, which is located at the
+  * beginning of the packet, just like an elementary Opus stream:
+  *
+  * @code
+  * int nb_samples;
+  * int nb_frames;
+  * nb_frames = opus_packet_get_nb_frames(data, len);
+  * if (nb_frames < 1)
+  *   return nb_frames;
+  * nb_samples = opus_packet_get_samples_per_frame(data, 48000) * nb_frames;
+  * @endcode
+  *
+  * The general encoding and decoding process proceeds exactly the same as in
+  * the normal @ref opus_encoder and @ref opus_decoder APIs.
+  * See their documentation for an overview of how to use the corresponding
+  * multistream functions.
+  */
+
+/** Opus multistream encoder state.
+  * This contains the complete state of a multistream Opus encoder.
+  * It is position independent and can be freely copied.
+  * @see opus_multistream_encoder_create
+  * @see opus_multistream_encoder_init
+  */
+typedef struct OpusMSEncoder OpusMSEncoder;
+
+/** Opus multistream decoder state.
+  * This contains the complete state of a multistream Opus decoder.
+  * It is position independent and can be freely copied.
+  * @see opus_multistream_decoder_create
+  * @see opus_multistream_decoder_init
+  */
+typedef struct OpusMSDecoder OpusMSDecoder;
+
+/**\name Multistream encoder functions */
+/**@{*/
+
+/** Gets the size of an OpusMSEncoder structure.
+  * @param streams <tt>int</tt>: The total number of streams to encode from the
+  *                              input.
+  *                              This must be no more than 255.
+  * @param coupled_streams <tt>int</tt>: Number of coupled (2 channel) streams
+  *                                      to encode.
+  *                                      This must be no larger than the total
+  *                                      number of streams.
+  *                                      Additionally, The total number of
+  *                                      encoded channels (<code>streams +
+  *                                      coupled_streams</code>) must be no
+  *                                      more than 255.
+  * @returns The size in bytes on success, or a negative error code
+  *          (see @ref opus_errorcodes) on error.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_multistream_encoder_get_size(
+      int streams,
+      int coupled_streams
+);
+
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_multistream_surround_encoder_get_size(
+      int channels,
+      int mapping_family
+);
+
+
+/** Allocates and initializes a multistream encoder state.
+  * Call opus_multistream_encoder_destroy() to release
+  * this object when finished.
+  * @param Fs <tt>opus_int32</tt>: Sampling rate of the input signal (in Hz).
+  *                                This must be one of 8000, 12000, 16000,
+  *                                24000, or 48000.
+  * @param channels <tt>int</tt>: Number of channels in the input signal.
+  *                               This must be at most 255.
+  *                               It may be greater than the number of
+  *                               coded channels (<code>streams +
+  *                               coupled_streams</code>).
+  * @param streams <tt>int</tt>: The total number of streams to encode from the
+  *                              input.
+  *                              This must be no more than the number of channels.
+  * @param coupled_streams <tt>int</tt>: Number of coupled (2 channel) streams
+  *                                      to encode.
+  *                                      This must be no larger than the total
+  *                                      number of streams.
+  *                                      Additionally, The total number of
+  *                                      encoded channels (<code>streams +
+  *                                      coupled_streams</code>) must be no
+  *                                      more than the number of input channels.
+  * @param[in] mapping <code>const unsigned char[channels]</code>: Mapping from
+  *                    encoded channels to input channels, as described in
+  *                    @ref opus_multistream. As an extra constraint, the
+  *                    multistream encoder does not allow encoding coupled
+  *                    streams for which one channel is unused since this
+  *                    is never a good idea.
+  * @param application <tt>int</tt>: The target encoder application.
+  *                                  This must be one of the following:
+  * <dl>
+  * <dt>#OPUS_APPLICATION_VOIP</dt>
+  * <dd>Process signal for improved speech intelligibility.</dd>
+  * <dt>#OPUS_APPLICATION_AUDIO</dt>
+  * <dd>Favor faithfulness to the original input.</dd>
+  * <dt>#OPUS_APPLICATION_RESTRICTED_LOWDELAY</dt>
+  * <dd>Configure the minimum possible coding delay by disabling certain modes
+  * of operation.</dd>
+  * </dl>
+  * @param[out] error <tt>int *</tt>: Returns #OPUS_OK on success, or an error
+  *                                   code (see @ref opus_errorcodes) on
+  *                                   failure.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusMSEncoder *opus_multistream_encoder_create(
+      opus_int32 Fs,
+      int channels,
+      int streams,
+      int coupled_streams,
+      const unsigned char *mapping,
+      int application,
+      int *error
+) OPUS_ARG_NONNULL(5);
+
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusMSEncoder *opus_multistream_surround_encoder_create(
+      opus_int32 Fs,
+      int channels,
+      int mapping_family,
+      int *streams,
+      int *coupled_streams,
+      unsigned char *mapping,
+      int application,
+      int *error
+) OPUS_ARG_NONNULL(4) OPUS_ARG_NONNULL(5) OPUS_ARG_NONNULL(6);
+
+/** Initialize a previously allocated multistream encoder state.
+  * The memory pointed to by \a st must be at least the size returned by
+  * opus_multistream_encoder_get_size().
+  * This is intended for applications which use their own allocator instead of
+  * malloc.
+  * To reset a previously initialized state, use the #OPUS_RESET_STATE CTL.
+  * @see opus_multistream_encoder_create
+  * @see opus_multistream_encoder_get_size
+  * @param st <tt>OpusMSEncoder*</tt>: Multistream encoder state to initialize.
+  * @param Fs <tt>opus_int32</tt>: Sampling rate of the input signal (in Hz).
+  *                                This must be one of 8000, 12000, 16000,
+  *                                24000, or 48000.
+  * @param channels <tt>int</tt>: Number of channels in the input signal.
+  *                               This must be at most 255.
+  *                               It may be greater than the number of
+  *                               coded channels (<code>streams +
+  *                               coupled_streams</code>).
+  * @param streams <tt>int</tt>: The total number of streams to encode from the
+  *                              input.
+  *                              This must be no more than the number of channels.
+  * @param coupled_streams <tt>int</tt>: Number of coupled (2 channel) streams
+  *                                      to encode.
+  *                                      This must be no larger than the total
+  *                                      number of streams.
+  *                                      Additionally, The total number of
+  *                                      encoded channels (<code>streams +
+  *                                      coupled_streams</code>) must be no
+  *                                      more than the number of input channels.
+  * @param[in] mapping <code>const unsigned char[channels]</code>: Mapping from
+  *                    encoded channels to input channels, as described in
+  *                    @ref opus_multistream. As an extra constraint, the
+  *                    multistream encoder does not allow encoding coupled
+  *                    streams for which one channel is unused since this
+  *                    is never a good idea.
+  * @param application <tt>int</tt>: The target encoder application.
+  *                                  This must be one of the following:
+  * <dl>
+  * <dt>#OPUS_APPLICATION_VOIP</dt>
+  * <dd>Process signal for improved speech intelligibility.</dd>
+  * <dt>#OPUS_APPLICATION_AUDIO</dt>
+  * <dd>Favor faithfulness to the original input.</dd>
+  * <dt>#OPUS_APPLICATION_RESTRICTED_LOWDELAY</dt>
+  * <dd>Configure the minimum possible coding delay by disabling certain modes
+  * of operation.</dd>
+  * </dl>
+  * @returns #OPUS_OK on success, or an error code (see @ref opus_errorcodes)
+  *          on failure.
+  */
+OPUS_EXPORT int opus_multistream_encoder_init(
+      OpusMSEncoder *st,
+      opus_int32 Fs,
+      int channels,
+      int streams,
+      int coupled_streams,
+      const unsigned char *mapping,
+      int application
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(6);
+
+OPUS_EXPORT int opus_multistream_surround_encoder_init(
+      OpusMSEncoder *st,
+      opus_int32 Fs,
+      int channels,
+      int mapping_family,
+      int *streams,
+      int *coupled_streams,
+      unsigned char *mapping,
+      int application
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(5) OPUS_ARG_NONNULL(6) OPUS_ARG_NONNULL(7);
+
+/** Encodes a multistream Opus frame.
+  * @param st <tt>OpusMSEncoder*</tt>: Multistream encoder state.
+  * @param[in] pcm <tt>const opus_int16*</tt>: The input signal as interleaved
+  *                                            samples.
+  *                                            This must contain
+  *                                            <code>frame_size*channels</code>
+  *                                            samples.
+  * @param frame_size <tt>int</tt>: Number of samples per channel in the input
+  *                                 signal.
+  *                                 This must be an Opus frame size for the
+  *                                 encoder's sampling rate.
+  *                                 For example, at 48 kHz the permitted values
+  *                                 are 120, 240, 480, 960, 1920, and 2880.
+  *                                 Passing in a duration of less than 10 ms
+  *                                 (480 samples at 48 kHz) will prevent the
+  *                                 encoder from using the LPC or hybrid modes.
+  * @param[out] data <tt>unsigned char*</tt>: Output payload.
+  *                                           This must contain storage for at
+  *                                           least \a max_data_bytes.
+  * @param [in] max_data_bytes <tt>opus_int32</tt>: Size of the allocated
+  *                                                 memory for the output
+  *                                                 payload. This may be
+  *                                                 used to impose an upper limit on
+  *                                                 the instant bitrate, but should
+  *                                                 not be used as the only bitrate
+  *                                                 control. Use #OPUS_SET_BITRATE to
+  *                                                 control the bitrate.
+  * @returns The length of the encoded packet (in bytes) on success or a
+  *          negative error code (see @ref opus_errorcodes) on failure.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_multistream_encode(
+    OpusMSEncoder *st,
+    const opus_int16 *pcm,
+    int frame_size,
+    unsigned char *data,
+    opus_int32 max_data_bytes
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
+
+/** Encodes a multistream Opus frame.
+  * @param st <tt>OpusMSEncoder*</tt>: Multistream encoder state.
+  * @param[in] pcm <tt>const opus_int32*</tt>: The input signal as interleaved
+  *                                            samples representing (or slightly exceeding) 24-bit values.
+  *                                            This must contain
+  *                                            <code>frame_size*channels</code>
+  *                                            samples.
+  * @param frame_size <tt>int</tt>: Number of samples per channel in the input
+  *                                 signal.
+  *                                 This must be an Opus frame size for the
+  *                                 encoder's sampling rate.
+  *                                 For example, at 48 kHz the permitted values
+  *                                 are 120, 240, 480, 960, 1920, and 2880.
+  *                                 Passing in a duration of less than 10 ms
+  *                                 (480 samples at 48 kHz) will prevent the
+  *                                 encoder from using the LPC or hybrid modes.
+  * @param[out] data <tt>unsigned char*</tt>: Output payload.
+  *                                           This must contain storage for at
+  *                                           least \a max_data_bytes.
+  * @param [in] max_data_bytes <tt>opus_int32</tt>: Size of the allocated
+  *                                                 memory for the output
+  *                                                 payload. This may be
+  *                                                 used to impose an upper limit on
+  *                                                 the instant bitrate, but should
+  *                                                 not be used as the only bitrate
+  *                                                 control. Use #OPUS_SET_BITRATE to
+  *                                                 control the bitrate.
+  * @returns The length of the encoded packet (in bytes) on success or a
+  *          negative error code (see @ref opus_errorcodes) on failure.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_multistream_encode24(
+    OpusMSEncoder *st,
+    const opus_int32 *pcm,
+    int frame_size,
+    unsigned char *data,
+    opus_int32 max_data_bytes
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
+
+/** Encodes a multistream Opus frame from floating point input.
+  * @param st <tt>OpusMSEncoder*</tt>: Multistream encoder state.
+  * @param[in] pcm <tt>const float*</tt>: The input signal as interleaved
+  *                                       samples with a normal range of
+  *                                       +/-1.0.
+  *                                       Samples with a range beyond +/-1.0
+  *                                       are supported but will be clipped by
+  *                                       decoders using the integer API and
+  *                                       should only be used if it is known
+  *                                       that the far end supports extended
+  *                                       dynamic range.
+  *                                       This must contain
+  *                                       <code>frame_size*channels</code>
+  *                                       samples.
+  * @param frame_size <tt>int</tt>: Number of samples per channel in the input
+  *                                 signal.
+  *                                 This must be an Opus frame size for the
+  *                                 encoder's sampling rate.
+  *                                 For example, at 48 kHz the permitted values
+  *                                 are 120, 240, 480, 960, 1920, and 2880.
+  *                                 Passing in a duration of less than 10 ms
+  *                                 (480 samples at 48 kHz) will prevent the
+  *                                 encoder from using the LPC or hybrid modes.
+  * @param[out] data <tt>unsigned char*</tt>: Output payload.
+  *                                           This must contain storage for at
+  *                                           least \a max_data_bytes.
+  * @param [in] max_data_bytes <tt>opus_int32</tt>: Size of the allocated
+  *                                                 memory for the output
+  *                                                 payload. This may be
+  *                                                 used to impose an upper limit on
+  *                                                 the instant bitrate, but should
+  *                                                 not be used as the only bitrate
+  *                                                 control. Use #OPUS_SET_BITRATE to
+  *                                                 control the bitrate.
+  * @returns The length of the encoded packet (in bytes) on success or a
+  *          negative error code (see @ref opus_errorcodes) on failure.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_multistream_encode_float(
+      OpusMSEncoder *st,
+      const float *pcm,
+      int frame_size,
+      unsigned char *data,
+      opus_int32 max_data_bytes
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
+
+/** Frees an <code>OpusMSEncoder</code> allocated by
+  * opus_multistream_encoder_create().
+  * @param st <tt>OpusMSEncoder*</tt>: Multistream encoder state to be freed.
+  */
+OPUS_EXPORT void opus_multistream_encoder_destroy(OpusMSEncoder *st);
+
+/** Perform a CTL function on a multistream Opus encoder.
+  *
+  * Generally the request and subsequent arguments are generated by a
+  * convenience macro.
+  * @param st <tt>OpusMSEncoder*</tt>: Multistream encoder state.
+  * @param request This and all remaining parameters should be replaced by one
+  *                of the convenience macros in @ref opus_genericctls,
+  *                @ref opus_encoderctls, or @ref opus_multistream_ctls.
+  * @see opus_genericctls
+  * @see opus_encoderctls
+  * @see opus_multistream_ctls
+  */
+OPUS_EXPORT int opus_multistream_encoder_ctl(OpusMSEncoder *st, int request, ...) OPUS_ARG_NONNULL(1);
+
+/**@}*/
+
+/**\name Multistream decoder functions */
+/**@{*/
+
+/** Gets the size of an <code>OpusMSDecoder</code> structure.
+  * @param streams <tt>int</tt>: The total number of streams coded in the
+  *                              input.
+  *                              This must be no more than 255.
+  * @param coupled_streams <tt>int</tt>: Number streams to decode as coupled
+  *                                      (2 channel) streams.
+  *                                      This must be no larger than the total
+  *                                      number of streams.
+  *                                      Additionally, The total number of
+  *                                      coded channels (<code>streams +
+  *                                      coupled_streams</code>) must be no
+  *                                      more than 255.
+  * @returns The size in bytes on success, or a negative error code
+  *          (see @ref opus_errorcodes) on error.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_multistream_decoder_get_size(
+      int streams,
+      int coupled_streams
+);
+
+/** Allocates and initializes a multistream decoder state.
+  * Call opus_multistream_decoder_destroy() to release
+  * this object when finished.
+  * @param Fs <tt>opus_int32</tt>: Sampling rate to decode at (in Hz).
+  *                                This must be one of 8000, 12000, 16000,
+  *                                24000, or 48000.
+  * @param channels <tt>int</tt>: Number of channels to output.
+  *                               This must be at most 255.
+  *                               It may be different from the number of coded
+  *                               channels (<code>streams +
+  *                               coupled_streams</code>).
+  * @param streams <tt>int</tt>: The total number of streams coded in the
+  *                              input.
+  *                              This must be no more than 255.
+  * @param coupled_streams <tt>int</tt>: Number of streams to decode as coupled
+  *                                      (2 channel) streams.
+  *                                      This must be no larger than the total
+  *                                      number of streams.
+  *                                      Additionally, The total number of
+  *                                      coded channels (<code>streams +
+  *                                      coupled_streams</code>) must be no
+  *                                      more than 255.
+  * @param[in] mapping <code>const unsigned char[channels]</code>: Mapping from
+  *                    coded channels to output channels, as described in
+  *                    @ref opus_multistream.
+  * @param[out] error <tt>int *</tt>: Returns #OPUS_OK on success, or an error
+  *                                   code (see @ref opus_errorcodes) on
+  *                                   failure.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusMSDecoder *opus_multistream_decoder_create(
+      opus_int32 Fs,
+      int channels,
+      int streams,
+      int coupled_streams,
+      const unsigned char *mapping,
+      int *error
+) OPUS_ARG_NONNULL(5);
+
+/** Initialize a previously allocated decoder state object.
+  * The memory pointed to by \a st must be at least the size returned by
+  * opus_multistream_encoder_get_size().
+  * This is intended for applications which use their own allocator instead of
+  * malloc.
+  * To reset a previously initialized state, use the #OPUS_RESET_STATE CTL.
+  * @see opus_multistream_decoder_create
+  * @see opus_multistream_deocder_get_size
+  * @param st <tt>OpusMSEncoder*</tt>: Multistream encoder state to initialize.
+  * @param Fs <tt>opus_int32</tt>: Sampling rate to decode at (in Hz).
+  *                                This must be one of 8000, 12000, 16000,
+  *                                24000, or 48000.
+  * @param channels <tt>int</tt>: Number of channels to output.
+  *                               This must be at most 255.
+  *                               It may be different from the number of coded
+  *                               channels (<code>streams +
+  *                               coupled_streams</code>).
+  * @param streams <tt>int</tt>: The total number of streams coded in the
+  *                              input.
+  *                              This must be no more than 255.
+  * @param coupled_streams <tt>int</tt>: Number of streams to decode as coupled
+  *                                      (2 channel) streams.
+  *                                      This must be no larger than the total
+  *                                      number of streams.
+  *                                      Additionally, The total number of
+  *                                      coded channels (<code>streams +
+  *                                      coupled_streams</code>) must be no
+  *                                      more than 255.
+  * @param[in] mapping <code>const unsigned char[channels]</code>: Mapping from
+  *                    coded channels to output channels, as described in
+  *                    @ref opus_multistream.
+  * @returns #OPUS_OK on success, or an error code (see @ref opus_errorcodes)
+  *          on failure.
+  */
+OPUS_EXPORT int opus_multistream_decoder_init(
+      OpusMSDecoder *st,
+      opus_int32 Fs,
+      int channels,
+      int streams,
+      int coupled_streams,
+      const unsigned char *mapping
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(6);
+
+/** Decode a multistream Opus packet.
+  * @param st <tt>OpusMSDecoder*</tt>: Multistream decoder state.
+  * @param[in] data <tt>const unsigned char*</tt>: Input payload.
+  *                                                Use a <code>NULL</code>
+  *                                                pointer to indicate packet
+  *                                                loss.
+  * @param len <tt>opus_int32</tt>: Number of bytes in payload.
+  * @param[out] pcm <tt>opus_int16*</tt>: Output signal, with interleaved
+  *                                       samples.
+  *                                       This must contain room for
+  *                                       <code>frame_size*channels</code>
+  *                                       samples.
+  * @param frame_size <tt>int</tt>: The number of samples per channel of
+  *                                 available space in \a pcm.
+  *                                 If this is less than the maximum packet duration
+  *                                 (120 ms; 5760 for 48kHz), this function will not be capable
+  *                                 of decoding some packets. In the case of PLC (data==NULL)
+  *                                 or FEC (decode_fec=1), then frame_size needs to be exactly
+  *                                 the duration of audio that is missing, otherwise the
+  *                                 decoder will not be in the optimal state to decode the
+  *                                 next incoming packet. For the PLC and FEC cases, frame_size
+  *                                 <b>must</b> be a multiple of 2.5 ms.
+  * @param decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band
+  *                                 forward error correction data be decoded.
+  *                                 If no such data is available, the frame is
+  *                                 decoded as if it were lost.
+  * @returns Number of samples decoded on success or a negative error code
+  *          (see @ref opus_errorcodes) on failure.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_multistream_decode(
+    OpusMSDecoder *st,
+    const unsigned char *data,
+    opus_int32 len,
+    opus_int16 *pcm,
+    int frame_size,
+    int decode_fec
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
+
+/** Decode a multistream Opus packet.
+  * @param st <tt>OpusMSDecoder*</tt>: Multistream decoder state.
+  * @param[in] data <tt>const unsigned char*</tt>: Input payload.
+  *                                                Use a <code>NULL</code>
+  *                                                pointer to indicate packet
+  *                                                loss.
+  * @param len <tt>opus_int32</tt>: Number of bytes in payload.
+  * @param[out] pcm <tt>opus_int32*</tt>: Output signal, with interleaved
+  *                                       samples representing (or slightly exceeding) 24-bit values.
+  *                                       This must contain room for
+  *                                       <code>frame_size*channels</code>
+  *                                       samples.
+  * @param frame_size <tt>int</tt>: The number of samples per channel of
+  *                                 available space in \a pcm.
+  *                                 If this is less than the maximum packet duration
+  *                                 (120 ms; 5760 for 48kHz), this function will not be capable
+  *                                 of decoding some packets. In the case of PLC (data==NULL)
+  *                                 or FEC (decode_fec=1), then frame_size needs to be exactly
+  *                                 the duration of audio that is missing, otherwise the
+  *                                 decoder will not be in the optimal state to decode the
+  *                                 next incoming packet. For the PLC and FEC cases, frame_size
+  *                                 <b>must</b> be a multiple of 2.5 ms.
+  * @param decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band
+  *                                 forward error correction data be decoded.
+  *                                 If no such data is available, the frame is
+  *                                 decoded as if it were lost.
+  * @returns Number of samples decoded on success or a negative error code
+  *          (see @ref opus_errorcodes) on failure.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_multistream_decode24(
+    OpusMSDecoder *st,
+    const unsigned char *data,
+    opus_int32 len,
+    opus_int32 *pcm,
+    int frame_size,
+    int decode_fec
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
+
+/** Decode a multistream Opus packet with floating point output.
+  * @param st <tt>OpusMSDecoder*</tt>: Multistream decoder state.
+  * @param[in] data <tt>const unsigned char*</tt>: Input payload.
+  *                                                Use a <code>NULL</code>
+  *                                                pointer to indicate packet
+  *                                                loss.
+  * @param len <tt>opus_int32</tt>: Number of bytes in payload.
+  * @param[out] pcm <tt>opus_int16*</tt>: Output signal, with interleaved
+  *                                       samples.
+  *                                       This must contain room for
+  *                                       <code>frame_size*channels</code>
+  *                                       samples.
+  * @param frame_size <tt>int</tt>: The number of samples per channel of
+  *                                 available space in \a pcm.
+  *                                 If this is less than the maximum packet duration
+  *                                 (120 ms; 5760 for 48kHz), this function will not be capable
+  *                                 of decoding some packets. In the case of PLC (data==NULL)
+  *                                 or FEC (decode_fec=1), then frame_size needs to be exactly
+  *                                 the duration of audio that is missing, otherwise the
+  *                                 decoder will not be in the optimal state to decode the
+  *                                 next incoming packet. For the PLC and FEC cases, frame_size
+  *                                 <b>must</b> be a multiple of 2.5 ms.
+  * @param decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band
+  *                                 forward error correction data be decoded.
+  *                                 If no such data is available, the frame is
+  *                                 decoded as if it were lost.
+  * @returns Number of samples decoded on success or a negative error code
+  *          (see @ref opus_errorcodes) on failure.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_multistream_decode_float(
+    OpusMSDecoder *st,
+    const unsigned char *data,
+    opus_int32 len,
+    float *pcm,
+    int frame_size,
+    int decode_fec
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
+
+/** Perform a CTL function on a multistream Opus decoder.
+  *
+  * Generally the request and subsequent arguments are generated by a
+  * convenience macro.
+  * @param st <tt>OpusMSDecoder*</tt>: Multistream decoder state.
+  * @param request This and all remaining parameters should be replaced by one
+  *                of the convenience macros in @ref opus_genericctls,
+  *                @ref opus_decoderctls, or @ref opus_multistream_ctls.
+  * @see opus_genericctls
+  * @see opus_decoderctls
+  * @see opus_multistream_ctls
+  */
+OPUS_EXPORT int opus_multistream_decoder_ctl(OpusMSDecoder *st, int request, ...) OPUS_ARG_NONNULL(1);
+
+/** Frees an <code>OpusMSDecoder</code> allocated by
+  * opus_multistream_decoder_create().
+  * @param st <tt>OpusMSDecoder</tt>: Multistream decoder state to be freed.
+  */
+OPUS_EXPORT void opus_multistream_decoder_destroy(OpusMSDecoder *st);
+
+/**@}*/
+
+/**@}*/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* OPUS_MULTISTREAM_H */
diff --git a/sdk/include/opus/opus_projection.h b/sdk/include/opus/opus_projection.h
new file mode 100644
index 00000000000..76c75e564cc
--- /dev/null
+++ b/sdk/include/opus/opus_projection.h
@@ -0,0 +1,643 @@
+/* Copyright (c) 2017 Google Inc.
+   Written by Andrew Allen */
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/**
+ * @file opus_projection.h
+ * @brief Opus projection reference API
+ */
+
+#ifndef OPUS_PROJECTION_H
+#define OPUS_PROJECTION_H
+
+#include "opus_multistream.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @cond OPUS_INTERNAL_DOC */
+
+/** These are the actual encoder and decoder CTL ID numbers.
+  * They should not be used directly by applications.c
+  * In general, SETs should be even and GETs should be odd.*/
+/**@{*/
+#define OPUS_PROJECTION_GET_DEMIXING_MATRIX_GAIN_REQUEST    6001
+#define OPUS_PROJECTION_GET_DEMIXING_MATRIX_SIZE_REQUEST    6003
+#define OPUS_PROJECTION_GET_DEMIXING_MATRIX_REQUEST         6005
+/**@}*/
+
+
+/** @endcond */
+
+/** @defgroup opus_projection_ctls Projection specific encoder and decoder CTLs
+  *
+  * These are convenience macros that are specific to the
+  * opus_projection_encoder_ctl() and opus_projection_decoder_ctl()
+  * interface.
+  * The CTLs from @ref opus_genericctls, @ref opus_encoderctls,
+  * @ref opus_decoderctls, and @ref opus_multistream_ctls may be applied to a
+  * projection encoder or decoder as well.
+  */
+/**@{*/
+
+/** Gets the gain (in dB. S7.8-format) of the demixing matrix from the encoder.
+  * @param[out] x <tt>opus_int32 *</tt>: Returns the gain (in dB. S7.8-format)
+  *                                      of the demixing matrix.
+  * @hideinitializer
+  */
+#define OPUS_PROJECTION_GET_DEMIXING_MATRIX_GAIN(x) OPUS_PROJECTION_GET_DEMIXING_MATRIX_GAIN_REQUEST, __opus_check_int_ptr(x)
+
+
+/** Gets the size in bytes of the demixing matrix from the encoder.
+  * @param[out] x <tt>opus_int32 *</tt>: Returns the size in bytes of the
+  *                                      demixing matrix.
+  * @hideinitializer
+  */
+#define OPUS_PROJECTION_GET_DEMIXING_MATRIX_SIZE(x) OPUS_PROJECTION_GET_DEMIXING_MATRIX_SIZE_REQUEST, __opus_check_int_ptr(x)
+
+
+/** Copies the demixing matrix to the supplied pointer location.
+  * @param[out] x <tt>unsigned char *</tt>: Returns the demixing matrix to the
+  *                                         supplied pointer location.
+  * @param y <tt>opus_int32</tt>: The size in bytes of the reserved memory at the
+  *                              pointer location.
+  * @hideinitializer
+  */
+#define OPUS_PROJECTION_GET_DEMIXING_MATRIX(x,y) OPUS_PROJECTION_GET_DEMIXING_MATRIX_REQUEST, x, __opus_check_int(y)
+
+
+/**@}*/
+
+/** Opus projection encoder state.
+ * This contains the complete state of a projection Opus encoder.
+ * It is position independent and can be freely copied.
+ * @see opus_projection_ambisonics_encoder_create
+ */
+typedef struct OpusProjectionEncoder OpusProjectionEncoder;
+
+
+/** Opus projection decoder state.
+  * This contains the complete state of a projection Opus decoder.
+  * It is position independent and can be freely copied.
+  * @see opus_projection_decoder_create
+  * @see opus_projection_decoder_init
+  */
+typedef struct OpusProjectionDecoder OpusProjectionDecoder;
+
+
+/**\name Projection encoder functions */
+/**@{*/
+
+/** Gets the size of an OpusProjectionEncoder structure.
+  * @param channels <tt>int</tt>: The total number of input channels to encode.
+  *                               This must be no more than 255.
+  * @param mapping_family <tt>int</tt>: The mapping family to use for selecting
+  *                                     the appropriate projection.
+  * @returns The size in bytes on success, or a negative error code
+  *          (see @ref opus_errorcodes) on error.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_projection_ambisonics_encoder_get_size(
+    int channels,
+    int mapping_family
+);
+
+
+/** Allocates and initializes a projection encoder state.
+  * Call opus_projection_encoder_destroy() to release
+  * this object when finished.
+  * @param Fs <tt>opus_int32</tt>: Sampling rate of the input signal (in Hz).
+  *                                This must be one of 8000, 12000, 16000,
+  *                                24000, or 48000.
+  * @param channels <tt>int</tt>: Number of channels in the input signal.
+  *                               This must be at most 255.
+  *                               It may be greater than the number of
+  *                               coded channels (<code>streams +
+  *                               coupled_streams</code>).
+  * @param mapping_family <tt>int</tt>: The mapping family to use for selecting
+  *                                     the appropriate projection.
+  * @param[out] streams <tt>int *</tt>: The total number of streams that will
+  *                                     be encoded from the input.
+  * @param[out] coupled_streams <tt>int *</tt>: Number of coupled (2 channel)
+  *                                 streams that will be encoded from the input.
+  * @param application <tt>int</tt>: The target encoder application.
+  *                                  This must be one of the following:
+  * <dl>
+  * <dt>#OPUS_APPLICATION_VOIP</dt>
+  * <dd>Process signal for improved speech intelligibility.</dd>
+  * <dt>#OPUS_APPLICATION_AUDIO</dt>
+  * <dd>Favor faithfulness to the original input.</dd>
+  * <dt>#OPUS_APPLICATION_RESTRICTED_LOWDELAY</dt>
+  * <dd>Configure the minimum possible coding delay by disabling certain modes
+  * of operation.</dd>
+  * </dl>
+  * @param[out] error <tt>int *</tt>: Returns #OPUS_OK on success, or an error
+  *                                   code (see @ref opus_errorcodes) on
+  *                                   failure.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusProjectionEncoder *opus_projection_ambisonics_encoder_create(
+    opus_int32 Fs,
+    int channels,
+    int mapping_family,
+    int *streams,
+    int *coupled_streams,
+    int application,
+    int *error
+) OPUS_ARG_NONNULL(4) OPUS_ARG_NONNULL(5);
+
+
+/** Initialize a previously allocated projection encoder state.
+  * The memory pointed to by \a st must be at least the size returned by
+  * opus_projection_ambisonics_encoder_get_size().
+  * This is intended for applications which use their own allocator instead of
+  * malloc.
+  * To reset a previously initialized state, use the #OPUS_RESET_STATE CTL.
+  * @see opus_projection_ambisonics_encoder_create
+  * @see opus_projection_ambisonics_encoder_get_size
+  * @param st <tt>OpusProjectionEncoder*</tt>: Projection encoder state to initialize.
+  * @param Fs <tt>opus_int32</tt>: Sampling rate of the input signal (in Hz).
+  *                                This must be one of 8000, 12000, 16000,
+  *                                24000, or 48000.
+  * @param channels <tt>int</tt>: Number of channels in the input signal.
+  *                               This must be at most 255.
+  *                               It may be greater than the number of
+  *                               coded channels (<code>streams +
+  *                               coupled_streams</code>).
+  * @param streams <tt>int</tt>: The total number of streams to encode from the
+  *                              input.
+  *                              This must be no more than the number of channels.
+  * @param coupled_streams <tt>int</tt>: Number of coupled (2 channel) streams
+  *                                      to encode.
+  *                                      This must be no larger than the total
+  *                                      number of streams.
+  *                                      Additionally, The total number of
+  *                                      encoded channels (<code>streams +
+  *                                      coupled_streams</code>) must be no
+  *                                      more than the number of input channels.
+  * @param application <tt>int</tt>: The target encoder application.
+  *                                  This must be one of the following:
+  * <dl>
+  * <dt>#OPUS_APPLICATION_VOIP</dt>
+  * <dd>Process signal for improved speech intelligibility.</dd>
+  * <dt>#OPUS_APPLICATION_AUDIO</dt>
+  * <dd>Favor faithfulness to the original input.</dd>
+  * <dt>#OPUS_APPLICATION_RESTRICTED_LOWDELAY</dt>
+  * <dd>Configure the minimum possible coding delay by disabling certain modes
+  * of operation.</dd>
+  * </dl>
+  * @returns #OPUS_OK on success, or an error code (see @ref opus_errorcodes)
+  *          on failure.
+  */
+OPUS_EXPORT int opus_projection_ambisonics_encoder_init(
+    OpusProjectionEncoder *st,
+    opus_int32 Fs,
+    int channels,
+    int mapping_family,
+    int *streams,
+    int *coupled_streams,
+    int application
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(5) OPUS_ARG_NONNULL(6);
+
+
+/** Encodes a projection Opus frame.
+  * @param st <tt>OpusProjectionEncoder*</tt>: Projection encoder state.
+  * @param[in] pcm <tt>const opus_int16*</tt>: The input signal as interleaved
+  *                                            samples.
+  *                                            This must contain
+  *                                            <code>frame_size*channels</code>
+  *                                            samples.
+  * @param frame_size <tt>int</tt>: Number of samples per channel in the input
+  *                                 signal.
+  *                                 This must be an Opus frame size for the
+  *                                 encoder's sampling rate.
+  *                                 For example, at 48 kHz the permitted values
+  *                                 are 120, 240, 480, 960, 1920, and 2880.
+  *                                 Passing in a duration of less than 10 ms
+  *                                 (480 samples at 48 kHz) will prevent the
+  *                                 encoder from using the LPC or hybrid modes.
+  * @param[out] data <tt>unsigned char*</tt>: Output payload.
+  *                                           This must contain storage for at
+  *                                           least \a max_data_bytes.
+  * @param [in] max_data_bytes <tt>opus_int32</tt>: Size of the allocated
+  *                                                 memory for the output
+  *                                                 payload. This may be
+  *                                                 used to impose an upper limit on
+  *                                                 the instant bitrate, but should
+  *                                                 not be used as the only bitrate
+  *                                                 control. Use #OPUS_SET_BITRATE to
+  *                                                 control the bitrate.
+  * @returns The length of the encoded packet (in bytes) on success or a
+  *          negative error code (see @ref opus_errorcodes) on failure.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_projection_encode(
+    OpusProjectionEncoder *st,
+    const opus_int16 *pcm,
+    int frame_size,
+    unsigned char *data,
+    opus_int32 max_data_bytes
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
+
+/** Encodes a projection Opus frame.
+  * @param st <tt>OpusProjectionEncoder*</tt>: Projection encoder state.
+  * @param[in] pcm <tt>const opus_int32*</tt>: The input signal as interleaved
+  *                                            samples representing (or slightly exceeding) 24-bit values.
+  *                                            This must contain
+  *                                            <code>frame_size*channels</code>
+  *                                            samples.
+  * @param frame_size <tt>int</tt>: Number of samples per channel in the input
+  *                                 signal.
+  *                                 This must be an Opus frame size for the
+  *                                 encoder's sampling rate.
+  *                                 For example, at 48 kHz the permitted values
+  *                                 are 120, 240, 480, 960, 1920, and 2880.
+  *                                 Passing in a duration of less than 10 ms
+  *                                 (480 samples at 48 kHz) will prevent the
+  *                                 encoder from using the LPC or hybrid modes.
+  * @param[out] data <tt>unsigned char*</tt>: Output payload.
+  *                                           This must contain storage for at
+  *                                           least \a max_data_bytes.
+  * @param [in] max_data_bytes <tt>opus_int32</tt>: Size of the allocated
+  *                                                 memory for the output
+  *                                                 payload. This may be
+  *                                                 used to impose an upper limit on
+  *                                                 the instant bitrate, but should
+  *                                                 not be used as the only bitrate
+  *                                                 control. Use #OPUS_SET_BITRATE to
+  *                                                 control the bitrate.
+  * @returns The length of the encoded packet (in bytes) on success or a
+  *          negative error code (see @ref opus_errorcodes) on failure.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_projection_encode24(
+    OpusProjectionEncoder *st,
+    const opus_int32 *pcm,
+    int frame_size,
+    unsigned char *data,
+    opus_int32 max_data_bytes
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
+
+
+/** Encodes a projection Opus frame from floating point input.
+  * @param st <tt>OpusProjectionEncoder*</tt>: Projection encoder state.
+  * @param[in] pcm <tt>const float*</tt>: The input signal as interleaved
+  *                                       samples with a normal range of
+  *                                       +/-1.0.
+  *                                       Samples with a range beyond +/-1.0
+  *                                       are supported but will be clipped by
+  *                                       decoders using the integer API and
+  *                                       should only be used if it is known
+  *                                       that the far end supports extended
+  *                                       dynamic range.
+  *                                       This must contain
+  *                                       <code>frame_size*channels</code>
+  *                                       samples.
+  * @param frame_size <tt>int</tt>: Number of samples per channel in the input
+  *                                 signal.
+  *                                 This must be an Opus frame size for the
+  *                                 encoder's sampling rate.
+  *                                 For example, at 48 kHz the permitted values
+  *                                 are 120, 240, 480, 960, 1920, and 2880.
+  *                                 Passing in a duration of less than 10 ms
+  *                                 (480 samples at 48 kHz) will prevent the
+  *                                 encoder from using the LPC or hybrid modes.
+  * @param[out] data <tt>unsigned char*</tt>: Output payload.
+  *                                           This must contain storage for at
+  *                                           least \a max_data_bytes.
+  * @param [in] max_data_bytes <tt>opus_int32</tt>: Size of the allocated
+  *                                                 memory for the output
+  *                                                 payload. This may be
+  *                                                 used to impose an upper limit on
+  *                                                 the instant bitrate, but should
+  *                                                 not be used as the only bitrate
+  *                                                 control. Use #OPUS_SET_BITRATE to
+  *                                                 control the bitrate.
+  * @returns The length of the encoded packet (in bytes) on success or a
+  *          negative error code (see @ref opus_errorcodes) on failure.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_projection_encode_float(
+    OpusProjectionEncoder *st,
+    const float *pcm,
+    int frame_size,
+    unsigned char *data,
+    opus_int32 max_data_bytes
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
+
+
+/** Frees an <code>OpusProjectionEncoder</code> allocated by
+  * opus_projection_ambisonics_encoder_create().
+  * @param st <tt>OpusProjectionEncoder*</tt>: Projection encoder state to be freed.
+  */
+OPUS_EXPORT void opus_projection_encoder_destroy(OpusProjectionEncoder *st);
+
+
+/** Perform a CTL function on a projection Opus encoder.
+  *
+  * Generally the request and subsequent arguments are generated by a
+  * convenience macro.
+  * @param st <tt>OpusProjectionEncoder*</tt>: Projection encoder state.
+  * @param request This and all remaining parameters should be replaced by one
+  *                of the convenience macros in @ref opus_genericctls,
+  *                @ref opus_encoderctls, @ref opus_multistream_ctls, or
+  *                @ref opus_projection_ctls
+  * @see opus_genericctls
+  * @see opus_encoderctls
+  * @see opus_multistream_ctls
+  * @see opus_projection_ctls
+  */
+OPUS_EXPORT int opus_projection_encoder_ctl(OpusProjectionEncoder *st, int request, ...) OPUS_ARG_NONNULL(1);
+
+
+/**@}*/
+
+/**\name Projection decoder functions */
+/**@{*/
+
+/** Gets the size of an <code>OpusProjectionDecoder</code> structure.
+  * @param channels <tt>int</tt>: The total number of output channels.
+  *                               This must be no more than 255.
+  * @param streams <tt>int</tt>: The total number of streams coded in the
+  *                              input.
+  *                              This must be no more than 255.
+  * @param coupled_streams <tt>int</tt>: Number streams to decode as coupled
+  *                                      (2 channel) streams.
+  *                                      This must be no larger than the total
+  *                                      number of streams.
+  *                                      Additionally, The total number of
+  *                                      coded channels (<code>streams +
+  *                                      coupled_streams</code>) must be no
+  *                                      more than 255.
+  * @returns The size in bytes on success, or a negative error code
+  *          (see @ref opus_errorcodes) on error.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_projection_decoder_get_size(
+    int channels,
+    int streams,
+    int coupled_streams
+);
+
+
+/** Allocates and initializes a projection decoder state.
+  * Call opus_projection_decoder_destroy() to release
+  * this object when finished.
+  * @param Fs <tt>opus_int32</tt>: Sampling rate to decode at (in Hz).
+  *                                This must be one of 8000, 12000, 16000,
+  *                                24000, or 48000.
+  * @param channels <tt>int</tt>: Number of channels to output.
+  *                               This must be at most 255.
+  *                               It may be different from the number of coded
+  *                               channels (<code>streams +
+  *                               coupled_streams</code>).
+  * @param streams <tt>int</tt>: The total number of streams coded in the
+  *                              input.
+  *                              This must be no more than 255.
+  * @param coupled_streams <tt>int</tt>: Number of streams to decode as coupled
+  *                                      (2 channel) streams.
+  *                                      This must be no larger than the total
+  *                                      number of streams.
+  *                                      Additionally, The total number of
+  *                                      coded channels (<code>streams +
+  *                                      coupled_streams</code>) must be no
+  *                                      more than 255.
+  * @param[in] demixing_matrix <tt>const unsigned char[demixing_matrix_size]</tt>: Demixing matrix
+  *                         that mapping from coded channels to output channels,
+  *                         as described in @ref opus_projection and
+  *                         @ref opus_projection_ctls.
+  * @param demixing_matrix_size <tt>opus_int32</tt>: The size in bytes of the
+  *                                                  demixing matrix, as
+  *                                                  described in @ref
+  *                                                  opus_projection_ctls.
+  * @param[out] error <tt>int *</tt>: Returns #OPUS_OK on success, or an error
+  *                                   code (see @ref opus_errorcodes) on
+  *                                   failure.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusProjectionDecoder *opus_projection_decoder_create(
+    opus_int32 Fs,
+    int channels,
+    int streams,
+    int coupled_streams,
+    unsigned char *demixing_matrix,
+    opus_int32 demixing_matrix_size,
+    int *error
+) OPUS_ARG_NONNULL(5);
+
+
+/** Initialize a previously allocated projection decoder state object.
+  * The memory pointed to by \a st must be at least the size returned by
+  * opus_projection_decoder_get_size().
+  * This is intended for applications which use their own allocator instead of
+  * malloc.
+  * To reset a previously initialized state, use the #OPUS_RESET_STATE CTL.
+  * @see opus_projection_decoder_create
+  * @see opus_projection_deocder_get_size
+  * @param st <tt>OpusProjectionDecoder*</tt>: Projection encoder state to initialize.
+  * @param Fs <tt>opus_int32</tt>: Sampling rate to decode at (in Hz).
+  *                                This must be one of 8000, 12000, 16000,
+  *                                24000, or 48000.
+  * @param channels <tt>int</tt>: Number of channels to output.
+  *                               This must be at most 255.
+  *                               It may be different from the number of coded
+  *                               channels (<code>streams +
+  *                               coupled_streams</code>).
+  * @param streams <tt>int</tt>: The total number of streams coded in the
+  *                              input.
+  *                              This must be no more than 255.
+  * @param coupled_streams <tt>int</tt>: Number of streams to decode as coupled
+  *                                      (2 channel) streams.
+  *                                      This must be no larger than the total
+  *                                      number of streams.
+  *                                      Additionally, The total number of
+  *                                      coded channels (<code>streams +
+  *                                      coupled_streams</code>) must be no
+  *                                      more than 255.
+  * @param[in] demixing_matrix <tt>const unsigned char[demixing_matrix_size]</tt>: Demixing matrix
+  *                         that mapping from coded channels to output channels,
+  *                         as described in @ref opus_projection and
+  *                         @ref opus_projection_ctls.
+  * @param demixing_matrix_size <tt>opus_int32</tt>: The size in bytes of the
+  *                                                  demixing matrix, as
+  *                                                  described in @ref
+  *                                                  opus_projection_ctls.
+  * @returns #OPUS_OK on success, or an error code (see @ref opus_errorcodes)
+  *          on failure.
+  */
+OPUS_EXPORT int opus_projection_decoder_init(
+    OpusProjectionDecoder *st,
+    opus_int32 Fs,
+    int channels,
+    int streams,
+    int coupled_streams,
+    unsigned char *demixing_matrix,
+    opus_int32 demixing_matrix_size
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(6);
+
+
+/** Decode a projection Opus packet.
+  * @param st <tt>OpusProjectionDecoder*</tt>: Projection decoder state.
+  * @param[in] data <tt>const unsigned char*</tt>: Input payload.
+  *                                                Use a <code>NULL</code>
+  *                                                pointer to indicate packet
+  *                                                loss.
+  * @param len <tt>opus_int32</tt>: Number of bytes in payload.
+  * @param[out] pcm <tt>opus_int16*</tt>: Output signal, with interleaved
+  *                                       samples.
+  *                                       This must contain room for
+  *                                       <code>frame_size*channels</code>
+  *                                       samples.
+  * @param frame_size <tt>int</tt>: The number of samples per channel of
+  *                                 available space in \a pcm.
+  *                                 If this is less than the maximum packet duration
+  *                                 (120 ms; 5760 for 48kHz), this function will not be capable
+  *                                 of decoding some packets. In the case of PLC (data==NULL)
+  *                                 or FEC (decode_fec=1), then frame_size needs to be exactly
+  *                                 the duration of audio that is missing, otherwise the
+  *                                 decoder will not be in the optimal state to decode the
+  *                                 next incoming packet. For the PLC and FEC cases, frame_size
+  *                                 <b>must</b> be a multiple of 2.5 ms.
+  * @param decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band
+  *                                 forward error correction data be decoded.
+  *                                 If no such data is available, the frame is
+  *                                 decoded as if it were lost.
+  * @returns Number of samples decoded on success or a negative error code
+  *          (see @ref opus_errorcodes) on failure.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_projection_decode(
+    OpusProjectionDecoder *st,
+    const unsigned char *data,
+    opus_int32 len,
+    opus_int16 *pcm,
+    int frame_size,
+    int decode_fec
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
+
+/** Decode a projection Opus packet.
+  * @param st <tt>OpusProjectionDecoder*</tt>: Projection decoder state.
+  * @param[in] data <tt>const unsigned char*</tt>: Input payload.
+  *                                                Use a <code>NULL</code>
+  *                                                pointer to indicate packet
+  *                                                loss.
+  * @param len <tt>opus_int32</tt>: Number of bytes in payload.
+  * @param[out] pcm <tt>opus_int32*</tt>: Output signal, with interleaved
+  *                                       samples representing (or slightly exceeding) 24-bit values.
+  *                                       This must contain room for
+  *                                       <code>frame_size*channels</code>
+  *                                       samples.
+  * @param frame_size <tt>int</tt>: The number of samples per channel of
+  *                                 available space in \a pcm.
+  *                                 If this is less than the maximum packet duration
+  *                                 (120 ms; 5760 for 48kHz), this function will not be capable
+  *                                 of decoding some packets. In the case of PLC (data==NULL)
+  *                                 or FEC (decode_fec=1), then frame_size needs to be exactly
+  *                                 the duration of audio that is missing, otherwise the
+  *                                 decoder will not be in the optimal state to decode the
+  *                                 next incoming packet. For the PLC and FEC cases, frame_size
+  *                                 <b>must</b> be a multiple of 2.5 ms.
+  * @param decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band
+  *                                 forward error correction data be decoded.
+  *                                 If no such data is available, the frame is
+  *                                 decoded as if it were lost.
+  * @returns Number of samples decoded on success or a negative error code
+  *          (see @ref opus_errorcodes) on failure.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_projection_decode24(
+    OpusProjectionDecoder *st,
+    const unsigned char *data,
+    opus_int32 len,
+    opus_int32 *pcm,
+    int frame_size,
+    int decode_fec
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
+
+/** Decode a projection Opus packet with floating point output.
+  * @param st <tt>OpusProjectionDecoder*</tt>: Projection decoder state.
+  * @param[in] data <tt>const unsigned char*</tt>: Input payload.
+  *                                                Use a <code>NULL</code>
+  *                                                pointer to indicate packet
+  *                                                loss.
+  * @param len <tt>opus_int32</tt>: Number of bytes in payload.
+  * @param[out] pcm <tt>opus_int16*</tt>: Output signal, with interleaved
+  *                                       samples.
+  *                                       This must contain room for
+  *                                       <code>frame_size*channels</code>
+  *                                       samples.
+  * @param frame_size <tt>int</tt>: The number of samples per channel of
+  *                                 available space in \a pcm.
+  *                                 If this is less than the maximum packet duration
+  *                                 (120 ms; 5760 for 48kHz), this function will not be capable
+  *                                 of decoding some packets. In the case of PLC (data==NULL)
+  *                                 or FEC (decode_fec=1), then frame_size needs to be exactly
+  *                                 the duration of audio that is missing, otherwise the
+  *                                 decoder will not be in the optimal state to decode the
+  *                                 next incoming packet. For the PLC and FEC cases, frame_size
+  *                                 <b>must</b> be a multiple of 2.5 ms.
+  * @param decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band
+  *                                 forward error correction data be decoded.
+  *                                 If no such data is available, the frame is
+  *                                 decoded as if it were lost.
+  * @returns Number of samples decoded on success or a negative error code
+  *          (see @ref opus_errorcodes) on failure.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_projection_decode_float(
+    OpusProjectionDecoder *st,
+    const unsigned char *data,
+    opus_int32 len,
+    float *pcm,
+    int frame_size,
+    int decode_fec
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
+
+
+/** Perform a CTL function on a projection Opus decoder.
+  *
+  * Generally the request and subsequent arguments are generated by a
+  * convenience macro.
+  * @param st <tt>OpusProjectionDecoder*</tt>: Projection decoder state.
+  * @param request This and all remaining parameters should be replaced by one
+  *                of the convenience macros in @ref opus_genericctls,
+  *                @ref opus_decoderctls, @ref opus_multistream_ctls, or
+  *                @ref opus_projection_ctls.
+  * @see opus_genericctls
+  * @see opus_decoderctls
+  * @see opus_multistream_ctls
+  * @see opus_projection_ctls
+  */
+OPUS_EXPORT int opus_projection_decoder_ctl(OpusProjectionDecoder *st, int request, ...) OPUS_ARG_NONNULL(1);
+
+
+/** Frees an <code>OpusProjectionDecoder</code> allocated by
+  * opus_projection_decoder_create().
+  * @param st <tt>OpusProjectionDecoder</tt>: Projection decoder state to be freed.
+  */
+OPUS_EXPORT void opus_projection_decoder_destroy(OpusProjectionDecoder *st);
+
+
+/**@}*/
+
+/**@}*/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* OPUS_PROJECTION_H */
diff --git a/sdk/include/opus/opus_types.h b/sdk/include/opus/opus_types.h
new file mode 100644
index 00000000000..7cf675580ff
--- /dev/null
+++ b/sdk/include/opus/opus_types.h
@@ -0,0 +1,166 @@
+/* (C) COPYRIGHT 1994-2002 Xiph.Org Foundation */
+/* Modified by Jean-Marc Valin */
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+/* opus_types.h based on ogg_types.h from libogg */
+
+/**
+   @file opus_types.h
+   @brief Opus reference implementation types
+*/
+#ifndef OPUS_TYPES_H
+#define OPUS_TYPES_H
+
+#define opus_int         int                     /* used for counters etc; at least 16 bits */
+#define opus_int64       long long
+#define opus_int8        signed char
+
+#define opus_uint        unsigned int            /* used for counters etc; at least 16 bits */
+#define opus_uint64      unsigned long long
+#define opus_uint8       unsigned char
+
+/* Use the real stdint.h if it's there (taken from Paul Hsieh's pstdint.h) */
+#if (defined(__STDC__) && __STDC__ && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || (defined(__GNUC__) && (defined(_STDINT_H) || defined(_STDINT_H_)) || defined (HAVE_STDINT_H))
+#include <stdint.h>
+#  undef opus_int64
+#  undef opus_int8
+#  undef opus_uint64
+#  undef opus_uint8
+   typedef int8_t opus_int8;
+   typedef uint8_t opus_uint8;
+   typedef int16_t opus_int16;
+   typedef uint16_t opus_uint16;
+   typedef int32_t opus_int32;
+   typedef uint32_t opus_uint32;
+   typedef int64_t opus_int64;
+   typedef uint64_t opus_uint64;
+#elif defined(_WIN32)
+
+#  if defined(__CYGWIN__)
+#    include <_G_config.h>
+     typedef _G_int32_t opus_int32;
+     typedef _G_uint32_t opus_uint32;
+     typedef _G_int16 opus_int16;
+     typedef _G_uint16 opus_uint16;
+#  elif defined(__MINGW32__)
+     typedef short opus_int16;
+     typedef unsigned short opus_uint16;
+     typedef int opus_int32;
+     typedef unsigned int opus_uint32;
+#  elif defined(__MWERKS__)
+     typedef int opus_int32;
+     typedef unsigned int opus_uint32;
+     typedef short opus_int16;
+     typedef unsigned short opus_uint16;
+#  else
+     /* MSVC/Borland */
+     typedef __int32 opus_int32;
+     typedef unsigned __int32 opus_uint32;
+     typedef __int16 opus_int16;
+     typedef unsigned __int16 opus_uint16;
+#  endif
+
+#elif defined(__MACOS__)
+
+#  include <sys/types.h>
+   typedef SInt16 opus_int16;
+   typedef UInt16 opus_uint16;
+   typedef SInt32 opus_int32;
+   typedef UInt32 opus_uint32;
+
+#elif (defined(__APPLE__) && defined(__MACH__)) /* MacOS X Framework build */
+
+#  include <sys/types.h>
+   typedef int16_t opus_int16;
+   typedef u_int16_t opus_uint16;
+   typedef int32_t opus_int32;
+   typedef u_int32_t opus_uint32;
+
+#elif defined(__BEOS__)
+
+   /* Be */
+#  include <inttypes.h>
+   typedef int16 opus_int16;
+   typedef u_int16 opus_uint16;
+   typedef int32_t opus_int32;
+   typedef u_int32_t opus_uint32;
+
+#elif defined (__EMX__)
+
+   /* OS/2 GCC */
+   typedef short opus_int16;
+   typedef unsigned short opus_uint16;
+   typedef int opus_int32;
+   typedef unsigned int opus_uint32;
+
+#elif defined (DJGPP)
+
+   /* DJGPP */
+   typedef short opus_int16;
+   typedef unsigned short opus_uint16;
+   typedef int opus_int32;
+   typedef unsigned int opus_uint32;
+
+#elif defined(R5900)
+
+   /* PS2 EE */
+   typedef int opus_int32;
+   typedef unsigned opus_uint32;
+   typedef short opus_int16;
+   typedef unsigned short opus_uint16;
+
+#elif defined(__SYMBIAN32__)
+
+   /* Symbian GCC */
+   typedef signed short opus_int16;
+   typedef unsigned short opus_uint16;
+   typedef signed int opus_int32;
+   typedef unsigned int opus_uint32;
+
+#elif defined(CONFIG_TI_C54X) || defined (CONFIG_TI_C55X)
+
+   typedef short opus_int16;
+   typedef unsigned short opus_uint16;
+   typedef long opus_int32;
+   typedef unsigned long opus_uint32;
+
+#elif defined(CONFIG_TI_C6X)
+
+   typedef short opus_int16;
+   typedef unsigned short opus_uint16;
+   typedef int opus_int32;
+   typedef unsigned int opus_uint32;
+
+#else
+
+   /* Give up, take a reasonable guess */
+   typedef short opus_int16;
+   typedef unsigned short opus_uint16;
+   typedef int opus_int32;
+   typedef unsigned int opus_uint32;
+
+#endif
+
+#endif  /* OPUS_TYPES_H */
diff --git a/sdk/include/speex/speex_echo.h b/sdk/include/speex/speex_echo.h
new file mode 100644
index 00000000000..4c1aa5a5f2a
--- /dev/null
+++ b/sdk/include/speex/speex_echo.h
@@ -0,0 +1,170 @@
+/* Copyright (C) Jean-Marc Valin */
+/**
+   @file speex_echo.h
+   @brief Echo cancellation
+*/
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions are
+   met:
+
+   1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   3. The name of the author may not be used to endorse or promote products
+   derived from this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+   IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+   OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+   DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+   ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef SPEEX_ECHO_H
+#define SPEEX_ECHO_H
+/** @defgroup SpeexEchoState SpeexEchoState: Acoustic echo canceller
+ *  This is the acoustic echo canceller module.
+ *  @{
+ */
+#include "speexdsp_types.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** Obtain frame size used by the AEC */
+#define SPEEX_ECHO_GET_FRAME_SIZE 3
+
+/** Set sampling rate */
+#define SPEEX_ECHO_SET_SAMPLING_RATE 24
+/** Get sampling rate */
+#define SPEEX_ECHO_GET_SAMPLING_RATE 25
+
+/* Can't set window sizes */
+/** Get size of impulse response (int32) */
+#define SPEEX_ECHO_GET_IMPULSE_RESPONSE_SIZE 27
+
+/* Can't set window content */
+/** Get impulse response (int32[]) */
+#define SPEEX_ECHO_GET_IMPULSE_RESPONSE 29
+
+/** Internal echo canceller state. Should never be accessed directly. */
+struct SpeexEchoState_;
+
+/** @class SpeexEchoState
+ * This holds the state of the echo canceller. You need one per channel.
+*/
+
+/** Internal echo canceller state. Should never be accessed directly. */
+typedef struct SpeexEchoState_ SpeexEchoState;
+
+/** Creates a new echo canceller state
+ * @param frame_size Number of samples to process at one time (should correspond to 10-20 ms)
+ * @param filter_length Number of samples of echo to cancel (should generally correspond to 100-500 ms)
+ * @return Newly-created echo canceller state
+ */
+SpeexEchoState *speex_echo_state_init(int frame_size, int filter_length);
+
+/** Creates a new multi-channel echo canceller state
+ * @param frame_size Number of samples to process at one time (should correspond to 10-20 ms)
+ * @param filter_length Number of samples of echo to cancel (should generally correspond to 100-500 ms)
+ * @param nb_mic Number of microphone channels
+ * @param nb_speakers Number of speaker channels
+ * @return Newly-created echo canceller state
+ */
+SpeexEchoState *speex_echo_state_init_mc(int frame_size, int filter_length, int nb_mic, int nb_speakers);
+
+/** Destroys an echo canceller state
+ * @param st Echo canceller state
+*/
+void speex_echo_state_destroy(SpeexEchoState *st);
+
+/** Performs echo cancellation a frame, based on the audio sent to the speaker (no delay is added
+ * to playback in this form)
+ *
+ * @param st Echo canceller state
+ * @param rec Signal from the microphone (near end + far end echo)
+ * @param play Signal played to the speaker (received from far end)
+ * @param out Returns near-end signal with echo removed
+ */
+void speex_echo_cancellation(SpeexEchoState *st, const spx_int16_t *rec, const spx_int16_t *play, spx_int16_t *out);
+
+/** Performs echo cancellation a frame (deprecated) */
+void speex_echo_cancel(SpeexEchoState *st, const spx_int16_t *rec, const spx_int16_t *play, spx_int16_t *out, spx_int32_t *Yout);
+
+/** Perform echo cancellation using internal playback buffer, which is delayed by two frames
+ * to account for the delay introduced by most soundcards (but it could be off!)
+ * @param st Echo canceller state
+ * @param rec Signal from the microphone (near end + far end echo)
+ * @param out Returns near-end signal with echo removed
+*/
+void speex_echo_capture(SpeexEchoState *st, const spx_int16_t *rec, spx_int16_t *out);
+
+/** Let the echo canceller know that a frame was just queued to the soundcard
+ * @param st Echo canceller state
+ * @param play Signal played to the speaker (received from far end)
+*/
+void speex_echo_playback(SpeexEchoState *st, const spx_int16_t *play);
+
+/** Reset the echo canceller to its original state
+ * @param st Echo canceller state
+ */
+void speex_echo_state_reset(SpeexEchoState *st);
+
+/** Used like the ioctl function to control the echo canceller parameters
+ *
+ * @param st Echo canceller state
+ * @param request ioctl-type request (one of the SPEEX_ECHO_* macros)
+ * @param ptr Data exchanged to-from function
+ * @return 0 if no error, -1 if request in unknown
+ */
+int speex_echo_ctl(SpeexEchoState *st, int request, void *ptr);
+
+
+
+struct SpeexDecorrState_;
+
+typedef struct SpeexDecorrState_ SpeexDecorrState;
+
+
+/** Create a state for the channel decorrelation algorithm
+    This is useful for multi-channel echo cancellation only
+ * @param rate Sampling rate
+ * @param channels Number of channels (it's a bit pointless if you don't have at least 2)
+ * @param frame_size Size of the frame to process at ones (counting samples *per* channel)
+*/
+SpeexDecorrState *speex_decorrelate_new(int rate, int channels, int frame_size);
+
+/** Remove correlation between the channels by modifying the phase and possibly
+    adding noise in a way that is not (or little) perceptible.
+ * @param st Decorrelator state
+ * @param in Input audio in interleaved format
+ * @param out Result of the decorrelation (out *may* alias in)
+ * @param strength How much alteration of the audio to apply from 0 to 100.
+*/
+void speex_decorrelate(SpeexDecorrState *st, const spx_int16_t *in, spx_int16_t *out, int strength);
+
+/** Destroy a Decorrelation state
+ * @param st State to destroy
+*/
+void speex_decorrelate_destroy(SpeexDecorrState *st);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+/** @}*/
+#endif
diff --git a/sdk/include/speex/speex_jitter.h b/sdk/include/speex/speex_jitter.h
new file mode 100644
index 00000000000..8fc8d7ec66b
--- /dev/null
+++ b/sdk/include/speex/speex_jitter.h
@@ -0,0 +1,197 @@
+/* Copyright (C) 2002 Jean-Marc Valin */
+/**
+   @file speex_jitter.h
+   @brief Adaptive jitter buffer for Speex
+*/
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   - Neither the name of the Xiph.org Foundation nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef SPEEX_JITTER_H
+#define SPEEX_JITTER_H
+/** @defgroup JitterBuffer JitterBuffer: Adaptive jitter buffer
+ *  This is the jitter buffer that reorders UDP/RTP packets and adjusts the buffer size
+ * to maintain good quality and low latency.
+ *  @{
+ */
+
+#include "speexdsp_types.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** Generic adaptive jitter buffer state */
+struct JitterBuffer_;
+
+/** Generic adaptive jitter buffer state */
+typedef struct JitterBuffer_ JitterBuffer;
+
+/** Definition of an incoming packet */
+typedef struct _JitterBufferPacket JitterBufferPacket;
+
+/** Definition of an incoming packet */
+struct _JitterBufferPacket {
+   char        *data;       /**< Data bytes contained in the packet */
+   spx_uint32_t len;        /**< Length of the packet in bytes */
+   spx_uint32_t timestamp;  /**< Timestamp for the packet */
+   spx_uint32_t span;       /**< Time covered by the packet (same units as timestamp) */
+   spx_uint16_t sequence;   /**< RTP Sequence number if available (0 otherwise) */
+   spx_uint32_t user_data;  /**< Put whatever data you like here (it's ignored by the jitter buffer) */
+};
+
+/** Packet has been retrieved */
+#define JITTER_BUFFER_OK 0
+/** Packet is lost or is late */
+#define JITTER_BUFFER_MISSING 1
+/** A "fake" packet is meant to be inserted here to increase buffering */
+#define JITTER_BUFFER_INSERTION 2
+/** There was an error in the jitter buffer */
+#define JITTER_BUFFER_INTERNAL_ERROR -1
+/** Invalid argument */
+#define JITTER_BUFFER_BAD_ARGUMENT -2
+
+
+/** Set minimum amount of extra buffering required (margin) */
+#define JITTER_BUFFER_SET_MARGIN 0
+/** Get minimum amount of extra buffering required (margin) */
+#define JITTER_BUFFER_GET_MARGIN 1
+/* JITTER_BUFFER_SET_AVAILABLE_COUNT wouldn't make sense */
+
+/** Get the amount of available packets currently buffered */
+#define JITTER_BUFFER_GET_AVAILABLE_COUNT 3
+/** Included because of an early misspelling (will remove in next release) */
+#define JITTER_BUFFER_GET_AVALIABLE_COUNT 3
+
+/** Assign a function to destroy unused packet. When setting that, the jitter
+    buffer no longer copies packet data. */
+#define JITTER_BUFFER_SET_DESTROY_CALLBACK 4
+/**  */
+#define JITTER_BUFFER_GET_DESTROY_CALLBACK 5
+
+/** Tell the jitter buffer to only adjust the delay in multiples of the step parameter provided */
+#define JITTER_BUFFER_SET_DELAY_STEP 6
+/**  */
+#define JITTER_BUFFER_GET_DELAY_STEP 7
+
+/** Tell the jitter buffer to only do concealment in multiples of the size parameter provided */
+#define JITTER_BUFFER_SET_CONCEALMENT_SIZE 8
+#define JITTER_BUFFER_GET_CONCEALMENT_SIZE 9
+
+/** Absolute max amount of loss that can be tolerated regardless of the delay. Typical loss
+    should be half of that or less. */
+#define JITTER_BUFFER_SET_MAX_LATE_RATE 10
+#define JITTER_BUFFER_GET_MAX_LATE_RATE 11
+
+/** Equivalent cost of one percent late packet in timestamp units */
+#define JITTER_BUFFER_SET_LATE_COST 12
+#define JITTER_BUFFER_GET_LATE_COST 13
+
+
+/** Initialises jitter buffer
+ *
+ * @param step_size Starting value for the size of concleanment packets and delay
+       adjustment steps. Can be changed at any time using JITTER_BUFFER_SET_DELAY_STEP
+       and JITTER_BUFFER_GET_CONCEALMENT_SIZE.
+ * @return Newly created jitter buffer state
+ */
+JitterBuffer *jitter_buffer_init(int step_size);
+
+/** Restores jitter buffer to its original state
+ *
+ * @param jitter Jitter buffer state
+ */
+void jitter_buffer_reset(JitterBuffer *jitter);
+
+/** Destroys jitter buffer
+ *
+ * @param jitter Jitter buffer state
+ */
+void jitter_buffer_destroy(JitterBuffer *jitter);
+
+/** Put one packet into the jitter buffer
+ *
+ * @param jitter Jitter buffer state
+ * @param packet Incoming packet
+*/
+void jitter_buffer_put(JitterBuffer *jitter, const JitterBufferPacket *packet);
+
+/** Get one packet from the jitter buffer
+ *
+ * @param jitter Jitter buffer state
+ * @param packet Returned packet
+ * @param desired_span Number of samples (or units) we wish to get from the buffer (no guarantee)
+ * @param current_timestamp Timestamp for the returned packet
+*/
+int jitter_buffer_get(JitterBuffer *jitter, JitterBufferPacket *packet, spx_int32_t desired_span, spx_int32_t *start_offset);
+
+/** Used right after jitter_buffer_get() to obtain another packet that would have the same timestamp.
+ * This is mainly useful for media where a single "frame" can be split into several packets.
+ *
+ * @param jitter Jitter buffer state
+ * @param packet Returned packet
+ */
+int jitter_buffer_get_another(JitterBuffer *jitter, JitterBufferPacket *packet);
+
+/** Get pointer timestamp of jitter buffer
+ *
+ * @param jitter Jitter buffer state
+*/
+int jitter_buffer_get_pointer_timestamp(JitterBuffer *jitter);
+
+/** Advance by one tick
+ *
+ * @param jitter Jitter buffer state
+*/
+void jitter_buffer_tick(JitterBuffer *jitter);
+
+/** Telling the jitter buffer about the remaining data in the application buffer
+ * @param jitter Jitter buffer state
+ * @param rem Amount of data buffered by the application (timestamp units)
+ */
+void jitter_buffer_remaining_span(JitterBuffer *jitter, spx_uint32_t rem);
+
+/** Used like the ioctl function to control the jitter buffer parameters
+ *
+ * @param jitter Jitter buffer state
+ * @param request ioctl-type request (one of the JITTER_BUFFER_* macros)
+ * @param ptr Data exchanged to-from function
+ * @return 0 if no error, -1 if request in unknown
+*/
+int jitter_buffer_ctl(JitterBuffer *jitter, int request, void *ptr);
+
+int jitter_buffer_update_delay(JitterBuffer *jitter, JitterBufferPacket *packet, spx_int32_t *start_offset);
+
+/* @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/sdk/include/speex/speex_preprocess.h b/sdk/include/speex/speex_preprocess.h
new file mode 100644
index 00000000000..a2e1210d412
--- /dev/null
+++ b/sdk/include/speex/speex_preprocess.h
@@ -0,0 +1,219 @@
+/* Copyright (C) 2003 Epic Games
+   Written by Jean-Marc Valin */
+/**
+ *  @file speex_preprocess.h
+ *  @brief Speex preprocessor. The preprocess can do noise suppression,
+ * residual echo suppression (after using the echo canceller), automatic
+ * gain control (AGC) and voice activity detection (VAD).
+*/
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions are
+   met:
+
+   1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   3. The name of the author may not be used to endorse or promote products
+   derived from this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+   IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+   OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+   DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+   ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef SPEEX_PREPROCESS_H
+#define SPEEX_PREPROCESS_H
+/** @defgroup SpeexPreprocessState SpeexPreprocessState: The Speex preprocessor
+ *  This is the Speex preprocessor. The preprocess can do noise suppression,
+ * residual echo suppression (after using the echo canceller), automatic
+ * gain control (AGC) and voice activity detection (VAD).
+ *  @{
+ */
+
+#include "speexdsp_types.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** State of the preprocessor (one per channel). Should never be accessed directly. */
+struct SpeexPreprocessState_;
+
+/** State of the preprocessor (one per channel). Should never be accessed directly. */
+typedef struct SpeexPreprocessState_ SpeexPreprocessState;
+
+
+/** Creates a new preprocessing state. You MUST create one state per channel processed.
+ * @param frame_size Number of samples to process at one time (should correspond to 10-20 ms). Must be
+ * the same value as that used for the echo canceller for residual echo cancellation to work.
+ * @param sampling_rate Sampling rate used for the input.
+ * @return Newly created preprocessor state
+*/
+SpeexPreprocessState *speex_preprocess_state_init(int frame_size, int sampling_rate);
+
+/** Destroys a preprocessor state
+ * @param st Preprocessor state to destroy
+*/
+void speex_preprocess_state_destroy(SpeexPreprocessState *st);
+
+/** Preprocess a frame
+ * @param st Preprocessor state
+ * @param x Audio sample vector (in and out). Must be same size as specified in speex_preprocess_state_init().
+ * @return Bool value for voice activity (1 for speech, 0 for noise/silence), ONLY if VAD turned on.
+*/
+int speex_preprocess_run(SpeexPreprocessState *st, spx_int16_t *x);
+
+/** Preprocess a frame (deprecated, use speex_preprocess_run() instead)*/
+int speex_preprocess(SpeexPreprocessState *st, spx_int16_t *x, spx_int32_t *echo);
+
+/** Update preprocessor state, but do not compute the output
+ * @param st Preprocessor state
+ * @param x Audio sample vector (in only). Must be same size as specified in speex_preprocess_state_init().
+*/
+void speex_preprocess_estimate_update(SpeexPreprocessState *st, spx_int16_t *x);
+
+/** Used like the ioctl function to control the preprocessor parameters
+ * @param st Preprocessor state
+ * @param request ioctl-type request (one of the SPEEX_PREPROCESS_* macros)
+ * @param ptr Data exchanged to-from function
+ * @return 0 if no error, -1 if request in unknown
+*/
+int speex_preprocess_ctl(SpeexPreprocessState *st, int request, void *ptr);
+
+
+
+/** Set preprocessor denoiser state */
+#define SPEEX_PREPROCESS_SET_DENOISE 0
+/** Get preprocessor denoiser state */
+#define SPEEX_PREPROCESS_GET_DENOISE 1
+
+/** Set preprocessor Automatic Gain Control state */
+#define SPEEX_PREPROCESS_SET_AGC 2
+/** Get preprocessor Automatic Gain Control state */
+#define SPEEX_PREPROCESS_GET_AGC 3
+
+/** Set preprocessor Voice Activity Detection state */
+#define SPEEX_PREPROCESS_SET_VAD 4
+/** Get preprocessor Voice Activity Detection state */
+#define SPEEX_PREPROCESS_GET_VAD 5
+
+/** Set preprocessor Automatic Gain Control level (float) */
+#define SPEEX_PREPROCESS_SET_AGC_LEVEL 6
+/** Get preprocessor Automatic Gain Control level (float) */
+#define SPEEX_PREPROCESS_GET_AGC_LEVEL 7
+
+/** Set preprocessor dereverb state */
+#define SPEEX_PREPROCESS_SET_DEREVERB 8
+/** Get preprocessor dereverb state */
+#define SPEEX_PREPROCESS_GET_DEREVERB 9
+
+/** Set preprocessor dereverb level */
+#define SPEEX_PREPROCESS_SET_DEREVERB_LEVEL 10
+/** Get preprocessor dereverb level */
+#define SPEEX_PREPROCESS_GET_DEREVERB_LEVEL 11
+
+/** Set preprocessor dereverb decay */
+#define SPEEX_PREPROCESS_SET_DEREVERB_DECAY 12
+/** Get preprocessor dereverb decay */
+#define SPEEX_PREPROCESS_GET_DEREVERB_DECAY 13
+
+/** Set probability required for the VAD to go from silence to voice */
+#define SPEEX_PREPROCESS_SET_PROB_START 14
+/** Get probability required for the VAD to go from silence to voice */
+#define SPEEX_PREPROCESS_GET_PROB_START 15
+
+/** Set probability required for the VAD to stay in the voice state (integer percent) */
+#define SPEEX_PREPROCESS_SET_PROB_CONTINUE 16
+/** Get probability required for the VAD to stay in the voice state (integer percent) */
+#define SPEEX_PREPROCESS_GET_PROB_CONTINUE 17
+
+/** Set maximum attenuation of the noise in dB (negative number) */
+#define SPEEX_PREPROCESS_SET_NOISE_SUPPRESS 18
+/** Get maximum attenuation of the noise in dB (negative number) */
+#define SPEEX_PREPROCESS_GET_NOISE_SUPPRESS 19
+
+/** Set maximum attenuation of the residual echo in dB (negative number) */
+#define SPEEX_PREPROCESS_SET_ECHO_SUPPRESS 20
+/** Get maximum attenuation of the residual echo in dB (negative number) */
+#define SPEEX_PREPROCESS_GET_ECHO_SUPPRESS 21
+
+/** Set maximum attenuation of the residual echo in dB when near end is active (negative number) */
+#define SPEEX_PREPROCESS_SET_ECHO_SUPPRESS_ACTIVE 22
+/** Get maximum attenuation of the residual echo in dB when near end is active (negative number) */
+#define SPEEX_PREPROCESS_GET_ECHO_SUPPRESS_ACTIVE 23
+
+/** Set the corresponding echo canceller state so that residual echo suppression can be performed (NULL for no residual echo suppression) */
+#define SPEEX_PREPROCESS_SET_ECHO_STATE 24
+/** Get the corresponding echo canceller state */
+#define SPEEX_PREPROCESS_GET_ECHO_STATE 25
+
+/** Set maximal gain increase in dB/second (int32) */
+#define SPEEX_PREPROCESS_SET_AGC_INCREMENT 26
+
+/** Get maximal gain increase in dB/second (int32) */
+#define SPEEX_PREPROCESS_GET_AGC_INCREMENT 27
+
+/** Set maximal gain decrease in dB/second (int32) */
+#define SPEEX_PREPROCESS_SET_AGC_DECREMENT 28
+
+/** Get maximal gain decrease in dB/second (int32) */
+#define SPEEX_PREPROCESS_GET_AGC_DECREMENT 29
+
+/** Set maximal gain in dB (int32) */
+#define SPEEX_PREPROCESS_SET_AGC_MAX_GAIN 30
+
+/** Get maximal gain in dB (int32) */
+#define SPEEX_PREPROCESS_GET_AGC_MAX_GAIN 31
+
+/*  Can't set loudness */
+/** Get loudness */
+#define SPEEX_PREPROCESS_GET_AGC_LOUDNESS 33
+
+/*  Can't set gain */
+/** Get current gain (int32 percent) */
+#define SPEEX_PREPROCESS_GET_AGC_GAIN 35
+
+/*  Can't set spectrum size */
+/** Get spectrum size for power spectrum (int32) */
+#define SPEEX_PREPROCESS_GET_PSD_SIZE 37
+
+/*  Can't set power spectrum */
+/** Get power spectrum (int32[] of squared values) */
+#define SPEEX_PREPROCESS_GET_PSD 39
+
+/*  Can't set noise size */
+/** Get spectrum size for noise estimate (int32)  */
+#define SPEEX_PREPROCESS_GET_NOISE_PSD_SIZE 41
+
+/*  Can't set noise estimate */
+/** Get noise estimate (int32[] of squared values) */
+#define SPEEX_PREPROCESS_GET_NOISE_PSD 43
+
+/* Can't set speech probability */
+/** Get speech probability in last frame (int32).  */
+#define SPEEX_PREPROCESS_GET_PROB 45
+
+/** Set preprocessor Automatic Gain Control level (int32) */
+#define SPEEX_PREPROCESS_SET_AGC_TARGET 46
+/** Get preprocessor Automatic Gain Control level (int32) */
+#define SPEEX_PREPROCESS_GET_AGC_TARGET 47
+
+#ifdef __cplusplus
+}
+#endif
+
+/** @}*/
+#endif
diff --git a/sdk/include/speex/speex_resampler.h b/sdk/include/speex/speex_resampler.h
new file mode 100644
index 00000000000..901de37b3da
--- /dev/null
+++ b/sdk/include/speex/speex_resampler.h
@@ -0,0 +1,343 @@
+/* Copyright (C) 2007 Jean-Marc Valin
+
+   File: speex_resampler.h
+   Resampling code
+
+   The design goals of this code are:
+      - Very fast algorithm
+      - Low memory requirement
+      - Good *perceptual* quality (and not best SNR)
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions are
+   met:
+
+   1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   3. The name of the author may not be used to endorse or promote products
+   derived from this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+   IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+   OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+   DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+   ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
+*/
+
+
+#ifndef SPEEX_RESAMPLER_H
+#define SPEEX_RESAMPLER_H
+
+#ifdef OUTSIDE_SPEEX
+
+/********* WARNING: MENTAL SANITY ENDS HERE *************/
+
+/* If the resampler is defined outside of Speex, we change the symbol names so that
+   there won't be any clash if linking with Speex later on. */
+
+/* #define RANDOM_PREFIX your software name here */
+#ifndef RANDOM_PREFIX
+#error "Please define RANDOM_PREFIX (above) to something specific to your project to prevent symbol name clashes"
+#endif
+
+#define CAT_PREFIX2(a,b) a ## b
+#define CAT_PREFIX(a,b) CAT_PREFIX2(a, b)
+
+#define speex_resampler_init CAT_PREFIX(RANDOM_PREFIX,_resampler_init)
+#define speex_resampler_init_frac CAT_PREFIX(RANDOM_PREFIX,_resampler_init_frac)
+#define speex_resampler_destroy CAT_PREFIX(RANDOM_PREFIX,_resampler_destroy)
+#define speex_resampler_process_float CAT_PREFIX(RANDOM_PREFIX,_resampler_process_float)
+#define speex_resampler_process_int CAT_PREFIX(RANDOM_PREFIX,_resampler_process_int)
+#define speex_resampler_process_interleaved_float CAT_PREFIX(RANDOM_PREFIX,_resampler_process_interleaved_float)
+#define speex_resampler_process_interleaved_int CAT_PREFIX(RANDOM_PREFIX,_resampler_process_interleaved_int)
+#define speex_resampler_set_rate CAT_PREFIX(RANDOM_PREFIX,_resampler_set_rate)
+#define speex_resampler_get_rate CAT_PREFIX(RANDOM_PREFIX,_resampler_get_rate)
+#define speex_resampler_set_rate_frac CAT_PREFIX(RANDOM_PREFIX,_resampler_set_rate_frac)
+#define speex_resampler_get_ratio CAT_PREFIX(RANDOM_PREFIX,_resampler_get_ratio)
+#define speex_resampler_set_quality CAT_PREFIX(RANDOM_PREFIX,_resampler_set_quality)
+#define speex_resampler_get_quality CAT_PREFIX(RANDOM_PREFIX,_resampler_get_quality)
+#define speex_resampler_set_input_stride CAT_PREFIX(RANDOM_PREFIX,_resampler_set_input_stride)
+#define speex_resampler_get_input_stride CAT_PREFIX(RANDOM_PREFIX,_resampler_get_input_stride)
+#define speex_resampler_set_output_stride CAT_PREFIX(RANDOM_PREFIX,_resampler_set_output_stride)
+#define speex_resampler_get_output_stride CAT_PREFIX(RANDOM_PREFIX,_resampler_get_output_stride)
+#define speex_resampler_get_input_latency CAT_PREFIX(RANDOM_PREFIX,_resampler_get_input_latency)
+#define speex_resampler_get_output_latency CAT_PREFIX(RANDOM_PREFIX,_resampler_get_output_latency)
+#define speex_resampler_skip_zeros CAT_PREFIX(RANDOM_PREFIX,_resampler_skip_zeros)
+#define speex_resampler_reset_mem CAT_PREFIX(RANDOM_PREFIX,_resampler_reset_mem)
+#define speex_resampler_strerror CAT_PREFIX(RANDOM_PREFIX,_resampler_strerror)
+
+#define spx_int16_t short
+#define spx_int32_t int
+#define spx_uint16_t unsigned short
+#define spx_uint32_t unsigned int
+
+#define speex_assert(cond)
+
+#else /* OUTSIDE_SPEEX */
+
+#include "speexdsp_types.h"
+
+#endif /* OUTSIDE_SPEEX */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define SPEEX_RESAMPLER_QUALITY_MAX 10
+#define SPEEX_RESAMPLER_QUALITY_MIN 0
+#define SPEEX_RESAMPLER_QUALITY_DEFAULT 4
+#define SPEEX_RESAMPLER_QUALITY_VOIP 3
+#define SPEEX_RESAMPLER_QUALITY_DESKTOP 5
+
+enum {
+   RESAMPLER_ERR_SUCCESS         = 0,
+   RESAMPLER_ERR_ALLOC_FAILED    = 1,
+   RESAMPLER_ERR_BAD_STATE       = 2,
+   RESAMPLER_ERR_INVALID_ARG     = 3,
+   RESAMPLER_ERR_PTR_OVERLAP     = 4,
+   RESAMPLER_ERR_OVERFLOW        = 5,
+
+   RESAMPLER_ERR_MAX_ERROR
+};
+
+struct SpeexResamplerState_;
+typedef struct SpeexResamplerState_ SpeexResamplerState;
+
+/** Create a new resampler with integer input and output rates.
+ * @param nb_channels Number of channels to be processed
+ * @param in_rate Input sampling rate (integer number of Hz).
+ * @param out_rate Output sampling rate (integer number of Hz).
+ * @param quality Resampling quality between 0 and 10, where 0 has poor quality
+ * and 10 has very high quality.
+ * @return Newly created resampler state
+ * @retval NULL Error: not enough memory
+ */
+SpeexResamplerState *speex_resampler_init(spx_uint32_t nb_channels,
+                                          spx_uint32_t in_rate,
+                                          spx_uint32_t out_rate,
+                                          int quality,
+                                          int *err);
+
+/** Create a new resampler with fractional input/output rates. The sampling
+ * rate ratio is an arbitrary rational number with both the numerator and
+ * denominator being 32-bit integers.
+ * @param nb_channels Number of channels to be processed
+ * @param ratio_num Numerator of the sampling rate ratio
+ * @param ratio_den Denominator of the sampling rate ratio
+ * @param in_rate Input sampling rate rounded to the nearest integer (in Hz).
+ * @param out_rate Output sampling rate rounded to the nearest integer (in Hz).
+ * @param quality Resampling quality between 0 and 10, where 0 has poor quality
+ * and 10 has very high quality.
+ * @return Newly created resampler state
+ * @retval NULL Error: not enough memory
+ */
+SpeexResamplerState *speex_resampler_init_frac(spx_uint32_t nb_channels,
+                                               spx_uint32_t ratio_num,
+                                               spx_uint32_t ratio_den,
+                                               spx_uint32_t in_rate,
+                                               spx_uint32_t out_rate,
+                                               int quality,
+                                               int *err);
+
+/** Destroy a resampler state.
+ * @param st Resampler state
+ */
+void speex_resampler_destroy(SpeexResamplerState *st);
+
+/** Resample a float array. The input and output buffers must *not* overlap.
+ * @param st Resampler state
+ * @param channel_index Index of the channel to process for the multi-channel
+ * base (0 otherwise)
+ * @param in Input buffer
+ * @param in_len Number of input samples in the input buffer. Returns the
+ * number of samples processed
+ * @param out Output buffer
+ * @param out_len Size of the output buffer. Returns the number of samples written
+ */
+int speex_resampler_process_float(SpeexResamplerState *st,
+                                   spx_uint32_t channel_index,
+                                   const float *in,
+                                   spx_uint32_t *in_len,
+                                   float *out,
+                                   spx_uint32_t *out_len);
+
+/** Resample an int array. The input and output buffers must *not* overlap.
+ * @param st Resampler state
+ * @param channel_index Index of the channel to process for the multi-channel
+ * base (0 otherwise)
+ * @param in Input buffer
+ * @param in_len Number of input samples in the input buffer. Returns the number
+ * of samples processed
+ * @param out Output buffer
+ * @param out_len Size of the output buffer. Returns the number of samples written
+ */
+int speex_resampler_process_int(SpeexResamplerState *st,
+                                 spx_uint32_t channel_index,
+                                 const spx_int16_t *in,
+                                 spx_uint32_t *in_len,
+                                 spx_int16_t *out,
+                                 spx_uint32_t *out_len);
+
+/** Resample an interleaved float array. The input and output buffers must *not* overlap.
+ * @param st Resampler state
+ * @param in Input buffer
+ * @param in_len Number of input samples in the input buffer. Returns the number
+ * of samples processed. This is all per-channel.
+ * @param out Output buffer
+ * @param out_len Size of the output buffer. Returns the number of samples written.
+ * This is all per-channel.
+ */
+int speex_resampler_process_interleaved_float(SpeexResamplerState *st,
+                                               const float *in,
+                                               spx_uint32_t *in_len,
+                                               float *out,
+                                               spx_uint32_t *out_len);
+
+/** Resample an interleaved int array. The input and output buffers must *not* overlap.
+ * @param st Resampler state
+ * @param in Input buffer
+ * @param in_len Number of input samples in the input buffer. Returns the number
+ * of samples processed. This is all per-channel.
+ * @param out Output buffer
+ * @param out_len Size of the output buffer. Returns the number of samples written.
+ * This is all per-channel.
+ */
+int speex_resampler_process_interleaved_int(SpeexResamplerState *st,
+                                             const spx_int16_t *in,
+                                             spx_uint32_t *in_len,
+                                             spx_int16_t *out,
+                                             spx_uint32_t *out_len);
+
+/** Set (change) the input/output sampling rates (integer value).
+ * @param st Resampler state
+ * @param in_rate Input sampling rate (integer number of Hz).
+ * @param out_rate Output sampling rate (integer number of Hz).
+ */
+int speex_resampler_set_rate(SpeexResamplerState *st,
+                              spx_uint32_t in_rate,
+                              spx_uint32_t out_rate);
+
+/** Get the current input/output sampling rates (integer value).
+ * @param st Resampler state
+ * @param in_rate Input sampling rate (integer number of Hz) copied.
+ * @param out_rate Output sampling rate (integer number of Hz) copied.
+ */
+void speex_resampler_get_rate(SpeexResamplerState *st,
+                              spx_uint32_t *in_rate,
+                              spx_uint32_t *out_rate);
+
+/** Set (change) the input/output sampling rates and resampling ratio
+ * (fractional values in Hz supported).
+ * @param st Resampler state
+ * @param ratio_num Numerator of the sampling rate ratio
+ * @param ratio_den Denominator of the sampling rate ratio
+ * @param in_rate Input sampling rate rounded to the nearest integer (in Hz).
+ * @param out_rate Output sampling rate rounded to the nearest integer (in Hz).
+ */
+int speex_resampler_set_rate_frac(SpeexResamplerState *st,
+                                   spx_uint32_t ratio_num,
+                                   spx_uint32_t ratio_den,
+                                   spx_uint32_t in_rate,
+                                   spx_uint32_t out_rate);
+
+/** Get the current resampling ratio. This will be reduced to the least
+ * common denominator.
+ * @param st Resampler state
+ * @param ratio_num Numerator of the sampling rate ratio copied
+ * @param ratio_den Denominator of the sampling rate ratio copied
+ */
+void speex_resampler_get_ratio(SpeexResamplerState *st,
+                               spx_uint32_t *ratio_num,
+                               spx_uint32_t *ratio_den);
+
+/** Set (change) the conversion quality.
+ * @param st Resampler state
+ * @param quality Resampling quality between 0 and 10, where 0 has poor
+ * quality and 10 has very high quality.
+ */
+int speex_resampler_set_quality(SpeexResamplerState *st,
+                                 int quality);
+
+/** Get the conversion quality.
+ * @param st Resampler state
+ * @param quality Resampling quality between 0 and 10, where 0 has poor
+ * quality and 10 has very high quality.
+ */
+void speex_resampler_get_quality(SpeexResamplerState *st,
+                                 int *quality);
+
+/** Set (change) the input stride.
+ * @param st Resampler state
+ * @param stride Input stride
+ */
+void speex_resampler_set_input_stride(SpeexResamplerState *st,
+                                      spx_uint32_t stride);
+
+/** Get the input stride.
+ * @param st Resampler state
+ * @param stride Input stride copied
+ */
+void speex_resampler_get_input_stride(SpeexResamplerState *st,
+                                      spx_uint32_t *stride);
+
+/** Set (change) the output stride.
+ * @param st Resampler state
+ * @param stride Output stride
+ */
+void speex_resampler_set_output_stride(SpeexResamplerState *st,
+                                      spx_uint32_t stride);
+
+/** Get the output stride.
+ * @param st Resampler state copied
+ * @param stride Output stride
+ */
+void speex_resampler_get_output_stride(SpeexResamplerState *st,
+                                      spx_uint32_t *stride);
+
+/** Get the latency introduced by the resampler measured in input samples.
+ * @param st Resampler state
+ */
+int speex_resampler_get_input_latency(SpeexResamplerState *st);
+
+/** Get the latency introduced by the resampler measured in output samples.
+ * @param st Resampler state
+ */
+int speex_resampler_get_output_latency(SpeexResamplerState *st);
+
+/** Make sure that the first samples to go out of the resamplers don't have
+ * leading zeros. This is only useful before starting to use a newly created
+ * resampler. It is recommended to use that when resampling an audio file, as
+ * it will generate a file with the same length. For real-time processing,
+ * it is probably easier not to use this call (so that the output duration
+ * is the same for the first frame).
+ * @param st Resampler state
+ */
+int speex_resampler_skip_zeros(SpeexResamplerState *st);
+
+/** Reset a resampler so a new (unrelated) stream can be processed.
+ * @param st Resampler state
+ */
+int speex_resampler_reset_mem(SpeexResamplerState *st);
+
+/** Returns the English meaning for an error code
+ * @param err Error code
+ * @return English string
+ */
+const char *speex_resampler_strerror(int err);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/sdk/include/speex/speexdsp_config_types.h b/sdk/include/speex/speexdsp_config_types.h
new file mode 100644
index 00000000000..ca1f5a3c20e
--- /dev/null
+++ b/sdk/include/speex/speexdsp_config_types.h
@@ -0,0 +1,12 @@
+#ifndef __SPEEX_TYPES_H__
+#define __SPEEX_TYPES_H__
+
+#include <stdint.h>
+
+typedef int16_t spx_int16_t;
+typedef uint16_t spx_uint16_t;
+typedef int32_t spx_int32_t;
+typedef uint32_t spx_uint32_t;
+
+#endif
+
diff --git a/sdk/include/speex/speexdsp_types.h b/sdk/include/speex/speexdsp_types.h
new file mode 100644
index 00000000000..4b4a76a474a
--- /dev/null
+++ b/sdk/include/speex/speexdsp_types.h
@@ -0,0 +1,126 @@
+/* speexdsp_types.h taken from libogg */
+/********************************************************************
+ *                                                                  *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
+ *                                                                  *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2002             *
+ * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ *                                                                  *
+ ********************************************************************
+
+ function: #ifdef jail to whip a few platforms into the UNIX ideal.
+ last mod: $Id: os_types.h 7524 2004-08-11 04:20:36Z conrad $
+
+ ********************************************************************/
+/**
+   @file speexdsp_types.h
+   @brief Speex types
+*/
+#ifndef _SPEEX_TYPES_H
+#define _SPEEX_TYPES_H
+
+#if defined(_WIN32)
+
+#  if defined(__CYGWIN__)
+#    include <_G_config.h>
+     typedef _G_int32_t spx_int32_t;
+     typedef _G_uint32_t spx_uint32_t;
+     typedef _G_int16_t spx_int16_t;
+     typedef _G_uint16_t spx_uint16_t;
+#  elif defined(__MINGW32__)
+     typedef short spx_int16_t;
+     typedef unsigned short spx_uint16_t;
+     typedef int spx_int32_t;
+     typedef unsigned int spx_uint32_t;
+#  elif defined(__MWERKS__)
+     typedef int spx_int32_t;
+     typedef unsigned int spx_uint32_t;
+     typedef short spx_int16_t;
+     typedef unsigned short spx_uint16_t;
+#  else
+     /* MSVC/Borland */
+     typedef __int32 spx_int32_t;
+     typedef unsigned __int32 spx_uint32_t;
+     typedef __int16 spx_int16_t;
+     typedef unsigned __int16 spx_uint16_t;
+#  endif
+
+#elif defined(__MACOS__)
+
+#  include <sys/types.h>
+   typedef SInt16 spx_int16_t;
+   typedef UInt16 spx_uint16_t;
+   typedef SInt32 spx_int32_t;
+   typedef UInt32 spx_uint32_t;
+
+#elif (defined(__APPLE__) && defined(__MACH__)) /* MacOS X Framework build */
+
+#  include <sys/types.h>
+   typedef int16_t spx_int16_t;
+   typedef u_int16_t spx_uint16_t;
+   typedef int32_t spx_int32_t;
+   typedef u_int32_t spx_uint32_t;
+
+#elif defined(__BEOS__)
+
+   /* Be */
+#  include <inttypes.h>
+   typedef int16_t spx_int16_t;
+   typedef u_int16_t spx_uint16_t;
+   typedef int32_t spx_int32_t;
+   typedef u_int32_t spx_uint32_t;
+
+#elif defined (__EMX__)
+
+   /* OS/2 GCC */
+   typedef short spx_int16_t;
+   typedef unsigned short spx_uint16_t;
+   typedef int spx_int32_t;
+   typedef unsigned int spx_uint32_t;
+
+#elif defined (DJGPP)
+
+   /* DJGPP */
+   typedef short spx_int16_t;
+   typedef int spx_int32_t;
+   typedef unsigned int spx_uint32_t;
+
+#elif defined(R5900)
+
+   /* PS2 EE */
+   typedef int spx_int32_t;
+   typedef unsigned spx_uint32_t;
+   typedef short spx_int16_t;
+
+#elif defined(__SYMBIAN32__)
+
+   /* Symbian GCC */
+   typedef signed short spx_int16_t;
+   typedef unsigned short spx_uint16_t;
+   typedef signed int spx_int32_t;
+   typedef unsigned int spx_uint32_t;
+
+#elif defined(CONFIG_TI_C54X) || defined (CONFIG_TI_C55X)
+
+   typedef short spx_int16_t;
+   typedef unsigned short spx_uint16_t;
+   typedef long spx_int32_t;
+   typedef unsigned long spx_uint32_t;
+
+#elif defined(CONFIG_TI_C6X)
+
+   typedef short spx_int16_t;
+   typedef unsigned short spx_uint16_t;
+   typedef int spx_int32_t;
+   typedef unsigned int spx_uint32_t;
+
+#else
+
+#include "speexdsp_config_types.h"
+
+#endif
+
+#endif  /* _SPEEX_TYPES_H */
diff --git a/sdk/libraries/x64/opus.lib b/sdk/libraries/x64/opus.lib
new file mode 100644
index 00000000000..304d7516a36
Binary files /dev/null and b/sdk/libraries/x64/opus.lib differ
diff --git a/sdk/libraries/x64/speexdsp.lib b/sdk/libraries/x64/speexdsp.lib
new file mode 100644
index 00000000000..be51055a82d
Binary files /dev/null and b/sdk/libraries/x64/speexdsp.lib differ
diff --git a/sdk/libraries/x86/opus.lib b/sdk/libraries/x86/opus.lib
new file mode 100644
index 00000000000..299b35dc751
Binary files /dev/null and b/sdk/libraries/x86/opus.lib differ
diff --git a/sdk/libraries/x86/speexdsp.lib b/sdk/libraries/x86/speexdsp.lib
new file mode 100644
index 00000000000..b26ba69f621
Binary files /dev/null and b/sdk/libraries/x86/speexdsp.lib differ
diff --git a/src/xrEngine/xr_ioc_cmd.cpp b/src/xrEngine/xr_ioc_cmd.cpp
index d1faaba0cc1..24eb172a93f 100644
--- a/src/xrEngine/xr_ioc_cmd.cpp
+++ b/src/xrEngine/xr_ioc_cmd.cpp
@@ -706,6 +706,44 @@ class CCC_soundDevice : public CCC_Token
     }
 };
 
+class CCC_soundInputDevice : public CCC_Token
+{
+    typedef CCC_Token inherited;
+
+public:
+    CCC_soundInputDevice(pcstr N) : inherited(N, &snd_input_device_id, NULL){};
+    virtual ~CCC_soundInputDevice() {}
+    virtual void Execute(pcstr args)
+    {
+        GetToken();
+        if (!tokens)
+            return;
+        inherited::Execute(args);
+    }
+
+    void GetStatus(TStatus& S) override
+    {
+        GetToken();
+        if (!tokens)
+            return;
+        inherited::GetStatus(S);
+    }
+
+    const xr_token* GetToken() noexcept override
+    {
+        tokens = Engine.Sound.GetCaptureDevicesList().data();
+        return tokens;
+    }
+
+    virtual void Save(IWriter* F)
+    {
+        GetToken();
+        if (!tokens)
+            return;
+        inherited::Save(F);
+    }
+};
+
 //-----------------------------------------------------------------------
 
 class CCC_ExclusiveMode : public IConsole_Command
@@ -910,7 +948,10 @@ void CCC_Register()
     CMD1(CCC_renderer, "renderer");
 
     if (!GEnv.isDedicatedServer)
+    {
         CMD1(CCC_soundDevice, "snd_device");
+        CMD1(CCC_soundInputDevice, "snd_input_device");
+    }
 
     // psSoundRolloff = pSettings->r_float ("sound","rolloff"); clamp(psSoundRolloff, EPS_S, 2.f);
     psSoundOcclusionScale = pSettings->r_float("sound", "occlusion_scale");
diff --git a/src/xrEngine/xr_level_controller.cpp b/src/xrEngine/xr_level_controller.cpp
index 21dc51a6c8c..84dbf26ab51 100644
--- a/src/xrEngine/xr_level_controller.cpp
+++ b/src/xrEngine/xr_level_controller.cpp
@@ -82,6 +82,8 @@ game_action actions[] =
     { "scores",                 kSCORES,                    _both },
     { "chat",                   kCHAT,                      _mp },
     { "chat_team",              kCHAT_TEAM,                 _mp },
+    { "voice_chat",             kVOICE_CHAT,                _mp },
+    { "voice_distance",         kVOICE_DISTANCE,            _mp },
     { "screenshot",             kSCREENSHOT,                _both },
     { "enter",                  kENTER,                     _both },
     { "quit",                   kQUIT,                      _both },
diff --git a/src/xrEngine/xr_level_controller.h b/src/xrEngine/xr_level_controller.h
index f50c79db9b2..cf50c0f749b 100644
--- a/src/xrEngine/xr_level_controller.h
+++ b/src/xrEngine/xr_level_controller.h
@@ -63,6 +63,8 @@ enum EGameActions : u32
     kSCORES,
     kCHAT,
     kCHAT_TEAM,
+    kVOICE_CHAT,
+    kVOICE_DISTANCE,
     kSCREENSHOT,
     kENTER,
     kQUIT,
diff --git a/src/xrGame/Actor.cpp b/src/xrGame/Actor.cpp
index 9dedcbdb2ff..2a8e1d4fc65 100644
--- a/src/xrGame/Actor.cpp
+++ b/src/xrGame/Actor.cpp
@@ -658,7 +658,16 @@ void CActor::Hit(SHit* pHDS)
         b_initiated = b_initiated && (pHDS->hit_type == ALife::eHitTypeStrike);
 
         if (b_fireWound || b_initiated)
+        {
             HitMark(HDS.damage(), HDS.dir, HDS.who, HDS.bone(), HDS.p_in_bone_space, HDS.impulse, HDS.hit_type);
+        }
+        else
+        {
+            if (!IsGameTypeSingle() && !!smart_cast<CBaseMonster*>(HDS.who) && pHDS->hit_type == ALife::eHitTypeWound)
+            {
+                HitMarkMonster(HDS.dir, HDS.damage());
+            }
+        }
     }
 
     if (IsGameTypeSingle())
@@ -814,6 +823,91 @@ void CActor::HitMark(float P, Fvector dir, IGameObject* who_object, s16 element,
     } // if hit_type
 }
 
+#define MAX_LOCK_TIME 2.f
+
+void CActor::HitMarkMonster(Fvector dir, float damage)
+{
+    if (!g_Alive() || !Local() || !(Level().CurrentEntity() == this))
+        return;
+
+    StaticDrawableWrapper* s = CurrentGameUI()->AddCustomStatic("monster_claws", false);
+
+    float h1, p1;
+    Device.vCameraDirection.getHP(h1, p1);
+    Fvector hd = dir;
+    hd.mul(-1);
+    float d = -h1 + hd.getH();
+    s->wnd()->SetHeading(d);
+    Fvector2 wnd_pos = s->wnd()->GetWndPos();
+    wnd_pos.y += 400.0f * _cos(d);
+    wnd_pos.x += 500.0f * _sin(d);
+    s->wnd()->SetWndPos(wnd_pos);
+
+    float time_to_lock = damage * MAX_LOCK_TIME;
+    clamp(time_to_lock, 0.f, MAX_LOCK_TIME);
+    this->lock_accel_for(int(time_to_lock * 1000));
+
+    CEffectorCam* ce = Cameras().GetCamEffector((ECamEffectorType)effBigMonsterHit);
+    if (ce)
+    {
+        const shared_str& eff_sect = pSettings->r_string(cNameSect(), "actor_hit_effect");
+        if (eff_sect.c_str())
+        {
+            int id = -1;
+            Fvector cam_pos, cam_dir, cam_norm;
+            cam_Active()->Get(cam_pos, cam_dir, cam_norm);
+            cam_dir.normalize_safe();
+            dir.normalize_safe();
+
+            float ang_diff = angle_difference(cam_dir.getH(), dir.getH());
+            Fvector cp;
+            cp.crossproduct(cam_dir, dir);
+            bool bUp = (cp.y > 0.0f);
+
+            Fvector cross;
+            cross.crossproduct(cam_dir, dir);
+            VERIFY(ang_diff >= 0.0f && ang_diff <= PI);
+
+            float _s1 = PI_DIV_8;
+            float _s2 = _s1 + PI_DIV_4;
+            float _s3 = _s2 + PI_DIV_4;
+            float _s4 = _s3 + PI_DIV_4;
+
+            if (ang_diff <= _s1)
+            {
+                id = 2;
+            }
+            else
+            {
+                if (ang_diff > _s1 && ang_diff <= _s2)
+                {
+                    id = (bUp) ? 5 : 7;
+                }
+                else if (ang_diff > _s2 && ang_diff <= _s3)
+                {
+                    id = (bUp) ? 3 : 1;
+                }
+                else if (ang_diff > _s3 && ang_diff <= _s4)
+                {
+                    id = (bUp) ? 4 : 6;
+                }
+                else if (ang_diff > _s4)
+                {
+                    id = 0;
+                }
+                else
+                {
+                    VERIFY(0);
+                }
+            }
+
+            string64 sect_name;
+            xr_sprintf(sect_name, "%s_%d", eff_sect.c_str(), id);
+            AddEffector(this, effBigMonsterHit, sect_name, damage);
+        }
+    }
+}
+
 void CActor::HitSignal(float perc, Fvector& vLocalDir, IGameObject* who, s16 element)
 {
     //AVO: get bone names from IDs
diff --git a/src/xrGame/Actor.h b/src/xrGame/Actor.h
index ea6f1603845..3f1bc71e4a6 100644
--- a/src/xrGame/Actor.h
+++ b/src/xrGame/Actor.h
@@ -186,6 +186,8 @@ class CActor : public CEntityAlive,
     void HitMark(float P, Fvector dir, IGameObject* who, s16 element, Fvector position_in_bone_space, float impulse,
         ALife::EHitType hit_type);
 
+    void HitMarkMonster(Fvector dir, float damage);
+
     void Feel_Grenade_Update(float rad);
 
     virtual float GetMass();
diff --git a/src/xrGame/Actor_Flags.h b/src/xrGame/Actor_Flags.h
index b41f3d35a63..2ecbfda26bc 100644
--- a/src/xrGame/Actor_Flags.h
+++ b/src/xrGame/Actor_Flags.h
@@ -13,9 +13,10 @@ enum
     AF_IMPORTANT_SAVE = (1 << 9),
     AF_CROUCH_TOGGLE = (1 << 10),
     AF_MULTI_ITEM_PICKUP = (1 << 11),
-    AF_LOADING_STAGES = (1 << 12),
-    AF_ALWAYS_USE_ATTITUDE_SENSORS = (1 << 13), // or only when zooming if false
-    AF_USE_TRACERS = (1 << 14)
+    AF_DISPLAY_VOICE_ICON = (1 << 12),
+    AF_LOADING_STAGES = (1 << 13),
+    AF_ALWAYS_USE_ATTITUDE_SENSORS = (1 << 14), // or only when zooming if false
+    AF_USE_TRACERS = (1 << 15)
 };
 
 extern Flags32 psActorFlags;
diff --git a/src/xrGame/Artefact.cpp b/src/xrGame/Artefact.cpp
index e879c581c29..a962924d267 100644
--- a/src/xrGame/Artefact.cpp
+++ b/src/xrGame/Artefact.cpp
@@ -118,7 +118,7 @@ void CArtefact::OnH_A_Chield()
     inherited::OnH_A_Chield();
 
     StopLights();
-    if (IsGameTypeSingle())
+    if (IsGameTypeSingle() || Game().Type() == eGameIDFreeMp)
     {
         SwitchAfParticles(false);
     }
diff --git a/src/xrGame/Level.cpp b/src/xrGame/Level.cpp
index c1b7573e421..c7357824157 100644
--- a/src/xrGame/Level.cpp
+++ b/src/xrGame/Level.cpp
@@ -50,6 +50,7 @@
 #include "xrPhysics/console_vars.h"
 #include "xrNetServer/NET_Messages.h"
 #include "xrEngine/GameFont.h"
+#include "inventory_upgrade_manager.h"
 
 #ifdef DEBUG
 #include "level_debug.h"
@@ -170,6 +171,7 @@ CLevel::~CLevel()
 #endif
     xr_delete(m_map_manager);
     delete_data(m_game_task_manager);
+    xr_delete(m_upgrade_manager);
     // here we clean default trade params
     // because they should be new for each saved/loaded game
     // and I didn't find better place to put this code in
@@ -1078,6 +1080,20 @@ void CLevel::OnAlifeSimulatorLoaded()
 {
     MapManager().ResetStorage();
     GameTaskManager().ResetStorage();
+    InitUpgradeManager();
+}
+
+void CLevel::InitUpgradeManager()
+{
+    // pavel:
+    // moved from alife simulator for supporting in MP
+    // only for single and server
+    // for client manager creates in Load_GameSpecific_Before()
+    // yohji:
+    // if we don't create an alife simulator (in the case of vanilla MP modes),
+    // we still need to call this otherwise there will be a crash
+    R_ASSERT(m_upgrade_manager == nullptr);
+    m_upgrade_manager = xr_new<inventory::upgrade::Manager>();
 }
 
 void CLevel::OnSessionTerminate(pcstr reason) { MainMenu()->OnSessionTerminate(StringTable().translate(reason).c_str()); }
diff --git a/src/xrGame/Level.h b/src/xrGame/Level.h
index abe7339f381..5bd84a1464e 100644
--- a/src/xrGame/Level.h
+++ b/src/xrGame/Level.h
@@ -51,6 +51,14 @@ class CFogOfWarMngr;
 class CBulletManager;
 class CMapManager;
 
+namespace inventory
+{
+namespace upgrade
+{
+class Manager;
+}
+}
+
 namespace file_transfer
 {
 class client_site;
@@ -398,12 +406,15 @@ class CLevel : public IGame_Level, public NET_CLIENT_CLASS
     // CFogOfWarMngr* m_pFogOfWarMngr;
     CMapManager* m_map_manager = nullptr;
     CGameTaskManager* m_game_task_manager = nullptr;
+    inventory::upgrade::Manager* m_upgrade_manager = nullptr;
 
 public:
     CMapManager& MapManager() const { return *m_map_manager; }
     CGameTaskManager& GameTaskManager() const { return *m_game_task_manager; }
+    inventory::upgrade::Manager& UpgradeManager() const { return *m_upgrade_manager; }
     void OnAlifeSimulatorLoaded();
     void OnAlifeSimulatorUnLoaded();
+    void InitUpgradeManager();
 
 protected:
     CBulletManager* m_pBulletManager;
diff --git a/src/xrGame/Level_load.cpp b/src/xrGame/Level_load.cpp
index 367b62a5485..e6bd08ce9c9 100644
--- a/src/xrGame/Level_load.cpp
+++ b/src/xrGame/Level_load.cpp
@@ -10,6 +10,7 @@
 #include "xrPhysics/PhysicsCommon.h"
 #include "level_sounds.h"
 #include "GamePersistent.h"
+#include "inventory_upgrade_manager.h"
 
 bool CLevel::Load_GameSpecific_Before()
 {
@@ -51,6 +52,13 @@ bool CLevel::Load_GameSpecific_Before()
         FS.r_close(stream);
     }
 
+    if (GamePersistent().GameType() != eGameIDSingle && OnClient())
+    {
+        //Pavel: for server and single player the upgrade manager creates in OnAlifeSimulatorLoaded()
+        R_ASSERT(m_upgrade_manager == nullptr);
+        m_upgrade_manager = xr_new<inventory::upgrade::Manager>();
+    }
+
     return (TRUE);
 }
 
diff --git a/src/xrGame/Level_network.cpp b/src/xrGame/Level_network.cpp
index df534561f66..3b3021bb2b4 100644
--- a/src/xrGame/Level_network.cpp
+++ b/src/xrGame/Level_network.cpp
@@ -148,7 +148,6 @@ void CLevel::net_Stop()
     else if (IsDemoSave() && !IsDemoInfoSaved())
         SaveDemoInfo();
 
-
 	if (!IsGameTypeSingle())
 	{
 		luabind::functor<void> funct;
@@ -383,11 +382,11 @@ bool CLevel::Connect2Server(const char* options)
 	}
 	else
 	{
-		u32 EndTime = GetTickCount() + ConnectionTimeOut;
+		u32 EndTime = Device.dwTimeGlobal + ConnectionTimeOut;
 		while (!HasSessionName())
 		{
 			Sleep(5);
-			u32 CurTime = GetTickCount();
+			u32 CurTime = Device.dwTimeGlobal;
 			if (CurTime > EndTime || net_isFails_Connect())
 			{
 				OnConnectRejected();
@@ -396,7 +395,7 @@ bool CLevel::Connect2Server(const char* options)
 			}
 		}
 
-		EndTime = GetTickCount() + ConnectionTimeOut;
+		EndTime = Device.dwTimeGlobal + ConnectionTimeOut;
 		while (!m_bConnectResultReceived)
 		{
 			ClientReceive();
@@ -404,7 +403,7 @@ bool CLevel::Connect2Server(const char* options)
 			if (Server)
 				Server->Update();
 
-			u32 CurTime = GetTickCount();
+			u32 CurTime = Device.dwTimeGlobal;
 			if (CurTime > EndTime)
 			{
 				NET_Packet	P;
diff --git a/src/xrGame/Level_network_messages.cpp b/src/xrGame/Level_network_messages.cpp
index 87a7275d221..3efb5c64cc4 100644
--- a/src/xrGame/Level_network_messages.cpp
+++ b/src/xrGame/Level_network_messages.cpp
@@ -357,6 +357,13 @@ void CLevel::ClientReceive()
             Game().OnChatMessage(P);
         }
         break;
+        case M_VOICE_MESSAGE:
+        {
+            if (!game)
+                break;
+            Game().OnVoiceMessage(P);
+        }
+        break;
         case M_CLIENT_WARN:
         {
             if (!game)
diff --git a/src/xrGame/UIGameCustom.cpp b/src/xrGame/UIGameCustom.cpp
index 27db0882d7f..8a5225a3245 100644
--- a/src/xrGame/UIGameCustom.cpp
+++ b/src/xrGame/UIGameCustom.cpp
@@ -528,6 +528,11 @@ void CUIGameCustom::HideShownDialogs()
     }
 }
 
+bool CUIGameCustom::HasShownDialogs() const
+{
+	return ActorMenu->IsShown() || PdaMenu->IsShown() || TalkMenu->IsShown();
+}
+
 void CUIGameCustom::StartTrade(CInventoryOwner* pActorInv, CInventoryOwner* pOtherOwner)
 {
     ActorMenu->SetActor(pActorInv);
diff --git a/src/xrGame/UIGameCustom.h b/src/xrGame/UIGameCustom.h
index 26edce70ae3..0ef1a697368 100644
--- a/src/xrGame/UIGameCustom.h
+++ b/src/xrGame/UIGameCustom.h
@@ -118,6 +118,7 @@ class CUIGameCustom : public FactoryObjectBase, public CDialogHolder, public CUI
     void ShowCrosshair(bool show) { psHUD_Flags.set(HUD_CROSSHAIR_RT, show); }
     bool CrosshairShown() { return !!psHUD_Flags.test(HUD_CROSSHAIR_RT); }
     virtual void HideShownDialogs();
+    bool HasShownDialogs() const;
     virtual void ReinitDialogs() {}
     StaticDrawableWrapper* AddCustomStatic(const char* id, bool singleInstance, float ttlDefault = -1.0f);
     StaticDrawableWrapper* GetCustomStatic(const char* id);
diff --git a/src/xrGame/VoiceChat.cpp b/src/xrGame/VoiceChat.cpp
new file mode 100644
index 00000000000..4bee585eaf8
--- /dev/null
+++ b/src/xrGame/VoiceChat.cpp
@@ -0,0 +1,222 @@
+#include "stdafx.h"
+#include "VoiceChat.h"
+#include "Level.h"
+#include "game_cl_mp.h"
+#include "Actor.h"
+#include "Inventory.h"
+
+CVoiceChat::CVoiceChat()
+{
+	// TODO: Initialize with sound system when available
+	m_pSoundVoiceChat = GEnv.Sound->GetSoundVoiceChat();
+	CreateRecorder();
+}
+
+CVoiceChat::~CVoiceChat()
+{
+	xr_delete(m_pSender);
+
+	if (m_pSoundVoiceChat)
+	{
+		for (auto I = m_soundPlayersMap.begin(); I != m_soundPlayersMap.end(); ++I)
+		{
+			m_pSoundVoiceChat->DestroySoundPlayer(I->second);
+		}
+	}
+	m_soundPlayersMap.clear();
+}
+
+bool CVoiceChat::CreateRecorder()
+{
+	if (m_pSender != nullptr)
+	{
+		xr_delete(m_pSender);
+		m_pSender = nullptr;
+	}
+
+	m_pSender = xr_new<CVoiceSender>();
+	m_pSender->SetDistance(10); // default
+
+	m_pRecorder = m_pSoundVoiceChat->CreateRecorder((IVoicePacketSender*)m_pSender);
+
+	return m_pRecorder != nullptr;
+}
+
+void CVoiceChat::Start()
+{
+	if (m_pRecorder)
+		m_pRecorder->Start();
+}
+
+void CVoiceChat::Stop()
+{
+	if (m_pRecorder)
+		m_pRecorder->Stop();
+}
+
+bool CVoiceChat::IsStarted()
+{
+	return m_pRecorder ? m_pRecorder->IsStarted() : false;
+}
+
+u8 CVoiceChat::GetDistance() const
+{
+	return m_pSender ? m_pSender->GetDistance() : 10;
+}
+
+u8 CVoiceChat::SwitchDistance()
+{
+	R_ASSERT(m_pSender != nullptr);
+
+	switch (m_pSender->GetDistance())
+	{
+	case 5:
+		m_pSender->SetDistance(10);
+		return 10;
+	case 10:
+		m_pSender->SetDistance(30);
+		return 30;
+	default:
+		m_pSender->SetDistance(5);
+		return 5;
+	}
+}
+
+void CVoiceChat::Update()
+{
+	CheckAndClearPlayers(m_soundPlayersMap);
+}
+
+void CVoiceChat::OnRender()
+{
+	if (psActorFlags.test(AF_DISPLAY_VOICE_ICON))
+	{
+		constexpr Fvector pos = Fvector{ 0.0, 0.5, 0.0 };
+
+		game_PlayerState* local_player = Game().local_player;
+		auto& players = Game().players;
+
+		for (auto it = players.begin(); it != players.end(); ++it)
+		{
+			game_PlayerState* ps = it->second;
+			u16 id = ps->GameID;
+
+			if (ps == local_player || ps->testFlag(GAME_PLAYER_FLAG_VERY_VERY_DEAD) /* || ps->testFlag(GAME_PLAYER_MP_INVIS) */)
+				continue;
+
+			auto voiceTimeIt = m_voiceTimeMap.find(id);
+			if (voiceTimeIt == m_voiceTimeMap.end())
+				continue;
+
+			auto& voiceIconInfo = voiceTimeIt->second;
+
+			if (voiceIconInfo.time + 200 < Device.dwTimeGlobal)
+				continue;
+
+            IGameObject* pObject = Level().Objects.net_Find(id);
+			if (!pObject) continue;
+
+			CActor* pActor = smart_cast<CActor*>(pObject);
+			if (!pActor) continue;
+
+			pActor->RenderIndicator(pos, 0.2, 0.2, GetVoiceIndicatorShader());
+		}
+	}
+}
+
+void CVoiceChat::ReceiveMessage(NET_Packet* P)
+{
+	game_PlayerState* local_player = Game().local_player;
+	if (!local_player || local_player->testFlag(GAME_PLAYER_FLAG_VERY_VERY_DEAD) || !Actor())
+	{
+		return;
+	}
+
+	u8 voiceDistance = P->r_u8();
+
+	u16 clientId = P->r_u16();
+    IGameObject* obj = Level().Objects.net_Find(clientId);
+	if (!obj)
+	{
+		return;
+	}
+
+	const bool isValidDistance = (Actor()->Position().distance_to(obj->Position()) <= voiceDistance);
+
+	if (isValidDistance == false)
+		return;
+
+	IStreamPlayer* player = GetStreamPlayer(clientId);
+	if (player)
+	{
+		player->SetPosition(obj->Position());
+		player->SetDistance(voiceDistance);
+	}
+
+	u8 packetsCount = P->r_u8();
+
+	for (u32 i = 0; i < packetsCount; ++i)
+	{
+		u32 length = P->r_u32();
+		P->r(m_buffer, length);
+		if (player)
+			player->PushToPlay(m_buffer, length);
+	}
+
+	if (isValidDistance)
+	{
+		m_voiceTimeMap[clientId] = SVoiceIconInfo(Device.dwTimeGlobal);
+	}
+}
+
+const ui_shader& CVoiceChat::GetVoiceIndicatorShader()
+{
+	if (m_voiceIndicatorShader->inited()) return m_voiceIndicatorShader;
+
+	m_voiceIndicatorShader->create("friendly_indicator", "ui\\ui_voice");
+	return m_voiceIndicatorShader;
+}
+
+IStreamPlayer* CVoiceChat::GetStreamPlayer(u16 clientId)
+{
+	if (!m_pSoundVoiceChat)
+		return nullptr;
+
+	IStreamPlayer* player = m_soundPlayersMap[clientId];
+	if (!player)
+	{
+		player = m_pSoundVoiceChat->CreateStreamPlayer();
+		m_soundPlayersMap[clientId] = player;
+	}
+	return player;
+}
+
+void CVoiceChat::CheckAndClearPlayers(SOUND_PLAYERS& players)
+{
+	auto I = players.begin();
+	auto E = players.end();
+	decltype(I) J;
+
+	for (; I != E;)
+	{
+        IGameObject* obj = Level().Objects.net_Find(I->first);
+		if (!obj)
+		{
+			J = I;
+			++I;
+
+			auto voiceTimeIt = m_voiceTimeMap.find(J->first);
+			if (voiceTimeIt != m_voiceTimeMap.end())
+			{
+				m_voiceTimeMap.erase(voiceTimeIt);
+			}
+
+			if (m_pSoundVoiceChat)
+				m_pSoundVoiceChat->DestroySoundPlayer(J->second);
+			players.erase(J);
+		}
+		else {
+			++I;
+		}
+	}
+}
diff --git a/src/xrGame/VoiceChat.h b/src/xrGame/VoiceChat.h
new file mode 100644
index 00000000000..9c38f256370
--- /dev/null
+++ b/src/xrGame/VoiceChat.h
@@ -0,0 +1,60 @@
+#pragma once
+#include "../xrSound/ISoundVoiceChat.h"
+#include "VoiceSender.h"
+
+class CVoiceChat
+{
+private:
+
+	struct SVoiceIconInfo
+	{
+		u64 time;
+
+		SVoiceIconInfo() = default;
+		SVoiceIconInfo(u64 _time)
+		{
+			time = _time;
+		}
+	};
+
+	typedef xr_map<u16, IStreamPlayer*> SOUND_PLAYERS;
+	typedef xr_map<u16, SVoiceIconInfo> PLAYERS_VOICE_TIME;
+
+public:
+	CVoiceChat();
+	~CVoiceChat();
+
+	bool CreateRecorder();
+
+	void Start();
+	void Stop();
+	bool IsStarted();
+
+	u8 GetDistance() const;
+	u8 SwitchDistance();
+
+	void Update();
+	void OnRender();
+
+	void ReceiveMessage(NET_Packet* P);
+
+private:
+	const ui_shader& GetVoiceIndicatorShader();
+
+	IStreamPlayer* GetStreamPlayer(u16 clientId);
+
+	void CheckAndClearPlayers(SOUND_PLAYERS& players);
+
+private:
+	byte m_buffer[1024];
+
+	ISoundVoiceChat* m_pSoundVoiceChat = nullptr;
+	ISoundRecorder* m_pRecorder = nullptr;
+
+	CVoiceSender* m_pSender = nullptr;
+	SOUND_PLAYERS m_soundPlayersMap;
+
+	PLAYERS_VOICE_TIME m_voiceTimeMap;
+
+	ui_shader m_voiceIndicatorShader;
+};
diff --git a/src/xrGame/VoiceSender.cpp b/src/xrGame/VoiceSender.cpp
new file mode 100644
index 00000000000..8a471399928
--- /dev/null
+++ b/src/xrGame/VoiceSender.cpp
@@ -0,0 +1,23 @@
+#include "stdafx.h"
+#include "VoiceSender.h"
+#include "game_cl_mp.h"
+#include"game_sv_mp.h"
+#include "xrSound/ISoundVoiceChat.h"
+
+void CVoiceSender::Send(VoicePacket** packets, u8 count)
+{
+	NET_Packet P;
+	P.w_begin(M_VOICE_MESSAGE);
+	P.w_u8(m_distance);
+	P.w_u16(Level().game->local_player->GameID);
+	P.w_u8(count);
+
+	for (int i = 0; i < count; ++i)
+	{
+		VoicePacket* packet = packets[i];
+		P.w_u32(packet->length);
+		P.w(packet->data, packet->length);
+	}
+
+	Level().Send(P, net_flags(FALSE, TRUE, TRUE, TRUE));
+}
diff --git a/src/xrGame/VoiceSender.h b/src/xrGame/VoiceSender.h
new file mode 100644
index 00000000000..e4765064292
--- /dev/null
+++ b/src/xrGame/VoiceSender.h
@@ -0,0 +1,12 @@
+#pragma once
+#include "../xrSound/IVoicePacketSender.h"
+
+class CVoiceSender : IVoicePacketSender
+{
+public:
+	u8 GetDistance() const { return m_distance; }
+	void SetDistance(u8 value) { m_distance = value; }
+	virtual void Send(VoicePacket** packets, u8 count) override;
+private:
+	u8 m_distance = 10;
+};
\ No newline at end of file
diff --git a/src/xrGame/WeaponMagazined.cpp b/src/xrGame/WeaponMagazined.cpp
index 61cfcf36730..861da591b2f 100644
--- a/src/xrGame/WeaponMagazined.cpp
+++ b/src/xrGame/WeaponMagazined.cpp
@@ -309,21 +309,56 @@ void CWeaponMagazined::UnloadMagazine(bool spawn_ammo)
     if (!spawn_ammo)
         return;
 
-    xr_map<LPCSTR, u16>::iterator l_it;
-    for (l_it = l_ammo.begin(); l_ammo.end() != l_it; ++l_it)
+    if (OnServer() || IsGameTypeSingle())
     {
-        if (m_pInventory)
+        xr_map<u16, u16> ammos_to_sync;
+
+        xr_map<LPCSTR, u16>::iterator l_it;
+        for (l_it = l_ammo.begin(); l_ammo.end() != l_it; ++l_it)
+        {
+            if (m_pInventory)
+            {
+                const TIItemContainer& list = m_pInventory->m_ruck;
+                for (TIItemContainer::const_iterator it = list.begin(); list.end() != it; ++it)
+                {
+                    PIItem pIItem = *it;
+                    CWeaponAmmo* l_pA = smart_cast<CWeaponAmmo*>(pIItem);
+                    if (l_pA && pIItem->Useful())
+                    {
+                        if (!xr_strcmp(pIItem->object().cNameSect(), l_it->first))
+                        {
+                            u16 l_free = l_pA->m_boxSize - l_pA->m_boxCurr;
+                            if (l_free > 0)
+                            {
+                                u16 to_add = l_free < l_it->second ? l_free : l_it->second;
+                                l_pA->m_boxCurr = l_pA->m_boxCurr + to_add;
+                                l_it->second = l_it->second - to_add;
+                                ammos_to_sync[l_pA->ID()] = l_pA->m_boxCurr;
+                                if (l_it->second <= 0) break;
+                            }
+                        }
+                    }
+                }
+            }
+            if (l_it->second > 0 && !unlimited_ammo())
+            {
+                SpawnAmmo(l_it->second, l_it->first);
+            }
+        }
+
+        if (!IsGameTypeSingle())
         {
-            CWeaponAmmo* l_pA = smart_cast<CWeaponAmmo*>(m_pInventory->GetAny(l_it->first));
-            if (l_pA)
+            NET_Packet P;
+            CGameObject::u_EventGen(P, GE_WPN_UPDATE_AMMO, ID());
+            xr_map<u16, u16>::iterator _it;
+            P.w_u32(ammos_to_sync.size());
+            for (_it = ammos_to_sync.begin(); ammos_to_sync.end() != _it; ++_it)
             {
-                u16 l_free = l_pA->m_boxSize - l_pA->m_boxCurr;
-                l_pA->m_boxCurr = l_pA->m_boxCurr + (l_free < l_it->second ? l_free : l_it->second);
-                l_it->second = l_it->second - (l_free < l_it->second ? l_free : l_it->second);
+                P.w_u16(_it->first);
+                P.w_u16(_it->second);
             }
+            CGameObject::u_EventSend(P);
         }
-        if (l_it->second && !unlimited_ammo())
-            SpawnAmmo(l_it->second, l_it->first);
     }
 }
 
@@ -1307,6 +1342,32 @@ void CWeaponMagazined::net_Import(NET_Packet& P)
     SetQueueSize(GetCurrentFireMode());
 }
 
+void CWeaponMagazined::OnEvent(NET_Packet& P, u16 type)
+{
+    switch (type)
+    {
+    case GE_WPN_UNLOAD_AMMO:
+    {
+        UnloadMagazine();
+    }break;
+    case GE_WPN_UPDATE_AMMO:
+    {
+        u32 count = P.r_u32();
+        for (u16 i = 0; i < count; ++i)
+        {
+            u16 id = P.r_u16();
+            u16 boxSize = P.r_u16();
+            CWeaponAmmo* pA = smart_cast<CWeaponAmmo*>(Level().Objects.net_Find(id));
+            pA->m_boxCurr = boxSize;
+        }
+    }break;
+    default:
+    {
+        inherited::OnEvent(P, type);
+    }break;
+    }
+}
+
 bool CWeaponMagazined::GetBriefInfo(II_BriefInfo& info)
 {
     VERIFY(m_pInventory);
diff --git a/src/xrGame/WeaponMagazined.h b/src/xrGame/WeaponMagazined.h
index c4fcd0fa5bf..d3895c4f078 100644
--- a/src/xrGame/WeaponMagazined.h
+++ b/src/xrGame/WeaponMagazined.h
@@ -83,6 +83,7 @@ class CWeaponMagazined : public CWeapon
     virtual void net_Destroy();
     virtual void net_Export(NET_Packet& P);
     virtual void net_Import(NET_Packet& P);
+    virtual void OnEvent(NET_Packet& P, u16 type);
 
     virtual void OnH_A_Chield();
 
diff --git a/src/xrGame/game_cl_base.h b/src/xrGame/game_cl_base.h
index 351619b908f..7138244b635 100644
--- a/src/xrGame/game_cl_base.h
+++ b/src/xrGame/game_cl_base.h
@@ -94,6 +94,7 @@ class game_cl_GameState : public game_GameState, public ScheduledBase
     virtual void OnChatMessage(NET_Packet* P){};
     virtual void OnWarnMessage(NET_Packet* P){};
     virtual void OnRadminMessage(u16 type, NET_Packet* P){};
+    virtual void OnVoiceMessage(NET_Packet* P){};
 
     virtual bool IsVotingEnabled() { return m_u16VotingEnabled != 0; };
     virtual bool IsVotingEnabled(u16 flag) { return (m_u16VotingEnabled & flag) != 0; };
@@ -121,6 +122,8 @@ class game_cl_GameState : public game_GameState, public ScheduledBase
     virtual bool IsPlayerInTeam(game_PlayerState* ps, ETeam team) { return ps->team == team; };
     virtual void OnConnected();
 
+    virtual void OnScreenResolutionChanged(){};
+
     u8 m_u8SpectatorModes;
     virtual bool Is_Spectator_Camera_Allowed(CSpectator::EActorCameras Camera);
 };
diff --git a/src/xrGame/game_cl_freemp.cpp b/src/xrGame/game_cl_freemp.cpp
index f3d65a72d4d..6ad9154312c 100644
--- a/src/xrGame/game_cl_freemp.cpp
+++ b/src/xrGame/game_cl_freemp.cpp
@@ -4,6 +4,8 @@
 #include "xrEngine/xr_level_controller.h"
 #include "UIGameFMP.h"
 #include "actor_mp_client.h"
+#include "VoiceChat.h"
+#include "ui/UIMainIngameWnd.h"
 
 game_cl_freemp::game_cl_freemp()
 {
@@ -32,6 +34,11 @@ void game_cl_freemp::SetGameUI(CUIGameCustom* uigame)
 	inherited::SetGameUI(uigame);
 	m_game_ui = smart_cast<CUIGameFMP*>(uigame);
 	R_ASSERT(m_game_ui);
+
+	if (m_pVoiceChat)
+	{
+		m_game_ui->UIMainIngameWnd->SetVoiceDistance(m_pVoiceChat->GetDistance());
+	}
 }
 
 
@@ -47,9 +54,24 @@ void game_cl_freemp::net_import_update(NET_Packet & P)
 
 void game_cl_freemp::shedule_Update(u32 dt)
 {
+	game_cl_GameState::shedule_Update(dt);
+
 	if (!local_player)
 		return;
 
+	if (!GEnv.isDedicatedServer && m_pVoiceChat)
+	{
+		const bool started = m_pVoiceChat->IsStarted();
+		const bool is_dead = !local_player || local_player->testFlag(GAME_PLAYER_FLAG_VERY_VERY_DEAD);
+		const bool has_shown_dialogs = CurrentGameUI()->HasShownDialogs();
+		if (started && (is_dead || has_shown_dialogs))
+		{
+			m_pVoiceChat->Stop();
+			CurrentGameUI()->UIMainIngameWnd->SetActiveVoiceIcon(false);
+		}
+		m_pVoiceChat->Update();
+	}
+
 	for (auto cl : players)
 	{
 		game_PlayerState* ps = cl.second;
@@ -61,6 +83,14 @@ void game_cl_freemp::shedule_Update(u32 dt)
 		pActor->SetName(ps->getName());
 		pActor->cName_set(ps->getName());
 
+		if (ps->team != pActor->Community())
+		{
+			CHARACTER_COMMUNITY	community;
+			community.set(ps->team);
+			pActor->SetCommunity(community.index());
+			pActor->ChangeTeam(community.team(), 0, 0);
+		}
+
 		if (local_player->GameID == ps->GameID)
 		{
 			pActor->set_money((u32)ps->money_for_round, false);
@@ -68,9 +98,19 @@ void game_cl_freemp::shedule_Update(u32 dt)
 	}
 }
 
+void game_cl_freemp::OnRender()
+{
+	inherited::OnRender();
+
+	if (m_pVoiceChat)
+		m_pVoiceChat->OnRender();
+}
+
 bool game_cl_freemp::OnKeyboardPress(int key)
 {
-	if (kJUMP == key)
+	switch (key)
+	{
+	case kJUMP:
 	{
 		bool b_need_to_send_ready = false;
 
@@ -100,11 +140,33 @@ bool game_cl_freemp::OnKeyboardPress(int key)
 		{
 			return false;
 		}
-	};
+	}break;
+
+	default:
+		break;
+	}
 
 	return inherited::OnKeyboardPress(key);
 }
 
+bool game_cl_freemp::OnKeyboardRelease(int key)
+{
+	switch (key)
+	{
+	case kVOICE_CHAT:
+	{
+		m_pVoiceChat->Stop();
+		CurrentGameUI()->UIMainIngameWnd->SetActiveVoiceIcon(false);
+		return true;
+	}break;
+
+	default:
+		break;
+	}
+
+	return inherited::OnKeyboardRelease(key);
+}
+
 LPCSTR game_cl_freemp::GetGameScore(string32&	score_dest)
 {
 	s32 frags = local_player ? local_player->frags() : 0;
@@ -130,3 +192,11 @@ void game_cl_freemp::OnConnected()
 	funct();
 }
 
+void game_cl_freemp::OnScreenResolutionChanged()
+{
+	if (m_game_ui && m_pVoiceChat)
+	{
+		m_game_ui->UIMainIngameWnd->SetVoiceDistance(m_pVoiceChat->GetDistance());
+	}
+}
+
diff --git a/src/xrGame/game_cl_freemp.h b/src/xrGame/game_cl_freemp.h
index 580400fb315..8b0aed62b07 100644
--- a/src/xrGame/game_cl_freemp.h
+++ b/src/xrGame/game_cl_freemp.h
@@ -1,6 +1,7 @@
 #pragma once
 #include "game_cl_mp.h"
 
+class CVoiceChat;
 class CUIGameFMP;
 
 class game_cl_freemp :public game_cl_mp
@@ -20,15 +21,24 @@ class game_cl_freemp :public game_cl_mp
 
 	virtual	void net_import_state(NET_Packet& P);
 	virtual	void net_import_update(NET_Packet& P);
-	
+
 	virtual void shedule_Update(u32 dt);
 
+	virtual void OnRender();
+
 	virtual	bool OnKeyboardPress(int key);
+	virtual	bool OnKeyboardRelease(int key);
+
+	virtual void TranslateGameMessage(u32 msg, NET_Packet& P);
 
 	virtual LPCSTR GetGameScore(string32&	score_dest);
 	virtual bool Is_Rewarding_Allowed()  const { return false; };
 
 	virtual void OnConnected();
 
+	virtual void OnScreenResolutionChanged();
+
+private:
+
 };
 
diff --git a/src/xrGame/game_cl_freemp_messages.cpp b/src/xrGame/game_cl_freemp_messages.cpp
new file mode 100644
index 00000000000..d4934e0159b
--- /dev/null
+++ b/src/xrGame/game_cl_freemp_messages.cpp
@@ -0,0 +1,45 @@
+#include "stdafx.h"
+#include "game_cl_freemp.h"
+#include "UIGameFMP.h"
+#include "ui/UIActorMenu.h"
+
+void game_cl_freemp::TranslateGameMessage(u32 msg, NET_Packet& P)
+{
+	switch (msg)
+	{
+	case GAME_EVENT_MP_REPAIR_SUCCESS:
+		{
+			if (m_game_ui &&
+				m_game_ui->GetActorMenu().IsShown() &&
+                m_game_ui->GetActorMenu().GetMenuMode() == mmUpgrade
+				)
+			{
+				u16 itemId = P.r_u16();
+
+				PIItem item = smart_cast<PIItem>(Level().Objects.net_Find(itemId));
+				if (item)
+				{
+                    m_game_ui->GetActorMenu().OnSuccessRepairMP(item);
+				}
+			}
+		}break;
+	case GAME_EVENT_MP_INSTALL_UPGRADE_SUCCESS:
+		{
+			if (m_game_ui &&
+                m_game_ui->GetActorMenu().IsShown() &&
+                m_game_ui->GetActorMenu().GetMenuMode() == mmUpgrade
+				)
+			{
+				u16 itemId = P.r_u16();
+
+				PIItem item = smart_cast<PIItem>(Level().Objects.net_Find(itemId));
+				if (item)
+				{
+                    m_game_ui->GetActorMenu().OnSuccessUpgradeInstallMP(item);
+				}
+			}
+		}break;
+	default:
+		inherited::TranslateGameMessage(msg, P);
+	};
+}
diff --git a/src/xrGame/game_cl_mp.cpp b/src/xrGame/game_cl_mp.cpp
index 9d6f930df2a..79fd01e993f 100644
--- a/src/xrGame/game_cl_mp.cpp
+++ b/src/xrGame/game_cl_mp.cpp
@@ -51,6 +51,11 @@ BOOL g_draw_downloads = FALSE;
 
 game_cl_mp::game_cl_mp()
 {
+    if (!GEnv.isDedicatedServer)
+        m_pVoiceChat = xr_new<CVoiceChat>();
+    else
+        m_pVoiceChat = NULL;
+
     m_bVotingActive = false;
     m_pVoteStartWindow = NULL;
     m_pAdminMenuWindow = NULL;
@@ -93,6 +98,8 @@ game_cl_mp::game_cl_mp()
 
 game_cl_mp::~game_cl_mp()
 {
+    xr_delete(m_pVoiceChat);
+
     /*	TODO: check if shaders are deleted automatically...
     CL_TEAM_DATA_LIST_it it = TeamList.begin();
     for(;it!=TeamList.end();++it)
@@ -236,6 +243,28 @@ bool game_cl_mp::OnKeyboardPress(int key)
             return true;
         }
         break;
+        case kVOICE_CHAT:
+        {
+            if (local_player && !local_player->testFlag(GAME_PLAYER_FLAG_VERY_VERY_DEAD))
+            {
+                if (!m_pVoiceChat->IsStarted())
+                {
+                    m_pVoiceChat->Start();
+                    CurrentGameUI()->UIMainIngameWnd->SetActiveVoiceIcon(true);
+                }
+            }
+            return true;
+        }break;
+
+        case kVOICE_DISTANCE:
+        {
+            if (local_player && !local_player->testFlag(GAME_PLAYER_FLAG_VERY_VERY_DEAD))
+            {
+                u8 distance = m_pVoiceChat->SwitchDistance();
+                CurrentGameUI()->UIMainIngameWnd->SetVoiceDistance(distance);
+            }
+            return true;
+        }break;
         }
     }
 
@@ -243,6 +272,24 @@ bool game_cl_mp::OnKeyboardPress(int key)
     return false;
 }
 
+bool game_cl_mp::OnKeyboardRelease(int key)
+{
+    switch (key)
+    {
+    case kVOICE_CHAT:
+    {
+        m_pVoiceChat->Stop();
+        CurrentGameUI()->UIMainIngameWnd->SetActiveVoiceIcon(false);
+        return true;
+    }break;
+
+    default:
+        break;
+    }
+
+    return inherited::OnKeyboardRelease(key);
+}
+
 void game_cl_mp::VotingBegin()
 {
     if (!m_pVoteStartWindow)
@@ -1848,3 +1895,8 @@ void game_cl_mp::ProcessPlayersInfoReply(NET_Packet& P)
         tmp_cb(info_count);
     }
 }
+
+void game_cl_mp::OnVoiceMessage(NET_Packet* P)
+{
+    m_pVoiceChat->ReceiveMessage(P);
+}
diff --git a/src/xrGame/game_cl_mp.h b/src/xrGame/game_cl_mp.h
index 264de6cad87..f8cad670482 100644
--- a/src/xrGame/game_cl_mp.h
+++ b/src/xrGame/game_cl_mp.h
@@ -8,6 +8,7 @@
 #include "configs_dump_verifyer.h"
 #include "screenshot_server.h"
 #include "xrCore/fastdelegate.h"
+#include "VoiceChat.h"
 
 class CUIWindow;
 class CUISpeechMenu;
@@ -179,8 +180,6 @@ class game_cl_mp : public game_cl_GameState
     virtual void TranslateGameMessage(u32 msg, NET_Packet& P);
     virtual void CommonMessageOut(pcstr msg);
 
-    virtual bool OnKeyboardPress(int key);
-
     virtual bool CanBeReady() { return true; };
     virtual void shedule_Update(u32 dt);
     bool IsLocalPlayerInitialized() const;
@@ -310,6 +309,12 @@ class game_cl_mp : public game_cl_GameState
     //-------------------------------------------------------------------------------------------------
     static xr_string generate_file_name(const xr_string& base_name, const time_t* date_time = nullptr);
     static xr_string sanitize_filename(const xr_string& base_name);
+
+    virtual bool OnKeyboardPress(int key);
+    virtual	bool OnKeyboardRelease(int key);
+    CVoiceChat* m_pVoiceChat = nullptr;
+private:
+    virtual void OnVoiceMessage(NET_Packet* P);
 //-------------------------------------------------------------------------------------------------
 #include "game_cl_mp_messages_menu.h"
 };
diff --git a/src/xrGame/game_sv_freemp.cpp b/src/xrGame/game_sv_freemp.cpp
index 5aeac1a39a4..ae926ebf782 100644
--- a/src/xrGame/game_sv_freemp.cpp
+++ b/src/xrGame/game_sv_freemp.cpp
@@ -20,7 +20,7 @@ void game_sv_freemp::Create(shared_str & options)
 
 	switch_Phase(GAME_PHASE_PENDING);
 
-	::Random.seed(GetTickCount());
+	::Random.seed(Device.dwTimeGlobal);
 	m_CorpseList.clear();
 }
 
@@ -71,6 +71,28 @@ void game_sv_freemp::OnPlayerConnectFinished(ClientID id_who)
 	};
 }
 
+void game_sv_freemp::AddMoneyToPlayer(game_PlayerState* ps, s32 amount)
+{
+	if (!ps) return;
+
+	Msg("- Add money to player: [%u]%s, amount %d", ps->GameID, ps->getName(), amount);
+
+	s64 total_money = ps->money_for_round;
+	total_money += amount;
+
+	if (total_money < 0)
+		total_money = 0;
+
+	if (total_money > std::numeric_limits<s32>().max())
+	{
+		Msg("! The limit of the maximum amount of money has been exceeded.");
+		total_money = std::numeric_limits<s32>().max() - 1;
+	}
+
+	ps->money_for_round = s32(total_money);
+	signal_Syncronize();
+}
+
 void game_sv_freemp::OnPlayerReady(ClientID id_who)
 {
 	switch (Phase())
@@ -125,6 +147,16 @@ void game_sv_freemp::OnEvent(NET_Packet &P, u16 type, u32 time, ClientID sender)
 			KillPlayer(l_pC->ID, l_pC->ps->GameID);
 		}
 		break;
+	case GAME_EVENT_MP_REPAIR:
+		{
+			OnPlayerRepairItem(P, sender);
+		}
+		break;
+	case GAME_EVENT_MP_INSTALL_UPGRADE:
+		{
+			OnPlayerInstallUpgrade(P, sender);
+		}
+		break;
 	default:
 		inherited::OnEvent(P, type, time, sender);
 	};
diff --git a/src/xrGame/game_sv_freemp.h b/src/xrGame/game_sv_freemp.h
index 2f164ee3564..9179925421c 100644
--- a/src/xrGame/game_sv_freemp.h
+++ b/src/xrGame/game_sv_freemp.h
@@ -20,6 +20,11 @@ class game_sv_freemp : public game_sv_mp, private pure_relcase
 	virtual		LPCSTR				type_name() const { return "freemp"; };
     void __stdcall		net_Relcase(IGameObject* O) {};
 
+	// helper functions
+	void									AddMoneyToPlayer(game_PlayerState* ps, s32 amount);
+
+	virtual		void				OnPlayerRepairItem(NET_Packet& P, ClientID const& clientID);
+	virtual		void				OnPlayerInstallUpgrade(NET_Packet& P, ClientID const& clientID);
 
 	virtual		void				OnPlayerReady(ClientID id_who);
 	virtual		void				OnPlayerConnect(ClientID id_who);
diff --git a/src/xrGame/game_sv_freemp_upgrade_and_repair.cpp b/src/xrGame/game_sv_freemp_upgrade_and_repair.cpp
new file mode 100644
index 00000000000..099b778fe64
--- /dev/null
+++ b/src/xrGame/game_sv_freemp_upgrade_and_repair.cpp
@@ -0,0 +1,61 @@
+#include "stdafx.h"
+#include "game_sv_freemp.h"
+#include "ai_space.h"
+#include "xrScriptEngine/script_engine.hpp"
+#include "inventory_item.h"
+#include "Level.h"
+#include "inventory_upgrade_manager.h"
+
+
+void game_sv_freemp::OnPlayerRepairItem(NET_Packet& P, ClientID const& clientID)
+{
+	game_PlayerState* ps = get_id(clientID);
+	if (!ps) return;
+
+	u16 itemId = P.r_u16();
+	s32 cost = P.r_s32();
+
+	PIItem item = smart_cast<CInventoryItem*>(Level().Objects.net_Find(itemId));
+	if (!item) return;
+
+	if (ps->money_for_round < cost) return;
+
+	AddMoneyToPlayer(ps, -cost);
+
+	NET_Packet NP;
+	CGameObject::u_EventGen(NP, GE_REPAIR_ITEM, itemId);
+	CGameObject::u_EventSend(NP);
+
+	GenerateGameMessage(NP);
+	NP.w_u32(GAME_EVENT_MP_REPAIR_SUCCESS);
+	NP.w_u16(itemId);
+	m_server->SendTo(clientID, NP);
+}
+
+void game_sv_freemp::OnPlayerInstallUpgrade(NET_Packet& P, ClientID const& clientID)
+{
+	game_PlayerState* ps = get_id(clientID);
+	if (!ps) return;
+
+	shared_str upgrade_id;
+	P.r_stringZ(upgrade_id);
+	u16 itemId = P.r_u16();
+	s32 cost = P.r_s32();
+
+	PIItem item = smart_cast<CInventoryItem*>(Level().Objects.net_Find(itemId));
+	if (!item) return;
+
+	if (ps->money_for_round < cost) return;
+
+	AddMoneyToPlayer(ps, -cost);
+
+	NET_Packet NP;
+	CGameObject::u_EventGen(NP, GE_INSTALL_UPGRADE, itemId);
+	NP.w_stringZ(upgrade_id);
+	CGameObject::u_EventSend(NP);
+
+	GenerateGameMessage(NP);
+	NP.w_u32(GAME_EVENT_MP_INSTALL_UPGRADE_SUCCESS);
+	NP.w_u16(itemId);
+	m_server->SendTo(clientID, NP);
+}
diff --git a/src/xrGame/game_sv_mp.cpp b/src/xrGame/game_sv_mp.cpp
index 73c92f9cdca..b473363ec3b 100644
--- a/src/xrGame/game_sv_mp.cpp
+++ b/src/xrGame/game_sv_mp.cpp
@@ -487,6 +487,7 @@ void game_sv_mp::Create(shared_str& options)
     }
     else
     {
+        Level().InitUpgradeManager();
         Msg("Multiplayer>> alife.spawn not found! No A-life");
     }
 	//-------------------------------------------------------------------
diff --git a/src/xrGame/inventory_item.cpp b/src/xrGame/inventory_item.cpp
index bc5ae138e69..9518bb8cfce 100644
--- a/src/xrGame/inventory_item.cpp
+++ b/src/xrGame/inventory_item.cpp
@@ -245,6 +245,11 @@ void CInventoryItem::OnEvent(NET_Packet& P, u16 type)
         Detach(i_name, true);
     }
     break;
+    case GE_REPAIR_ITEM:
+    {
+        SetCondition(1.0f);
+    }
+    break;
     case GE_CHANGE_POS:
     {
         Fvector p;
diff --git a/src/xrGame/inventory_item_upgrade.cpp b/src/xrGame/inventory_item_upgrade.cpp
index c5439654de0..342c2a36a68 100644
--- a/src/xrGame/inventory_item_upgrade.cpp
+++ b/src/xrGame/inventory_item_upgrade.cpp
@@ -151,11 +151,6 @@ void CInventoryItem::log_upgrades()
 
 void CInventoryItem::net_Spawn_install_upgrades(CSE_Abstract* DC) // net_Spawn
 {
-    if (!IsGameTypeSingle() || !ai().get_alife())
-    {
-        return;
-    }
-
     CSE_ALifeInventoryItem* pSE_InventoryItem = smart_cast<CSE_ALifeInventoryItem*>(DC);
     if (!pSE_InventoryItem)
     {
@@ -166,11 +161,17 @@ void CInventoryItem::net_Spawn_install_upgrades(CSE_Abstract* DC) // net_Spawn
 
     m_upgrades.clear();
 
-    ai().alife().inventory_upgrade_manager().init_install(*this); // from pSettings
+    Level().UpgradeManager().init_install(*this); // from pSettings
 
-    for (const auto& upgrade : saved_upgrades)
+    if (IsGameTypeSingle())
+    {
+        for (auto& upgrade : saved_upgrades)
+            Level().UpgradeManager().upgrade_install(*this, (*upgrade), true);
+    }
+    else
     {
-        ai().alife().inventory_upgrade_manager().upgrade_install(*this, *upgrade, true);
+        for (auto& upgrade : saved_upgrades)
+            Level().UpgradeManager().upgrade_install_mp(*this, (*upgrade), true);
     }
 }
 
diff --git a/src/xrGame/inventory_upgrade.cpp b/src/xrGame/inventory_upgrade.cpp
index 991c8069054..0e0e4d7ee66 100644
--- a/src/xrGame/inventory_upgrade.cpp
+++ b/src/xrGame/inventory_upgrade.cpp
@@ -48,7 +48,7 @@ void Upgrade::construct(const shared_str& upgrade_id, Group& parental_group, Man
     R_ASSERT2(GEnv.ScriptEngine->functor(precondition_functor_str, m_preconditions.functr),
         make_string(
             "Failed to get precondition functor in section[%s], functor[%s]", id_str(), precondition_functor_str));
-    m_preconditions();
+    //m_preconditions();
 
     // effect_functor
     LPCSTR effect_functor_str = pSettings->r_string(id(), "effect_functor");
@@ -57,7 +57,7 @@ void Upgrade::construct(const shared_str& upgrade_id, Group& parental_group, Man
     m_effects.parameter3 = 1;
     R_ASSERT2(GEnv.ScriptEngine->functor(effect_functor_str, m_effects.functr),
         make_string("Failed to get effect functor in section[%s], functor[%s]", id_str(), effect_functor_str));
-    m_effects();
+    //m_effects();
 
     // prereq_functor (1,2) : m_prerequisites, m_tooltip
     LPCSTR prereq_functor_str = pSettings->r_string(id(), "prereq_functor"); // prerequisites_functor
@@ -67,7 +67,7 @@ void Upgrade::construct(const shared_str& upgrade_id, Group& parental_group, Man
     //	m_tooltip.parameter			= pSettings->r_string( id(), "prereq_params" );
     R_ASSERT2(GEnv.ScriptEngine->functor(prereq_functor_str, m_prerequisites.functr),
         make_string("Failed to get prerequisites functor in section[%s], functor[%s]", id_str(), prereq_functor_str));
-    m_prerequisites();
+    //m_prerequisites();
 
     /*R_ASSERT2(
         GEnv.ScriptEngine->functor( tooltip_functor_str, m_tooltip.functr ),
diff --git a/src/xrGame/inventory_upgrade_manager.h b/src/xrGame/inventory_upgrade_manager.h
index 189a6af5328..cbe7167898e 100644
--- a/src/xrGame/inventory_upgrade_manager.h
+++ b/src/xrGame/inventory_upgrade_manager.h
@@ -62,7 +62,9 @@ class Manager : private Noncopyable
 
     bool can_install_upgrade(CInventoryItem& item, shared_str const& upgrade_id);
     bool can_add_upgrade(CInventoryItem& item, shared_str const& upgrade_id);
+    bool can_upgrade_install(CInventoryItem& item, shared_str const& upgrade_id, bool loading) { return false;  };
     bool upgrade_install(CInventoryItem& item, shared_str const& upgrade_id, bool loading);
+    bool upgrade_install_mp(CInventoryItem& item, shared_str const& upgrade_id, bool loading) { return false; };
     bool upgrade_add(CInventoryItem& item, shared_str const& upgrade_id);
     void init_install(CInventoryItem& item);
 
@@ -93,7 +95,7 @@ class Manager : private Noncopyable
     Upgrades_type m_upgrades;
 
 public:
-    Properties_type m_properties;
+    Properties_type m_properties{};
 
 }; // class Manager
 
diff --git a/src/xrGame/ui/UIActorMenu.cpp b/src/xrGame/ui/UIActorMenu.cpp
index 643ea661a0e..5204c28eedf 100644
--- a/src/xrGame/ui/UIActorMenu.cpp
+++ b/src/xrGame/ui/UIActorMenu.cpp
@@ -995,7 +995,14 @@ void CUIActorMenu::UpdateActorMP()
     xr_sprintf(buf, "%d RU", money);
     m_ActorMoney->SetText(buf);
 
-    GetModeSpecificActorInfo()->InitCharacterMP(Game().local_player->getName(), "ui_npc_u_nebo_1");
+    if (Game().Type() == eGameIDFreeMp)
+    {
+        GetModeSpecificActorInfo()->InitCharacterMP(m_pActorInvOwner);
+    }
+    else
+    {
+        GetModeSpecificActorInfo()->InitCharacterMP(Game().local_player->getName(), "ui_npc_u_nebo_1");
+    }
 }
 
 bool CUIActorMenu::CanSetItemToList(PIItem item, CUIDragDropListEx* l, u16& ret_slot)
diff --git a/src/xrGame/ui/UIActorMenu.h b/src/xrGame/ui/UIActorMenu.h
index 224b765c88a..02232631e13 100644
--- a/src/xrGame/ui/UIActorMenu.h
+++ b/src/xrGame/ui/UIActorMenu.h
@@ -26,6 +26,7 @@ class CTrade;
 class CUIProgressBar;
 class CUITradeBar;
 class CUIWeightBar;
+class CWeaponMagazined;
 
 namespace inventory
 {
@@ -333,6 +334,7 @@ class CUIActorMenu final : public CUIDialogWnd, public CUIWndCallback
 
     void AttachAddon(PIItem item_to_upgrade);
     void DetachAddon(LPCSTR addon_name, PIItem itm = NULL);
+    void UnloadWeapon(CWeaponMagazined* pWpn);
 
     void SendEvent_Item2Slot(PIItem pItem, u16 parent, u16 slot_id);
     void SendEvent_Item2Belt(PIItem pItem, u16 parent);
@@ -376,6 +378,8 @@ class CUIActorMenu final : public CUIDialogWnd, public CUIWndCallback
 
     void OnInventoryAction(PIItem pItem, u16 action_type);
     void ShowRepairButton(bool status);
+    void OnSuccessRepairMP(PIItem item);
+    void OnSuccessUpgradeInstallMP(PIItem item);
     bool SetInfoCurUpgrade(Upgrade_type* upgrade_type, CInventoryItem* inv_item);
     void SeparateUpgradeItem();
     PIItem get_upgrade_item();
diff --git a/src/xrGame/ui/UIActorMenuInitialize.cpp b/src/xrGame/ui/UIActorMenuInitialize.cpp
index 3a172064777..66b20b2b6c1 100644
--- a/src/xrGame/ui/UIActorMenuInitialize.cpp
+++ b/src/xrGame/ui/UIActorMenuInitialize.cpp
@@ -283,13 +283,10 @@ void CUIActorMenu::InitializeUniversal(CUIXml& uiXml)
     //-	m_ItemInfo->SetAutoDelete			(true);
     //-	AttachChild							(m_ItemInfo);
 
-    if (ai().get_alife())
-    {
-        m_upgrade_info = xr_new<UIInvUpgradeInfo>();
-        m_upgrade_info->SetAutoDelete(true);
-        AttachChild(m_upgrade_info);
-        m_upgrade_info->init_from_xml(ACTOR_MENU_ITEM_XML);
-    }
+    m_upgrade_info = xr_new<UIInvUpgradeInfo>();
+    m_upgrade_info->SetAutoDelete(true);
+    AttachChild(m_upgrade_info);
+    m_upgrade_info->init_from_xml(ACTOR_MENU_ITEM_XML);
 }
 
 void CUIActorMenu::InitializeInventoryMode(CUIXml& uiXml)
diff --git a/src/xrGame/ui/UIActorMenuInventory.cpp b/src/xrGame/ui/UIActorMenuInventory.cpp
index 0d1ec74e450..75b318454ea 100644
--- a/src/xrGame/ui/UIActorMenuInventory.cpp
+++ b/src/xrGame/ui/UIActorMenuInventory.cpp
@@ -388,6 +388,22 @@ void CUIActorMenu::DetachAddon(LPCSTR addon_name, PIItem itm)
         itm->Detach(addon_name, true);
 }
 
+void CUIActorMenu::UnloadWeapon(CWeaponMagazined* pWpn)
+{
+    if (!pWpn) return;
+
+    if (IsGameTypeSingle() || OnServer())
+    {
+        pWpn->UnloadMagazine();
+    }
+    else
+    {
+        NET_Packet P;
+        CGameObject::u_EventGen(P, GE_WPN_UNLOAD_AMMO, pWpn->ID());
+        CGameObject::u_EventSend(P);
+    }
+}
+
 void CUIActorMenu::InitCellForSlot(u16 slot_idx)
 {
     //VERIFY(KNIFE_SLOT <= slot_idx && slot_idx <= LAST_SLOT);
@@ -1079,7 +1095,7 @@ void CUIActorMenu::PropertiesBoxForWeapon(CUICellItem* cell_item, PIItem item, b
         {
         }
     }
-    if (smart_cast<CWeaponMagazined*>(pWeapon) && IsGameTypeSingle())
+    if (smart_cast<CWeaponMagazined*>(pWeapon))
     {
         bool b = (pWeapon->GetAmmoElapsed() != 0);
         if (!b)
@@ -1500,14 +1516,14 @@ void CUIActorMenu::ProcessPropertiesBoxClicked(CUIWindow* w, void* d)
         {
             break;
         }
-        weap_mag->UnloadMagazine();
+        UnloadWeapon(weap_mag);
         for (u32 i = 0; i < cell_item->ChildsCount(); ++i)
         {
             CUICellItem* child_itm = cell_item->Child(i);
             CWeaponMagazined* child_weap_mag = smart_cast<CWeaponMagazined*>((CWeapon*)child_itm->m_pData);
             if (child_weap_mag)
             {
-                child_weap_mag->UnloadMagazine();
+                UnloadWeapon(child_weap_mag);
             }
         }
         break;
diff --git a/src/xrGame/ui/UIActorMenuUpgrade.cpp b/src/xrGame/ui/UIActorMenuUpgrade.cpp
index 80222656ecd..4346b2f322b 100644
--- a/src/xrGame/ui/UIActorMenuUpgrade.cpp
+++ b/src/xrGame/ui/UIActorMenuUpgrade.cpp
@@ -141,3 +141,25 @@ void CUIActorMenu::SeparateUpgradeItem()
     //		m_upgrade_selected->Mark( true );
     //	}
 }
+
+void CUIActorMenu::OnSuccessRepairMP(PIItem item)
+{
+    UpdateItemsPlace();
+
+    //UpdateConditionProgressBars();
+
+    if (CurrentItem() && ((PIItem)m_upgrade_selected->m_pData)->object_id() == item->object_id())
+    {
+        SeparateUpgradeItem();
+    }
+}
+
+void CUIActorMenu::OnSuccessUpgradeInstallMP(PIItem item)
+{
+    UpdateItemsPlace();
+
+    if (CurrentItem() && ((PIItem)m_upgrade_selected->m_pData)->object_id() == item->object_id())
+    {
+        SeparateUpgradeItem();
+    }
+}
diff --git a/src/xrGame/ui/UIActorMenu_script.cpp b/src/xrGame/ui/UIActorMenu_script.cpp
index c0a28730a6c..0a145b71fe3 100644
--- a/src/xrGame/ui/UIActorMenu_script.cpp
+++ b/src/xrGame/ui/UIActorMenu_script.cpp
@@ -67,6 +67,28 @@ void CUIActorMenu::RepairEffect_CurItem()
     {
         return;
     }
+
+    if (!IsGameTypeSingle())
+    {
+        LPCSTR item_name = item->m_section_id.c_str();
+        luabind::functor<int> funct;
+        R_ASSERT2(
+            GEnv.ScriptEngine->functor("inventory_upgrades.how_much_repair", funct),
+            make_string("Failed to get functor <inventory_upgrades.how_much_repair>, item = %s", item_name)
+        );
+
+        int cost = funct(item_name, item->GetCondition());
+
+        NET_Packet P;
+        CGameObject::u_EventGen(P, GE_GAME_EVENT, item->object().ID());
+        P.w_u16(GAME_EVENT_MP_REPAIR);
+        P.w_u16(item->object().ID());
+        P.w_s32(cost);
+        CGameObject::u_EventSend(P);
+
+        return;
+    }
+
     LPCSTR item_name = item->m_section_id.c_str();
 
     luabind::functor<void> funct;
diff --git a/src/xrGame/ui/UIInvUpgradeProperty.cpp b/src/xrGame/ui/UIInvUpgradeProperty.cpp
index 296a64489c2..2432f9bdf44 100644
--- a/src/xrGame/ui/UIInvUpgradeProperty.cpp
+++ b/src/xrGame/ui/UIInvUpgradeProperty.cpp
@@ -17,6 +17,7 @@
 #include "ai_space.h"
 #include "alife_simulator.h"
 #include "inventory_upgrade_manager.h"
+#include "Level.h"
 #include "inventory_upgrade.h"
 #include "inventory_upgrade_property.h"
 #include "UIHelper.h"
@@ -49,11 +50,7 @@ bool UIProperty::init_property(shared_str const& property_id)
 
 UIProperty::Property_type* UIProperty::get_property()
 {
-    if (!ai().get_alife())
-    {
-        return NULL;
-    }
-    Property_type* proper = ai().alife().inventory_upgrade_manager().get_property(m_property_id);
+    Property_type* proper = Level().UpgradeManager().get_property(m_property_id);
     VERIFY(proper);
     return proper;
 }
diff --git a/src/xrGame/ui/UIInventoryUpgradeWnd.cpp b/src/xrGame/ui/UIInventoryUpgradeWnd.cpp
index 6f424861841..2d43ced79ef 100644
--- a/src/xrGame/ui/UIInventoryUpgradeWnd.cpp
+++ b/src/xrGame/ui/UIInventoryUpgradeWnd.cpp
@@ -152,7 +152,7 @@ void CUIInventoryUpgradeWnd::InitInventory(CUICellItem* cellItem, bool can_upgra
     }
     m_btn_repair->Enable(false);
 
-    if (ai().get_alife() && m_inv_item)
+    if (m_inv_item)
     {
         if (install_item(*m_inv_item, can_upgrade))
         {
diff --git a/src/xrGame/ui/UIMainIngameWnd.cpp b/src/xrGame/ui/UIMainIngameWnd.cpp
index eadd88bdae2..ff8148123a7 100644
--- a/src/xrGame/ui/UIMainIngameWnd.cpp
+++ b/src/xrGame/ui/UIMainIngameWnd.cpp
@@ -120,6 +120,16 @@ void CUIMainIngameWnd::Init()
     m_ind_outfit_broken = UIHelper::CreateStatic(uiXml, "indicator_outfit_broken", this, false);
     m_ind_overweight = UIHelper::CreateStatic(uiXml, "indicator_overweight", this, false);
 
+    if(!IsGameTypeSingle())
+    {
+        m_icon_microphone = UIHelper::CreateStatic(uiXml, "icon_microphone", this);
+        m_icon_microphone->Show(true);
+
+        m_voice_distance = UIHelper::CreateStatic(uiXml, "voice_distance", this);
+
+        SetActiveVoiceIcon(false);
+    }
+
     if ((m_ind_boost_psy = UIHelper::CreateStatic(uiXml, "indicator_booster_psy", this, false)))
         m_ind_boost_psy->Show(false);
 
@@ -308,6 +318,28 @@ void CUIMainIngameWnd::Draw()
     RenderQuickInfos();
 }
 
+void CUIMainIngameWnd::SetActiveVoiceIcon(bool active)
+{
+	R_ASSERT(m_icon_microphone || m_voice_distance);
+
+	u32 a = active ? 255 : 100;
+
+	u32 color = m_icon_microphone->GetTextureColor();
+	m_icon_microphone->SetTextureColor(subst_alpha(color, a));
+
+	color = m_voice_distance->GetTextColor();
+	m_voice_distance->SetTextColor(subst_alpha(color, a));
+}
+
+void CUIMainIngameWnd::SetVoiceDistance(u8 distance)
+{
+	R_ASSERT(m_voice_distance);
+
+	string16 text;
+	xr_sprintf(text, sizeof(text), "%u", distance);
+	m_voice_distance->SetText(text);
+}
+
 void CUIMainIngameWnd::SetMPChatLog(CUIWindow* pChat, CUIWindow* pLog)
 {
     m_pMPChatWnd = pChat;
diff --git a/src/xrGame/ui/UIMainIngameWnd.h b/src/xrGame/ui/UIMainIngameWnd.h
index b86844be5e6..e38597ecffd 100644
--- a/src/xrGame/ui/UIMainIngameWnd.h
+++ b/src/xrGame/ui/UIMainIngameWnd.h
@@ -43,6 +43,9 @@ class CUIMainIngameWnd final : public CUIWindow
     CUIStatic* m_ind_outfit_broken{};
     CUIStatic* m_ind_overweight{};
 
+    CUIStatic* m_icon_microphone = nullptr;
+    CUIStatic* m_voice_distance = nullptr;
+
 public:
     CUIStatic* m_ind_boost_psy{};
     CUIStatic* m_ind_boost_radia{};
@@ -102,6 +105,9 @@ class CUIMainIngameWnd final : public CUIWindow
         ewiArtefact,
     };
 
+    void SetActiveVoiceIcon(bool active);
+    void SetVoiceDistance(u8 distance);
+
     void SetMPChatLog(CUIWindow* pChat, CUIWindow* pLog);
 
     // Задаем цвет соответствующей иконке
diff --git a/src/xrGame/ui/UIMapList.cpp b/src/xrGame/ui/UIMapList.cpp
index 47b07a7aaa8..468c218a4d7 100644
--- a/src/xrGame/ui/UIMapList.cpp
+++ b/src/xrGame/ui/UIMapList.cpp
@@ -167,7 +167,7 @@ EGameIDs CUIMapList::GetCurGameType()
         else if (0 == xr_strcmp(text, StringTable().translate(get_token_name(g_GameModes, eGameIDFreeMp))))
             return eGameIDFreeMp;
         else
-            NODEFAULT;
+            return eGameIDTeamDeathmatch;
     }
     else if (spin_ms)
     {
diff --git a/src/xrGame/xrGame.vcxproj b/src/xrGame/xrGame.vcxproj
index f60527e34e4..42a8c40e803 100644
--- a/src/xrGame/xrGame.vcxproj
+++ b/src/xrGame/xrGame.vcxproj
@@ -729,6 +729,8 @@
     <ClInclude Include="game_cl_deathmatch_snd_messages.h" />
     <ClInclude Include="game_cl_freemp.h" />
     <ClInclude Include="game_cl_mp.h" />
+    <ClInclude Include="VoiceChat.h" />
+    <ClInclude Include="VoiceSender.h" />
     <ClInclude Include="game_cl_mp_messages_menu.h" />
     <ClInclude Include="game_cl_mp_script.h" />
     <ClInclude Include="game_cl_mp_snd_messages.h" />
@@ -2224,7 +2226,10 @@
     <ClCompile Include="game_cl_deathmatch.cpp" />
     <ClCompile Include="game_cl_deathmatch_buywnd.cpp" />
     <ClCompile Include="game_cl_freemp.cpp" />
+    <ClCompile Include="game_cl_freemp_messages.cpp" />
     <ClCompile Include="game_cl_mp.cpp" />
+    <ClCompile Include="VoiceChat.cpp" />
+    <ClCompile Include="VoiceSender.cpp" />
     <ClCompile Include="game_cl_mp_messages_menu.cpp" />
     <ClCompile Include="game_cl_mp_script.cpp">
       <PrecompiledHeaderFile>pch_script.h</PrecompiledHeaderFile>
@@ -2254,6 +2259,7 @@
     </ClCompile>
     <ClCompile Include="game_sv_event_queue.cpp" />
     <ClCompile Include="game_sv_freemp.cpp" />
+    <ClCompile Include="game_sv_freemp_upgrade_and_repair.cpp" />
     <ClCompile Include="game_sv_item_respawner.cpp" />
     <ClCompile Include="game_sv_mp.cpp" />
     <ClCompile Include="game_sv_mp_script.cpp">
@@ -2698,8 +2704,8 @@
       <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName)_script.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
     <ClCompile Include="script_event.cpp">
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">pch_script.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">$(IntDir)$(ProjectName)_script.pch</PrecompiledHeaderOutputFile>
+      <PrecompiledHeaderFile>pch_script.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName)_script.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
     <ClCompile Include="script_game_object.cpp">
       <PrecompiledHeaderFile>pch_script.h</PrecompiledHeaderFile>
diff --git a/src/xrGame/xrGame.vcxproj.filters b/src/xrGame/xrGame.vcxproj.filters
index b9f85f93713..67b29ca93bb 100644
--- a/src/xrGame/xrGame.vcxproj.filters
+++ b/src/xrGame/xrGame.vcxproj.filters
@@ -6374,6 +6374,8 @@
     <ClInclude Include="net_physics_state.h">
       <Filter>AI\AMonsters\common\net</Filter>
     </ClInclude>
+    <ClInclude Include="VoiceChat.h" />
+    <ClInclude Include="VoiceSender.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="damage_manager.cpp">
@@ -9618,6 +9620,14 @@
     <ClCompile Include="net_physics_state.cpp">
       <Filter>AI\AMonsters\common\net</Filter>
     </ClCompile>
+    <ClCompile Include="game_cl_freemp_messages.cpp">
+      <Filter>Core\Server\Games\client\freemp</Filter>
+    </ClCompile>
+    <ClCompile Include="game_sv_freemp_upgrade_and_repair.cpp">
+      <Filter>Core\Server\Games\client\freemp</Filter>
+    </ClCompile>
+    <ClCompile Include="VoiceChat.cpp" />
+    <ClCompile Include="VoiceSender.cpp" />
   </ItemGroup>
   <ItemGroup>
     <Natvis Include="..\OpenXRay.natvis" />
diff --git a/src/xrGame/xrServer.cpp b/src/xrGame/xrServer.cpp
index f36defaacca..7cb9a473ece 100644
--- a/src/xrGame/xrServer.cpp
+++ b/src/xrGame/xrServer.cpp
@@ -583,6 +583,11 @@ u32 xrServer::OnMessage(NET_Packet& P, ClientID sender) // Non-Zero means broadc
         OnChatMessage(&P, l_pC);
     }
     break;
+    case M_VOICE_MESSAGE:
+    {
+        OnVoiceMessage(P, sender);
+    }
+    break;
     case M_SV_MAP_NAME:
     {
         xrClientData* l_pC = ID_to_client(sender);
@@ -897,6 +902,61 @@ void xrServer::OnChatMessage(NET_Packet* P, xrClientData* CL)
     ForEachClientDoSender(mesenger);
 };
 
+void xrServer::OnVoiceMessage(NET_Packet& P, ClientID sender)
+{
+	xrClientData* pClient = (xrClientData*)ID_to_client(sender);
+
+	if (!pClient || !pClient->net_Ready) return;
+	game_PlayerState* ps = pClient->ps;
+	if (!ps) return;
+	if (!pClient->owner) return;
+
+	// Msg("VoiceMessage size: %u", P.B.count);
+
+	struct send_voice_message
+	{
+		xrServer* m_server;
+		NET_Packet* m_packet;
+		xrClientData* m_from;
+		float m_voiceDistanceSqr;
+
+		void operator()(IClient* client)
+		{
+			if (client == m_server->GetServerClient())
+				return;
+
+			xrClientData* CL = static_cast<xrClientData*>(client);
+			if (!CL || !CL->net_Ready || !CL->owner || !m_from->owner || !m_from->ps)
+				return;
+
+			if (CL->ID == m_from->ID)
+				return;
+
+			game_PlayerState* ps = CL->ps;
+			if (!ps || ps->testFlag(GAME_PLAYER_FLAG_VERY_VERY_DEAD))
+				return;
+
+			float distanceSqr = CL->owner->Position().distance_to_sqr(m_from->owner->Position());
+
+			if (distanceSqr <= m_voiceDistanceSqr)
+			{
+				m_server->SendTo(CL->ID, *m_packet, net_flags(FALSE, TRUE, TRUE, TRUE));
+			}
+		}
+	};
+
+	u8 distance = P.r_u8(); // distance byte
+	float voiceDistanceSqr = (float)distance * (float)distance;
+
+	send_voice_message tmp_functor;
+	tmp_functor.m_server = this;
+	tmp_functor.m_packet = &P;
+	tmp_functor.m_from = pClient;
+	tmp_functor.m_voiceDistanceSqr = voiceDistanceSqr;
+
+	ForEachClientDoSender(tmp_functor);
+};
+
 #ifdef DEBUG
 
 static BOOL _ve_initialized = FALSE;
diff --git a/src/xrGame/xrServer.h b/src/xrGame/xrServer.h
index 2849214ce8f..4d9a56bdcfc 100644
--- a/src/xrGame/xrServer.h
+++ b/src/xrGame/xrServer.h
@@ -225,6 +225,7 @@ class xrServer : public NET_SERVER_CLASS
 
     void SendConnectionData(IClient* CL);
     void OnChatMessage(NET_Packet* P, xrClientData* CL);
+    void OnVoiceMessage(NET_Packet& P, ClientID sender);
     void OnProcessClientMapData(NET_Packet& P, ClientID const& clientID);
 
 private:
diff --git a/src/xrGame/xrServer_process_event.cpp b/src/xrGame/xrServer_process_event.cpp
index f48b30811e2..28d50a6854c 100644
--- a/src/xrGame/xrServer_process_event.cpp
+++ b/src/xrGame/xrServer_process_event.cpp
@@ -56,7 +56,9 @@ void xrServer::Process_event(NET_Packet& P, ClientID sender)
     case GEG_PLAYER_ITEM2SLOT:
     case GEG_PLAYER_ITEM2BELT:
     case GEG_PLAYER_ITEM2RUCK:
-    case GE_GRENADE_EXPLODE: { SendBroadcast(BroadcastCID, P, MODE);
+    case GE_GRENADE_EXPLODE:
+    case GE_WPN_UNLOAD_AMMO:
+    case GE_WPN_UPDATE_AMMO: { SendBroadcast(BroadcastCID, P, MODE);
     }
     break;
     case GEG_PLAYER_ACTIVATEARTEFACT:
@@ -264,6 +266,17 @@ void xrServer::Process_event(NET_Packet& P, ClientID sender)
     case GE_CHANGE_POS: { SendTo(SV_Client->ID, P, net_flags(TRUE, TRUE));
     }
     break;
+    case GE_REPAIR_ITEM:
+    {
+        CSE_ALifeInventoryItem* iitem = smart_cast<CSE_ALifeInventoryItem*>(receiver);
+        if (!iitem)
+            break;
+
+        iitem->m_fCondition = 1.0f;
+
+        SendBroadcast(BroadcastCID, P, net_flags(TRUE, TRUE));
+    }
+    break;
     case GE_INSTALL_UPGRADE:
     {
         shared_str upgrade_id;
diff --git a/src/xrNetServer/BaseServer.cpp b/src/xrNetServer/BaseServer.cpp
index 5b4ab1b36cb..cada1136cc6 100644
--- a/src/xrNetServer/BaseServer.cpp
+++ b/src/xrNetServer/BaseServer.cpp
@@ -300,7 +300,7 @@ void BaseServer::ClearStatistic()
 bool BaseServer::DisconnectAddress(const ip_address& Address, LPCSTR reason)
 {
     u32 players_count = net_players.ClientsCount();
-    buffer_vector<IClient*>	PlayersToDisconnect(_alloca(players_count * sizeof(IClient*)), players_count);
+    buffer_vector<IClient*>	PlayersToDisconnect(alloca(players_count * sizeof(IClient*)), players_count);
     ToDisconnectFillerFunctor tmp_functor(this, &PlayersToDisconnect, &Address);
     net_players.ForEachClientDo(tmp_functor);
 
diff --git a/src/xrNetServer/CMakeLists.txt b/src/xrNetServer/CMakeLists.txt
index 84012b9f117..c18b5170316 100644
--- a/src/xrNetServer/CMakeLists.txt
+++ b/src/xrNetServer/CMakeLists.txt
@@ -1,13 +1,22 @@
 add_library(xrNetServer SHARED)
 
 target_sources(xrNetServer PRIVATE
+    BaseClient.cpp
+    BaseClient.h
+    BaseServer.cpp
+    BaseServer.h
+    ClientConnectionOptions.h
     guids.cpp
+    IBannedClient.cpp
+    IBannedClient.h
+    IClient.cpp
+    IClient.h
+    IClientStatistic.cpp
+    IClientStatistic.h
     ip_filter.cpp
     ip_filter.h
     NET_AuthCheck.cpp
     NET_AuthCheck.h
-    #NET_Client.cpp
-    #NET_Client.h
     NET_Common.cpp
     NET_Common.h
     NET_Compressor.cpp
@@ -15,12 +24,15 @@ target_sources(xrNetServer PRIVATE
     NET_Log.cpp
     NET_Log.h
     NET_Messages.h
-    NET_PlayersMonitor.h
-    #NET_Server.cpp
-    #NET_Server.h
     NET_Shared.h
+    PlayersMonitor.h
+    ServerConnectionOptions.h
     stdafx.cpp
     stdafx.h
+    SteamNetClient.cpp
+    SteamNetClient.h
+    SteamNetServer.cpp
+    SteamNetServer.h
     empty/NET_Client.cpp
     empty/NET_Client.h
     empty/NET_Server.cpp
@@ -31,6 +43,7 @@ target_include_directories(xrNetServer
     PRIVATE
     "${CMAKE_CURRENT_SOURCE_DIR}"
     "${CMAKE_SOURCE_DIR}/src"
+    "${CMAKE_SOURCE_DIR}/sdk/include"
 )
 
 target_link_libraries(xrNetServer
diff --git a/src/xrNetServer/IBannedClient.cpp b/src/xrNetServer/IBannedClient.cpp
index 272c32252e9..67a2172d67e 100644
--- a/src/xrNetServer/IBannedClient.cpp
+++ b/src/xrNetServer/IBannedClient.cpp
@@ -34,7 +34,7 @@ xr_string IBannedClient::BannedTimeTo() const
 {
 	string256			res;
 	tm*					_tm_banned;
-	_tm_banned = _localtime64(&BanTime);
+	_tm_banned = localtime(&BanTime);
 	xr_sprintf(res, sizeof(res),
 		"%02d.%02d.%d_%02d:%02d:%02d",
 		_tm_banned->tm_mday,
diff --git a/src/xrNetServer/NET_Shared.h b/src/xrNetServer/NET_Shared.h
index b1c8674ddf9..65d759d2140 100644
--- a/src/xrNetServer/NET_Shared.h
+++ b/src/xrNetServer/NET_Shared.h
@@ -24,6 +24,11 @@
 
 // #define USE_DIRECT_PLAY
 
+// Define DirectPlay constants for compatibility
+#if !defined(DPNSEND_GUARANTEED) && !defined(XR_PLATFORM_WINDOWS)
+#define DPNSEND_GUARANTEED 0x00000008
+#endif
+
 IC bool UseDirectPlay()
 {
 #ifdef USE_DIRECT_PLAY
@@ -61,4 +66,17 @@ extern "C"
 {
     typedef struct _DPN_CONNECTION_INFO DPN_CONNECTION_INFO;
 }
+#else
+// Dummy structure for Linux builds
+typedef struct _DPN_CONNECTION_INFO {
+    u32 dwMessagesReceived;
+    u32 dwMessagesTransmittedHighPriority;
+    u32 dwMessagesTransmittedNormalPriority;
+    u32 dwMessagesTransmittedLowPriority;
+    u32 dwRoundTripLatencyMS;
+    u32 dwThroughputBPS;
+    u32 dwPeakThroughputBPS;
+    u32 dwPacketsDropped;
+    u32 dwPacketsRetried;
+} DPN_CONNECTION_INFO;
 #endif
diff --git a/src/xrNetServer/empty/NET_Client.h b/src/xrNetServer/empty/NET_Client.h
index 2f3b20c09cb..50ea9c626d1 100644
--- a/src/xrNetServer/empty/NET_Client.h
+++ b/src/xrNetServer/empty/NET_Client.h
@@ -3,6 +3,7 @@
 #include "Common/Noncopyable.hpp"
 #include "../NET_Common.h"
 #include "../NET_Shared.h"
+#include "../IClientStatistic.h"
 #include "xrCommon/xr_deque.h"
 #include "xrCommon/xr_vector.h"
 #include "xrCore/xrstring.h"
diff --git a/src/xrNetServer/empty/NET_Server.cpp b/src/xrNetServer/empty/NET_Server.cpp
index a8b95bac5b5..5397d4ed527 100644
--- a/src/xrNetServer/empty/NET_Server.cpp
+++ b/src/xrNetServer/empty/NET_Server.cpp
@@ -94,6 +94,7 @@ struct ClientStatisticImpl {
     CTimer* device_timer;
 };
 
+#ifdef XR_PLATFORM_WINDOWS
 IClientStatistic::IClientStatistic()
     : m_pimpl(xr_new<ClientStatisticImpl>())
 {
@@ -127,7 +128,9 @@ u32 IClientStatistic::getMPS_Receive() const { return m_pimpl->mps_receive; }
 u32 IClientStatistic::getMPS_Send() const { return m_pimpl->mps_send; }
 u32 IClientStatistic::getReceivedPerSec() const { return dwBytesReceivedPerSec; }
 u32 IClientStatistic::getSendedPerSec() const { return dwBytesSendedPerSec; }
+#endif
 
+#ifdef XR_PLATFORM_WINDOWS
 void IClientStatistic::Clear()
 {
     // XXX: Ugly, ugly hack (just following the lead of original code). FIX!
@@ -139,6 +142,7 @@ void IClientStatistic::Clear()
     m_pimpl->device_timer = saved_timer;
     m_pimpl->dwBaseTime = TimeGlobal(m_pimpl->device_timer);
 }
+#endif
 
 //------------------------------------------------------------------------------
 
diff --git a/src/xrNetServer/empty/NET_Server.h b/src/xrNetServer/empty/NET_Server.h
index f713b39d176..9a511440f8e 100644
--- a/src/xrNetServer/empty/NET_Server.h
+++ b/src/xrNetServer/empty/NET_Server.h
@@ -1,22 +1,10 @@
 #pragma once
 
 #include "../NET_Common.h"
-#include "../NET_PlayersMonitor.h"
+#include "../PlayersMonitor.h"
 #include "../NET_Shared.h"
 #include "../ip_filter.h"
-
-struct SClientConnectData {
-    ClientID clientID;
-    string64 name;
-    string64 pass;
-    u32 process_id;
-
-    SClientConnectData()
-    {
-        name[0] = pass[0] = 0;
-        process_id = 0;
-    }
-};
+#include "../IClientStatistic.h"
 
 // -----------------------------------------------------
 
diff --git a/src/xrNetServer/xrNetServer.vcxproj.filters b/src/xrNetServer/xrNetServer.vcxproj.filters
index 5915ae864a4..3ef52978e80 100644
--- a/src/xrNetServer/xrNetServer.vcxproj.filters
+++ b/src/xrNetServer/xrNetServer.vcxproj.filters
@@ -52,7 +52,6 @@
     <ClInclude Include="NET_Compressor.h" />
     <ClInclude Include="NET_Log.h" />
     <ClInclude Include="NET_Messages.h" />
-    <ClInclude Include="NET_PlayersMonitor.h" />
     <ClInclude Include="NET_Shared.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="IClientStatistic.h">
@@ -124,4 +123,9 @@
       <UniqueIdentifier>{e9d7a0f5-655c-4c81-b93c-cdb619930612}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
+  <ItemGroup>
+    <CopyFileToFolders Include="..\..\sdk\binaries\$(PlatformShortName)\abseil_dll.dll" />
+    <CopyFileToFolders Include="..\..\sdk\binaries\$(PlatformShortName)\GameNetworkingSockets.dll" />
+    <CopyFileToFolders Include="..\..\sdk\binaries\$(PlatformShortName)\libprotobufd.dll" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/xrServerEntities/xrMessages.h b/src/xrServerEntities/xrMessages.h
index ceb9ae18dd2..c395fd75e61 100644
--- a/src/xrServerEntities/xrMessages.h
+++ b/src/xrServerEntities/xrMessages.h
@@ -77,6 +77,10 @@ enum : u32
     M_SECURE_MESSAGE,
     M_CREATE_PLAYER_STATE,
     M_COMPRESSED_UPDATE_OBJECTS,
+
+    M_VOICE_MESSAGE,
+
+    MSG_FORCEDWORD				= u32(-1)
 };
 
 enum : u32
@@ -106,10 +110,13 @@ enum : u32
 
     GE_WPN_AMMO_ADD,
     GE_WPN_STATE_CHANGE,
+    GE_WPN_UNLOAD_AMMO,
+    GE_WPN_UPDATE_AMMO,
 
     GE_ADDON_ATTACH,
     GE_ADDON_DETACH,
     GE_ADDON_CHANGE,
+    GE_REPAIR_ITEM,
     GE_INSTALL_UPGRADE,
 
     GE_GRENADE_EXPLODE,
@@ -222,6 +229,13 @@ enum EGameMessages : u32
     GAME_EVENT_CREATE_PLAYER_STATE,
     GAME_EVENT_PLAYERS_INFO_REPLY,
 
+    //-----------------------------------------
+
+    GAME_EVENT_MP_REPAIR,
+    GAME_EVENT_MP_REPAIR_SUCCESS,
+    GAME_EVENT_MP_INSTALL_UPGRADE,
+    GAME_EVENT_MP_INSTALL_UPGRADE_SUCCESS,
+
     //-----------------------------------------
     GAME_EVENT_SCRIPT_BEGINS_FROM, // don't add messages after this
 };
diff --git a/src/xrSound/ISoundRecorder.h b/src/xrSound/ISoundRecorder.h
new file mode 100644
index 00000000000..b542b0aeb2b
--- /dev/null
+++ b/src/xrSound/ISoundRecorder.h
@@ -0,0 +1,9 @@
+#pragma once
+
+class ISoundRecorder
+{
+public:
+	virtual bool IsStarted() = 0;
+	virtual void Start() = 0;
+	virtual void Stop() = 0;
+};
\ No newline at end of file
diff --git a/src/xrSound/ISoundVoiceChat.h b/src/xrSound/ISoundVoiceChat.h
new file mode 100644
index 00000000000..59d258ff3e1
--- /dev/null
+++ b/src/xrSound/ISoundVoiceChat.h
@@ -0,0 +1,12 @@
+#pragma once
+#include "ISoundRecorder.h"
+#include "IStreamPlayer.h"
+#include "IVoicePacketSender.h"
+
+class ISoundVoiceChat
+{
+public:
+	virtual ISoundRecorder* CreateRecorder(IVoicePacketSender* sender) = 0;
+	virtual IStreamPlayer* CreateStreamPlayer() = 0;
+	virtual void DestroySoundPlayer(IStreamPlayer* player) = 0;
+};
\ No newline at end of file
diff --git a/src/xrSound/IStreamPlayer.h b/src/xrSound/IStreamPlayer.h
new file mode 100644
index 00000000000..7f569067410
--- /dev/null
+++ b/src/xrSound/IStreamPlayer.h
@@ -0,0 +1,10 @@
+#pragma once
+class IStreamPlayer
+{
+public:
+	virtual bool IsPlaying() = 0;
+	virtual void PushToPlay(const void* data, int count) = 0;
+	virtual void Update() = 0;
+	virtual void SetDistance(float value) = 0;
+	virtual void SetPosition(const Fvector& pos) = 0;
+};
\ No newline at end of file
diff --git a/src/xrSound/IVoicePacketSender.h b/src/xrSound/IVoicePacketSender.h
new file mode 100644
index 00000000000..4ed705327e6
--- /dev/null
+++ b/src/xrSound/IVoicePacketSender.h
@@ -0,0 +1,8 @@
+#pragma once
+#include "VoicePacket.h"
+
+class IVoicePacketSender
+{
+public:
+	virtual void Send(VoicePacket** packets, u8 count) = 0;
+};
\ No newline at end of file
diff --git a/src/xrSound/OpenALDeviceList.cpp b/src/xrSound/OpenALDeviceList.cpp
index 500133b21d3..44d21d36a4e 100644
--- a/src/xrSound/OpenALDeviceList.cpp
+++ b/src/xrSound/OpenALDeviceList.cpp
@@ -32,12 +32,12 @@
 ALDeviceList::ALDeviceList()
 {
     snd_device_id = (u32)-1;
+    snd_input_device_id = (u32)-1;
     Enumerate();
 }
 
 void ALDeviceList::IterateAndAddDevicesString(pcstr devices)
 {
-    // go through device list (each device terminated with a single NULL, list terminated with double NULL)
     while (*devices != '\0')
     {
         if (ALCdevice* device = alcOpenDevice(devices))
@@ -48,7 +48,6 @@ void ALDeviceList::IterateAndAddDevicesString(pcstr devices)
 
                 const bool enumerateAllPresent = alcIsExtensionPresent(device, "ALC_ENUMERATE_ALL_EXT");
 
-                // if new actual device name isn't already in the list, then add it...
                 pcstr actualDeviceName = alcGetString(device, enumerateAllPresent ? ALC_ALL_DEVICES_SPECIFIER : ALC_DEVICE_SPECIFIER);
 
                 if (actualDeviceName != nullptr && xr_strlen(actualDeviceName) > 0)
@@ -86,6 +85,7 @@ void ALDeviceList::Enumerate()
     // have a set of vectors storing the device list, selection status, spec version #
     // -- empty all the lists and reserve space for 10 devices
     m_devices.clear();
+    m_capture_devices.clear();
 
     // grab function pointers for 1.1-API functions, and if successful proceed to enumerate all devices
     if (alcIsExtensionPresent(nullptr, "ALC_ENUMERATE_ALL_EXT"))
@@ -136,9 +136,18 @@ void ALDeviceList::Enumerate()
         Msg("~ SOUND: OpenAL: EnumerationExtension NOT Present");
     }
 
-    // make token
-    const auto _cnt = GetNumDevices();
+    if (alcIsExtensionPresent(nullptr, "ALC_ENUMERATE_ALL_EXT"))
+    {
+        pcstr captureDevices = (pstr)alcGetString(nullptr, ALC_CAPTURE_DEVICE_SPECIFIER);
+        if (captureDevices)
+        {
+            xr_strcpy(m_defaultCaptureDeviceName, alcGetString(nullptr, ALC_CAPTURE_DEFAULT_DEVICE_SPECIFIER));
+            Log("SOUND: OpenAL: system default capture device name is", m_defaultCaptureDeviceName);
+            IterateAndAddCaptureDevicesString(captureDevices);
+        }
+    }
 
+    const auto _cnt = GetNumDevices();
     auto& devices = SoundRender->Parent.GetDevicesList();
     devices.reserve(_cnt + 1);
 
@@ -147,7 +156,16 @@ void ALDeviceList::Enumerate()
         devices.emplace_back(xr_strdup(m_devices[i].name), i);
     }
     devices.emplace_back(nullptr, -1);
-    //--
+
+    const auto _capture_cnt = GetNumCaptureDevices();
+    auto& captureDevices = SoundRender->Parent.GetCaptureDevicesList();
+    captureDevices.reserve(_capture_cnt + 1);
+
+    for (u32 i = 0; i < _capture_cnt; ++i)
+    {
+        captureDevices.emplace_back(xr_strdup(m_capture_devices[i].name), i);
+    }
+    captureDevices.emplace_back(nullptr, -1);
 
     if (0 == GetNumDevices())
     {
@@ -206,16 +224,43 @@ void ALDeviceList::SelectBestDevice()
             new_device_id = 0; // first
         }
         snd_device_id = new_device_id;
+        snd_input_device_id = new_device_id; // Sync output device ID
     }
+
+    // Ensure output device ID is synchronized
+    if (snd_input_device_id == (u32)-1)
+        snd_input_device_id = snd_device_id;
+
     if (GetNumDevices() == 0)
         Msg("SOUND: Can't select device. List empty");
     else
-        Msg("SOUND: Selected device is %s", GetDeviceName(snd_device_id));
+        Msg("SOUND: Selected output device is %s", GetDeviceName(snd_device_id));
 }
 
 /*
  * Returns the major and minor version numbers for a device at a specified index in the complete list
  */
+void ALDeviceList::IterateAndAddCaptureDevicesString(pcstr devices)
+{
+    while (*devices != '\0')
+    {
+        auto& addedDevice = m_capture_devices.emplace_back(devices, 0, 0);
+        addedDevice.props.storage = 0;
+        devices += xr_strlen(devices) + 1;
+    }
+}
+
+pcstr ALDeviceList::GetCaptureDeviceName(size_t index) const
+{
+    return m_capture_devices[index].name;
+}
+
+void ALDeviceList::GetCaptureDeviceVersion(size_t index, int* major, int* minor)
+{
+    *major = m_capture_devices[index].major_ver;
+    *minor = m_capture_devices[index].minor_ver;
+}
+
 void ALDeviceList::GetDeviceVersion(size_t index, int* major, int* minor)
 {
     *major = m_devices[index].major_ver;
diff --git a/src/xrSound/OpenALDeviceList.h b/src/xrSound/OpenALDeviceList.h
index 9e76b1d8eaf..2433b34ff66 100644
--- a/src/xrSound/OpenALDeviceList.h
+++ b/src/xrSound/OpenALDeviceList.h
@@ -32,10 +32,13 @@ struct ALDeviceDesc
 class ALDeviceList
 {
     xr_vector<ALDeviceDesc> m_devices;
+    xr_vector<ALDeviceDesc> m_capture_devices;
     string256 m_defaultDeviceName;
+    string256 m_defaultCaptureDeviceName;
 
     void Enumerate();
     void IterateAndAddDevicesString(pcstr devices);
+    void IterateAndAddCaptureDevicesString(pcstr devices);
 
 public:
     ALDeviceList();
@@ -43,13 +46,23 @@ class ALDeviceList
     [[nodiscard]]
     size_t GetNumDevices() const { return m_devices.size(); }
 
+    [[nodiscard]]
+    size_t GetNumCaptureDevices() const { return m_capture_devices.size(); }
+
     [[nodiscard]]
     const ALDeviceDesc& GetDeviceDesc(size_t index) const { return m_devices[index]; }
 
+    [[nodiscard]]
+    const ALDeviceDesc& GetCaptureDeviceDesc(size_t index) const { return m_capture_devices[index]; }
+
     [[nodiscard]]
     pcstr GetDeviceName(size_t index) const;
 
+    [[nodiscard]]
+    pcstr GetCaptureDeviceName(size_t index) const;
+
     void GetDeviceVersion(size_t index, int* major, int* minor);
+    void GetCaptureDeviceVersion(size_t index, int* major, int* minor);
 
     void SelectBestDevice();
 };
diff --git a/src/xrSound/RingBuffer.h b/src/xrSound/RingBuffer.h
new file mode 100644
index 00000000000..56c28357226
--- /dev/null
+++ b/src/xrSound/RingBuffer.h
@@ -0,0 +1,90 @@
+#pragma once
+
+// Original code:
+// https://github.com/altmp/alt-voice/blob/master/src/CRingBuffer.h
+
+template<typename T, size_t BufferSize>
+class CRingBuffer
+{
+	T _buffer[BufferSize] = { 0 };
+	size_t _writeCursor = 0;
+	size_t _readCursor = 0;
+public:
+	CRingBuffer()
+	{
+	}
+
+	~CRingBuffer()
+	{
+	}
+
+	void Write(const T* buffer, size_t count)
+	{
+
+		if ((_writeCursor + count) > (_readCursor + BufferSize))
+		{
+			//Buffer autoclear on overflow
+			_writeCursor = 0;
+			_readCursor = 0;
+
+			if (count > BufferSize)
+				count = BufferSize;
+		}
+
+		size_t _writeCursorDivided = _writeCursor % BufferSize;
+		if ((_writeCursorDivided + count) > BufferSize)
+		{
+			size_t writeTail = BufferSize - _writeCursorDivided;
+			if (writeTail != 0)
+				memcpy(&_buffer[_writeCursorDivided], &buffer[0], writeTail * sizeof(T));
+
+			size_t writeHead = count - writeTail;
+			if (writeHead != 0)
+				memcpy(&_buffer[0], &buffer[writeTail], writeHead * sizeof(T));
+		}
+		else
+			memcpy(&_buffer[_writeCursorDivided], buffer, count * sizeof(T));
+		_writeCursor += count;
+	}
+
+	size_t Read(T* buffer, size_t count)
+	{
+		size_t _readCursorDivided = _readCursor % BufferSize;
+		if ((_readCursor + count) > _writeCursor)
+			count = _writeCursor - _readCursor;
+
+		if ((_readCursorDivided + count) > BufferSize)
+		{
+			size_t readTail = BufferSize - _readCursorDivided;
+			if (readTail != 0)
+				memcpy(&buffer[0], &_buffer[_readCursorDivided], readTail * sizeof(T));
+
+			size_t readHead = count - readTail;
+			if (readHead != 0)
+				memcpy(&buffer[readTail], &_buffer[0], readHead * sizeof(T));
+		}
+		else
+			memcpy(buffer, &_buffer[_readCursorDivided], count * sizeof(T));
+
+		_readCursor += count;
+		return count;
+	}
+
+	size_t BytesToRead()
+	{
+		size_t toRead = _writeCursor - _readCursor;
+		return toRead;
+	}
+
+	bool IsHalfFull()
+	{
+		bool halfFull = (_writeCursor - _readCursor) > (BufferSize / 2);
+		return halfFull;
+	}
+
+	float GetFillLevel()
+	{
+		float fillLevel = (_writeCursor - _readCursor) / (float)BufferSize;
+		return fillLevel;
+	}
+};
\ No newline at end of file
diff --git a/src/xrSound/Sound.cpp b/src/xrSound/Sound.cpp
index 1b057ee2f40..dcb0b521ab5 100644
--- a/src/xrSound/Sound.cpp
+++ b/src/xrSound/Sound.cpp
@@ -3,6 +3,7 @@
 #include "SoundRender_CoreA.h"
 
 XRSOUND_API u32 snd_device_id = u32(-1);
+XRSOUND_API u32 snd_input_device_id = u32(-1);
 
 ISoundScene* DefaultSoundScene{};
 
diff --git a/src/xrSound/Sound.h b/src/xrSound/Sound.h
index f4280801d32..3e5f718b457 100644
--- a/src/xrSound/Sound.h
+++ b/src/xrSound/Sound.h
@@ -40,6 +40,8 @@ using Fvector2 = _vector2<float>;
 struct Fbox3;
 using Fbox = Fbox3;
 
+class XRSOUND_API ISoundVoiceChat;
+
 XRSOUND_API extern u32 psSoundModel;
 XRSOUND_API extern float psSoundVEffects;
 XRSOUND_API extern float psSoundVFactor;
@@ -51,6 +53,11 @@ XRSOUND_API extern Flags32 psSoundFlags;
 XRSOUND_API extern int psSoundTargets;
 XRSOUND_API extern int psSoundCacheSizeMB;
 XRSOUND_API extern u32 snd_device_id;
+XRSOUND_API extern u32 snd_input_device_id;
+XRSOUND_API extern float psSoundVPlayers;
+XRSOUND_API extern float psSoundVRecorder;
+XRSOUND_API extern int psSoundRecorderMode;
+XRSOUND_API extern int psSoundRecorderDenoise;
 
 XRSOUND_API extern ISoundScene* DefaultSoundScene;
 
@@ -233,18 +240,24 @@ class XRSOUND_API XR_NOVTABLE ISoundManager
 
     virtual const Fvector& listener_position() = 0;
 
+    virtual ISoundVoiceChat* GetSoundVoiceChat() = 0;
+
     virtual void refresh_sources() = 0;
+
+    virtual xr_vector<xr_token>& GetCaptureDevicesList() = 0;
 };
 
 class XRSOUND_API CSoundManager
 {
     xr_vector<xr_token> soundDevices;
+    xr_vector<xr_token> soundCaptureDevices;
 
     SoundEnvironment_LIB* soundEnvironment{};
 
 public:
     void  CreateDevicesList();
-    auto& GetDevicesList() { return soundDevices; }
+    xr_vector<xr_token>& GetDevicesList() { return soundDevices; }
+    xr_vector<xr_token>& GetCaptureDevicesList() { return soundCaptureDevices; }
 
     void Create();
     void Destroy();
diff --git a/src/xrSound/SoundRecorderA.cpp b/src/xrSound/SoundRecorderA.cpp
new file mode 100644
index 00000000000..79a124cfce4
--- /dev/null
+++ b/src/xrSound/SoundRecorderA.cpp
@@ -0,0 +1,219 @@
+#include "stdafx.h"
+#include "Sound.h"
+#include "SoundRecorderA.h"
+#include "SpeexPreprocess.h"
+#include "VoicePacketsPacker.h"
+#include "ISoundRecorder.h"
+
+namespace
+{
+	union ShortByteUnion {
+		signed  short asShort;
+		unsigned char asBytes[2];
+	};
+}
+
+CSoundRecorderA::CSoundRecorderA(ALuint sampleRate, ALenum format, ALuint samplesPerBuffer)
+	: m_sampleRate(sampleRate), m_format(format), m_samplesPerBuffer(samplesPerBuffer)
+{
+	m_bytesPerSample = 1;
+
+	switch (format)
+	{
+	case AL_FORMAT_MONO16:
+		m_bytesPerSample = 2;
+		break;
+	case AL_FORMAT_STEREO8:
+		m_bytesPerSample = 2;
+		break;
+	case AL_FORMAT_STEREO16:
+		m_bytesPerSample = 4;
+		break;
+	default:
+		break;
+	}
+
+	m_buffer = new ALbyte[samplesPerBuffer * m_bytesPerSample];
+	m_speexPreprocess = xr_new<CSpeexPreprocess>(sampleRate, samplesPerBuffer);
+	m_speexPreprocess->EnableAGC(psSoundRecorderMode);
+	m_speexPreprocess->EnableDenoise(psSoundRecorderDenoise);
+}
+
+
+CSoundRecorderA::~CSoundRecorderA()
+{
+	Destroy();
+
+	delete[] m_buffer;
+	m_buffer = nullptr;
+
+	xr_delete(m_speexPreprocess);
+	m_speexPreprocess = nullptr;
+}
+
+bool CSoundRecorderA::Init(CVoicePacketsPacker* packetsPacker)
+{
+	m_packetsPacker = packetsPacker;
+
+	alGetError();
+
+	pcstr selectedDeviceName = nullptr;
+
+	if (snd_input_device_id != (u32)-1)
+	{
+		auto& captureDevices = GEnv.Sound->GetCaptureDevicesList();
+		if (snd_input_device_id < captureDevices.size() && captureDevices[snd_input_device_id].name)
+		{
+			selectedDeviceName = captureDevices[snd_input_device_id].name;
+			Msg("* Using selected capture device: %s", selectedDeviceName);
+			m_pCaptureDevice = alcCaptureOpenDevice(selectedDeviceName, m_sampleRate, m_format, m_samplesPerBuffer * 2);
+
+			if (m_pCaptureDevice)
+			{
+				Msg("* Successfully opened selected capture device: %s", selectedDeviceName);
+			}
+			else
+			{
+				Msg("! Failed to open selected capture device: %s", selectedDeviceName);
+			}
+		}
+	}
+
+	if (!m_pCaptureDevice && alcIsExtensionPresent(nullptr, "ALC_ENUMERATE_ALL_EXT"))
+	{
+		const ALCchar* devices = alcGetString(nullptr, ALC_CAPTURE_DEVICE_SPECIFIER);
+
+		if (devices)
+		{
+			const ALCchar* device = devices;
+
+			while (device && *device != '\0')
+			{
+				Msg("* Trying capture device: %s", device);
+
+				m_pCaptureDevice = alcCaptureOpenDevice(device, m_sampleRate, m_format, m_samplesPerBuffer * 2);
+
+				if (m_pCaptureDevice)
+				{
+					Msg("* Successfully opened capture device: %s", device);
+					break;
+				}
+				else
+				{
+					Msg("! Failed to open capture device: %s", device);
+				}
+
+				device += strlen(device) + 1;
+			}
+		}
+	}
+
+	if (!m_pCaptureDevice)
+	{
+		Msg("* Trying default capture device");
+		m_pCaptureDevice = alcCaptureOpenDevice(nullptr, m_sampleRate, m_format, m_samplesPerBuffer * 2);
+	}
+
+	ALenum error = alGetError();
+	if (error == AL_NO_ERROR && m_pCaptureDevice)
+	{
+		alcCaptureStart(m_pCaptureDevice);
+		return true;
+	}
+
+	Msg("! Failed to initialize any capture device");
+	return false;
+}
+
+void CSoundRecorderA::Destroy()
+{
+	if (m_pCaptureDevice == nullptr)
+		return;
+
+	alcCaptureStop(m_pCaptureDevice);
+	alcCaptureCloseDevice(m_pCaptureDevice);
+	m_pCaptureDevice = nullptr;
+}
+
+void CSoundRecorderA::Start()
+{
+	m_started = true;
+}
+
+void CSoundRecorderA::Stop()
+{
+	m_started = false;
+}
+
+void CSoundRecorderA::Update()
+{
+	if (m_pCaptureDevice == nullptr)
+		return;
+
+	ALint samples = 0;
+	alcGetIntegerv(m_pCaptureDevice, ALC_CAPTURE_SAMPLES, (ALCsizei)sizeof(ALint), &samples);
+
+	if (samples < m_samplesPerBuffer)
+		return;
+
+	alcCaptureSamples(m_pCaptureDevice, m_buffer, m_samplesPerBuffer);
+
+	if (m_started && m_packetsPacker)
+	{
+		ALuint availableBytes = m_samplesPerBuffer * m_bytesPerSample;
+
+		if (psSoundRecorderMode)
+		{
+			if (!m_speexPreprocess->IsAGCEnabled())
+				m_speexPreprocess->EnableAGC(true);
+		}
+		else
+		{
+			if (m_speexPreprocess->IsAGCEnabled())
+				m_speexPreprocess->EnableAGC(false);
+		}
+
+		if (psSoundRecorderDenoise)
+		{
+			if (!m_speexPreprocess->IsDenoiseEnabled())
+				m_speexPreprocess->EnableDenoise(true);
+		}
+		else
+		{
+			if (m_speexPreprocess->IsDenoiseEnabled())
+				m_speexPreprocess->EnableDenoise(false);
+		}
+
+		if (psSoundRecorderMode == 0)
+		{
+			ChangeGain(m_buffer, availableBytes);
+		}
+
+		if (psSoundRecorderMode || psSoundRecorderDenoise)
+		{
+			m_speexPreprocess->RunPreprocess((short*)m_buffer);
+		}
+
+		m_packetsPacker->AddPacket(m_buffer, availableBytes);
+	}
+}
+
+void CSoundRecorderA::ChangeGain(ALbyte* buffer, ALint length)
+{
+	const float modifier = psSoundVRecorder;
+
+	for (int i = 0; i < length; i += 2)
+	{
+		ShortByteUnion ab;
+		ab.asBytes[0] = buffer[i];
+		ab.asBytes[1] = buffer[i + 1];
+
+		if ((float)ab.asShort >= 32676.f / modifier)
+			ab.asShort = 32676;
+		else
+			ab.asShort = (short)((float)ab.asShort * modifier);
+
+		buffer[i] = ab.asBytes[0];
+		buffer[i + 1] = ab.asBytes[1];
+	}
+}
diff --git a/src/xrSound/SoundRecorderA.h b/src/xrSound/SoundRecorderA.h
new file mode 100644
index 00000000000..ed00cd28019
--- /dev/null
+++ b/src/xrSound/SoundRecorderA.h
@@ -0,0 +1,42 @@
+#pragma once
+#include "al.h"
+#include "alc.h"
+#include "ISoundRecorder.h"
+
+class CSpeexPreprocess;
+class CVoicePacketsPacker;
+
+class CSoundRecorderA : public ISoundRecorder
+{
+public:
+	CSoundRecorderA(ALuint sampleRate, ALenum format, ALuint samplesPerBuffer);
+	~CSoundRecorderA();
+
+	bool Init(CVoicePacketsPacker* packetsPacker);
+	void Destroy();
+
+	virtual bool IsStarted() { return m_started; }
+
+	virtual void Start();
+	virtual void Stop();
+
+	void Update();
+
+private:
+	void ChangeGain(ALbyte* buffer, ALint length);
+
+private:
+	ALuint m_sampleRate;
+	ALenum m_format;
+	ALint m_samplesPerBuffer;
+
+	ALuint m_bytesPerSample;
+
+	ALbyte* m_buffer;
+	bool m_started = false;
+
+	CSpeexPreprocess* m_speexPreprocess = nullptr;
+	CVoicePacketsPacker* m_packetsPacker = nullptr;
+
+	ALCdevice* m_pCaptureDevice = nullptr;
+};
\ No newline at end of file
diff --git a/src/xrSound/SoundRender_Core.cpp b/src/xrSound/SoundRender_Core.cpp
index 6c96c0084bb..71959a784cc 100644
--- a/src/xrSound/SoundRender_Core.cpp
+++ b/src/xrSound/SoundRender_Core.cpp
@@ -29,6 +29,10 @@ XRSOUND_API float psSoundVFactor = 1.0f;
 XRSOUND_API float psSoundVMusic = 1.f;
 XRSOUND_API int psSoundCacheSizeMB = 32;
 
+XRSOUND_API float psSoundVPlayers = 1.f;
+XRSOUND_API float psSoundVRecorder = 1.f;
+XRSOUND_API int	psSoundRecorderMode = 1;
+XRSOUND_API int	psSoundRecorderDenoise = 1;
 CSoundRender_Core* SoundRender = nullptr;
 
 CSoundRender_Core::CSoundRender_Core(CSoundManager& p)
diff --git a/src/xrSound/SoundRender_CoreA.cpp b/src/xrSound/SoundRender_CoreA.cpp
index 3ada373ac8a..83ef7b5c3e3 100644
--- a/src/xrSound/SoundRender_CoreA.cpp
+++ b/src/xrSound/SoundRender_CoreA.cpp
@@ -5,6 +5,7 @@
 #include "SoundRender_TargetA.h"
 #include "OpenALDeviceList.h"
 #include "SoundRender_EffectsA_EAX.h"
+#include "SoundVoiceChat.h"
 
 CSoundRender_CoreA::CSoundRender_CoreA(CSoundManager& p)
     : CSoundRender_Core(p)
@@ -117,6 +118,8 @@ void CSoundRender_CoreA::_initialize()
             break;
         }
     }
+
+    pSoundVoiceChat = xr_new<SoundVoiceChat>(pContext);
 }
 
 void CSoundRender_CoreA::set_master_volume(float f)
@@ -129,6 +132,8 @@ void CSoundRender_CoreA::_clear()
 {
     inherited::_clear();
     xr_delete(m_effects);
+
+    xr_delete(pSoundVoiceChat);
     // remove targets
     for (auto& T : s_targets)
     {
@@ -156,3 +161,11 @@ void CSoundRender_CoreA::update_listener(const Fvector& P, const Fvector& D, con
     A_CHK(alListener3f(AL_VELOCITY, 0.f, 0.f, 0.f));
     A_CHK(alListenerfv(AL_ORIENTATION, &listener.orientation[0].x));
 }
+
+void CSoundRender_CoreA::update(const Fvector& P, const Fvector& D, const Fvector& N, const Fvector& R)
+{
+    inherited::update(P, D, N, R);
+
+    if (pSoundVoiceChat)
+        pSoundVoiceChat->Update(P, D, N);
+}
diff --git a/src/xrSound/SoundRender_CoreA.h b/src/xrSound/SoundRender_CoreA.h
index 7dc9c9e1e50..c7d6d840a46 100644
--- a/src/xrSound/SoundRender_CoreA.h
+++ b/src/xrSound/SoundRender_CoreA.h
@@ -2,6 +2,8 @@
 
 #include "SoundRender_Core.h"
 
+class SoundVoiceChat;
+
 #include <al.h>
 #include <alc.h>
 
@@ -58,6 +60,8 @@ class CSoundRender_CoreA : public CSoundRender_Core
     ALCcontext* pContext;
     ALDeviceList* pDeviceList;
 
+    SoundVoiceChat* pSoundVoiceChat = nullptr;
+
 protected:
     void update_listener(const Fvector& P, const Fvector& D, const Fvector& N, const Fvector& R, float dt) override;
 
@@ -71,4 +75,11 @@ class CSoundRender_CoreA : public CSoundRender_Core
 
     void set_master_volume(float f) override;
 
+    void update(const Fvector& P, const Fvector& D, const Fvector& N, const Fvector& R) override;
+
+    ISoundVoiceChat* GetSoundVoiceChat() override { return (ISoundVoiceChat*)pSoundVoiceChat; }
+    xr_vector<xr_token>& GetCaptureDevicesList() override
+    {
+        return SoundRender->Parent.GetCaptureDevicesList();
+    }
 };
diff --git a/src/xrSound/SoundVoiceChat.cpp b/src/xrSound/SoundVoiceChat.cpp
new file mode 100644
index 00000000000..d049a401af5
--- /dev/null
+++ b/src/xrSound/SoundVoiceChat.cpp
@@ -0,0 +1,84 @@
+#include "stdafx.h"
+#include "SoundVoiceChat.h"
+
+SoundVoiceChat::SoundVoiceChat(ALCcontext* pContext)
+	: m_pContext(pContext)
+{
+}
+
+SoundVoiceChat::~SoundVoiceChat()
+{
+	Destroy();
+}
+
+void SoundVoiceChat::Destroy()
+{
+	if (m_pVoicePacker)
+	{
+		xr_delete(m_pVoicePacker);
+		m_pVoicePacker = nullptr;
+	}
+
+	if (m_pRecorder)
+	{
+		xr_delete(m_pRecorder);
+		m_pRecorder = nullptr;
+	}
+}
+
+ISoundRecorder* SoundVoiceChat::CreateRecorder(IVoicePacketSender* sender)
+{
+	Destroy();
+	m_pVoicePacker = xr_new<CVoicePacketsPacker>();
+	m_pVoicePacker->AddSender(sender);
+
+	m_pRecorder = xr_new<CSoundRecorderA>(VOICE_SAMPLE_RATE, VOICE_FORMAT, VOICE_SAMPLES_PER_BUFFER);
+
+	if (!m_pRecorder->Init(m_pVoicePacker))
+	{
+		Destroy();
+		return nullptr;
+	}
+
+	return (ISoundRecorder*)m_pRecorder;
+}
+
+IStreamPlayer* SoundVoiceChat::CreateStreamPlayer()
+{
+	IStreamPlayer* player = (IStreamPlayer*)xr_new<CStreamPlayerA>(VOICE_SAMPLE_RATE, VOICE_FORMAT, m_pContext);
+	m_players.push_back(player);
+	return player;
+}
+
+void SoundVoiceChat::DestroySoundPlayer(IStreamPlayer* player)
+{
+	xr_vector<IStreamPlayer*>::iterator I = m_players.begin(), J;
+	xr_vector<IStreamPlayer*>::iterator E = m_players.end();
+
+	for (; I != E;)
+	{
+		if ((*I) == player)
+		{
+			xr_delete(*I);
+
+			J = I;
+			++I;
+			m_players.erase(J);
+		}
+		else {
+			++I;
+		}
+	}
+}
+
+void SoundVoiceChat::Update(const Fvector& P, const Fvector& D, const Fvector& N)
+{
+	if (m_pRecorder)
+		m_pRecorder->Update();
+
+	if (m_pVoicePacker)
+		m_pVoicePacker->Update();
+
+	for (auto& player : m_players)
+		player->Update();
+}
\ No newline at end of file
diff --git a/src/xrSound/SoundVoiceChat.h b/src/xrSound/SoundVoiceChat.h
new file mode 100644
index 00000000000..c09e523f4ce
--- /dev/null
+++ b/src/xrSound/SoundVoiceChat.h
@@ -0,0 +1,36 @@
+#pragma once
+#include <al.h>
+#include <alc.h>
+#include "ISoundVoiceChat.h"
+#include "SoundRecorderA.h"
+#include "StreamPlayerA.h"
+#include "VoicePacketsPacker.h"
+
+#define VOICE_SAMPLE_RATE 24000
+#define VOICE_SAMPLES_PER_BUFFER 960
+#define VOICE_FORMAT AL_FORMAT_MONO16
+
+class SoundVoiceChat : ISoundVoiceChat
+{
+public:
+	SoundVoiceChat(ALCcontext* pContext);
+	~SoundVoiceChat();
+
+	ISoundRecorder* CreateRecorder(IVoicePacketSender* sender);
+
+	IStreamPlayer* CreateStreamPlayer();
+	void DestroySoundPlayer(IStreamPlayer* player);
+
+	void Update(const Fvector& P, const Fvector& D, const Fvector& N);
+
+private:
+	void Destroy();
+
+private:
+	ALCcontext* m_pContext;
+
+	CSoundRecorderA* m_pRecorder = nullptr;
+	CVoicePacketsPacker* m_pVoicePacker = nullptr;
+
+	xr_vector<IStreamPlayer*> m_players;
+};
\ No newline at end of file
diff --git a/src/xrSound/SpeexPreprocess.cpp b/src/xrSound/SpeexPreprocess.cpp
new file mode 100644
index 00000000000..1c8853566e9
--- /dev/null
+++ b/src/xrSound/SpeexPreprocess.cpp
@@ -0,0 +1,86 @@
+#include "stdafx.h"
+#include "SpeexPreprocess.h"
+
+CSpeexPreprocess::CSpeexPreprocess(int sampleRate, int samplesPerBuffer)
+{
+	m_pState = speex_preprocess_state_init(samplesPerBuffer, sampleRate);
+
+	// DEFAULT VALUES
+	int useDenoise = 0;
+	int useAcg = 0;
+	float agcLevel = 30000;
+
+	speex_preprocess_ctl(m_pState, SPEEX_PREPROCESS_SET_DENOISE, &useDenoise);
+	speex_preprocess_ctl(m_pState, SPEEX_PREPROCESS_SET_AGC, &useAcg);
+	speex_preprocess_ctl(m_pState, SPEEX_PREPROCESS_SET_AGC_LEVEL, &agcLevel);
+}
+
+CSpeexPreprocess::~CSpeexPreprocess()
+{
+	speex_preprocess_state_destroy(m_pState);
+	m_pState = nullptr;
+}
+
+bool CSpeexPreprocess::EnableDenoise(bool enable)
+{
+	int value = enable ? 1 : 0;
+	if (m_pState)
+	{
+		return speex_preprocess_ctl(m_pState, SPEEX_PREPROCESS_SET_DENOISE, &value) == 0;
+	}
+	return false;
+}
+
+bool CSpeexPreprocess::EnableAGC(bool enable)
+{
+	int value = enable ? 1 : 0;
+	if (m_pState)
+	{
+		return speex_preprocess_ctl(m_pState, SPEEX_PREPROCESS_SET_AGC, &value) == 0;
+	}
+	return false;
+}
+
+bool CSpeexPreprocess::IsAGCEnabled()
+{
+	int result = 0;
+	if (m_pState)
+	{
+		speex_preprocess_ctl(m_pState, SPEEX_PREPROCESS_GET_AGC, &result);
+	}
+	return result != 0;
+}
+
+bool CSpeexPreprocess::IsDenoiseEnabled()
+{
+	int result = 0;
+	if (m_pState)
+	{
+		speex_preprocess_ctl(m_pState, SPEEX_PREPROCESS_GET_DENOISE, &result);
+	}
+	return result != 0;
+}
+
+bool CSpeexPreprocess::SetDenoiseLevel(int level)
+{
+	if (m_pState)
+	{
+		return speex_preprocess_ctl(m_pState, SPEEX_PREPROCESS_SET_NOISE_SUPPRESS, &level) == 0;
+	}
+	return false;
+}
+
+int CSpeexPreprocess::GetDenoiseLevel()
+{
+	int n = 0;
+	if (m_pState)
+	{
+		speex_preprocess_ctl(m_pState, SPEEX_PREPROCESS_GET_NOISE_SUPPRESS, &n);
+	}
+	return n;
+}
+
+void CSpeexPreprocess::RunPreprocess(short* buffer)
+{
+	speex_preprocess_run(m_pState, buffer);
+}
\ No newline at end of file
diff --git a/src/xrSound/SpeexPreprocess.h b/src/xrSound/SpeexPreprocess.h
new file mode 100644
index 00000000000..ca47cd3d4d6
--- /dev/null
+++ b/src/xrSound/SpeexPreprocess.h
@@ -0,0 +1,23 @@
+#pragma once
+#include "speex/speex_preprocess.h"
+
+class CSpeexPreprocess
+{
+public:
+	CSpeexPreprocess(int sampleRate, int samplesPerBuffer);
+	~CSpeexPreprocess();
+
+	bool EnableAGC(bool enable);
+	bool IsAGCEnabled();
+
+	bool IsDenoiseEnabled();
+	bool EnableDenoise(bool enable);
+
+	int GetDenoiseLevel();
+	bool SetDenoiseLevel(int level);
+
+	void RunPreprocess(short* buffer);
+
+private:
+	SpeexPreprocessState* m_pState = nullptr;
+};
\ No newline at end of file
diff --git a/src/xrSound/StreamPlayerA.cpp b/src/xrSound/StreamPlayerA.cpp
new file mode 100644
index 00000000000..ca9560b48b0
--- /dev/null
+++ b/src/xrSound/StreamPlayerA.cpp
@@ -0,0 +1,193 @@
+#include "stdafx.h"
+#include "StreamPlayerA.h"
+#include "SoundVoiceChat.h"
+#include "SoundRender_Core.h"
+
+CStreamPlayerA::CStreamPlayerA(ALuint sampleRate, ALenum format, ALCcontext* context)
+	: m_sampleRate(sampleRate), m_format(format), m_pContext(context), m_source(0)
+{
+	alcMakeContextCurrent(m_pContext);
+
+	alGenBuffers(NUM_BUFFERS, m_buffers);
+	for (uint16_t i = 0; i < NUM_BUFFERS; ++i)
+		m_freeBuffers.push_back(m_buffers[i]);
+
+	alGenSources(1, &m_source);
+
+	alSourcef(m_source, AL_SOURCE_TYPE, AL_STREAMING);
+	alSourcei(m_source, AL_LOOPING, AL_FALSE);
+	alSourcef(m_source, AL_MIN_GAIN, 0.f);
+	alSourcef(m_source, AL_MAX_GAIN, 1.0f);
+	alSourcef(m_source, AL_ROLLOFF_FACTOR, 0.f);
+	alSourcef(m_source, AL_GAIN, 1.f);
+	alSourcei(m_source, AL_BUFFER, NULL);
+
+
+	int error;
+	m_pOpusDecoder = opus_decoder_create(VOICE_SAMPLE_RATE, 1, &error);
+
+	if (error != OPUS_OK)
+	{
+		opus_decoder_destroy(m_pOpusDecoder);
+		R_ASSERT2(0, "Opus error");
+	}
+}
+
+CStreamPlayerA::~CStreamPlayerA()
+{
+	if (alIsSource(m_source))
+	{
+		alSourceStop(m_source);
+		alSourcei(m_source, AL_BUFFER, NULL);
+		alDeleteBuffers(NUM_BUFFERS, m_buffers);
+		alDeleteSources(1, &m_source);
+	}
+	m_source = 0;
+
+
+	if (m_pOpusDecoder != nullptr)
+	{
+		opus_decoder_destroy(m_pOpusDecoder);
+		m_pOpusDecoder = nullptr;
+	}
+}
+
+void CStreamPlayerA::SetDistance(float value)
+{
+	m_isRelative = (value == 0);
+	alSourcei(m_source, AL_SOURCE_RELATIVE, m_isRelative);
+	m_distance = value;
+	clamp(m_distance, 0.f, 1000.f);
+}
+
+void CStreamPlayerA::SetPosition(const Fvector& pos)
+{
+	alSource3f(m_source, AL_POSITION, pos.x, pos.y, -pos.z);
+	m_position = pos;
+}
+
+void CStreamPlayerA::PushToPlay(const void* data, int count)
+{
+	R_ASSERT2(m_source != 0 && alIsSource(m_source), "Not initialized sound source");
+
+	opus_int16 decoded_buf[1024];
+
+	int decoded_len = opus_decode(m_pOpusDecoder, (BYTE*)data, count, decoded_buf, VOICE_SAMPLES_PER_BUFFER, 0);
+	if (decoded_len <= 0)
+	{
+		return;
+	}
+
+	m_ringBuffer.Write(decoded_buf, decoded_len);
+}
+
+void CStreamPlayerA::UpdateVolume()
+{
+	if (!alIsSource(m_source))
+		return;
+
+	if (!IsPlaying())
+		return;
+
+	float volume = 1.f;
+
+	if (!m_isRelative)
+	{
+		float distance = SoundRender->listener_position().distance_to(m_position);
+
+		const float max_distance = m_distance;
+		const float min_distance = (m_distance / 3);
+
+		if (distance <= min_distance)
+		{
+			volume = 1.f;
+		}
+		else if (distance > max_distance)
+		{
+			volume = 0.f;
+		}
+		else
+		{
+			volume = (max_distance - distance) / (max_distance - min_distance);
+		}
+
+		volume = volume * psSoundVPlayers;
+		clamp(volume, 0.01f, 1.f);
+	}
+
+	alSourcef(m_source, AL_GAIN, volume);
+}
+
+void CStreamPlayerA::Update()
+{
+	if (m_source == 0 || !alIsSource(m_source))
+		return;
+
+	ALint processed, state;
+	alGetSourcei(m_source, AL_SOURCE_STATE, &state);
+	alGetSourcei(m_source, AL_BUFFERS_PROCESSED, &processed);
+
+	if (alGetError() != AL_NO_ERROR)
+	{
+		return;
+	}
+
+	const bool isPlaying = state == AL_PLAYING;
+
+	if (!m_ringBuffer.BytesToRead() && !isPlaying)
+	{
+		while (processed > 0)
+		{
+			ALuint bufid;
+			alSourceUnqueueBuffers(m_source, 1, &bufid);
+			m_freeBuffers.push_back(bufid);
+			processed--;
+		}
+		return;
+	}
+
+	if (m_ringBuffer.IsHalfFull())
+		alSourcef(m_source, AL_PITCH, 1.05f);
+	else
+		alSourcef(m_source, AL_PITCH, 1.f);
+
+	while (processed > 0)
+	{
+		ALuint bufferId;
+		alSourceUnqueueBuffers(m_source, 1, &bufferId);
+		m_freeBuffers.push_back(bufferId);
+		processed--;
+	}
+
+	while (m_ringBuffer.BytesToRead() && m_freeBuffers.size())
+	{
+		opus_int16 tempBuffer[4096];
+		const ALuint bufferId = m_freeBuffers.front();
+		m_freeBuffers.pop_front();
+
+		ALsizei readed = 0;
+		int bufferIndex = 0;
+		readed = (ALsizei)m_ringBuffer.Read(tempBuffer, 4096);
+		if (readed > 0)
+		{
+			alBufferData(bufferId, m_format, tempBuffer, readed * sizeof(opus_int16), m_sampleRate);
+			alSourceQueueBuffers(m_source, 1, &bufferId);
+		}
+		else
+			break;
+	}
+
+	UpdateVolume();
+
+	if (!isPlaying)
+	{
+		alSourcePlay(m_source);
+	}
+}
+
+bool CStreamPlayerA::IsPlaying()
+{
+	ALint state;
+	alGetSourcei(m_source, AL_SOURCE_STATE, &state);
+	return state == AL_PLAYING;
+}
\ No newline at end of file
diff --git a/src/xrSound/StreamPlayerA.h b/src/xrSound/StreamPlayerA.h
new file mode 100644
index 00000000000..33590fff9a2
--- /dev/null
+++ b/src/xrSound/StreamPlayerA.h
@@ -0,0 +1,47 @@
+#pragma once
+#include "al.h"
+#include "alc.h"
+#include "opus/opus.h"
+#include "RingBuffer.h"
+#include "IStreamPlayer.h"
+#include "xrCommon/xr_deque.h"
+
+class CStreamPlayerA : public IStreamPlayer
+{
+public:
+	CStreamPlayerA(ALuint sampleRate, ALenum format, ALCcontext* context);
+	~CStreamPlayerA();
+
+	virtual void PushToPlay(const void* data, int count);
+	virtual bool IsPlaying();
+
+	virtual void Update();
+
+	virtual void SetDistance(float value);
+	virtual void SetPosition(const Fvector& pos);
+private:
+	void UpdateVolume();
+
+private:
+
+	static constexpr ALsizei RING_BUFFER_SIZE = 262144;
+	CRingBuffer<opus_int16, RING_BUFFER_SIZE> m_ringBuffer;
+
+	static constexpr ALsizei NUM_BUFFERS = 16;
+	ALuint m_buffers[NUM_BUFFERS];
+
+	xr_deque<ALuint> m_freeBuffers;
+
+	ALuint m_sampleRate;
+	ALenum m_format;
+
+	ALCcontext* m_pContext;
+	ALuint m_source;
+
+	OpusDecoder* m_pOpusDecoder;
+
+	Fvector m_position {0, 0, 0};
+
+	float m_distance = 0;
+	bool m_isRelative = false;
+};
diff --git a/src/xrSound/VoicePacket.h b/src/xrSound/VoicePacket.h
new file mode 100644
index 00000000000..c5a429fd380
--- /dev/null
+++ b/src/xrSound/VoicePacket.h
@@ -0,0 +1,11 @@
+#pragma once
+
+struct VoicePacket
+{
+public:
+	static constexpr size_t MAX_DATA_SIZE = 512;
+
+	BYTE data[MAX_DATA_SIZE];
+	u32 length;
+	DWORD time;
+};
\ No newline at end of file
diff --git a/src/xrSound/VoicePacketsPacker.cpp b/src/xrSound/VoicePacketsPacker.cpp
new file mode 100644
index 00000000000..1a10d99ea17
--- /dev/null
+++ b/src/xrSound/VoicePacketsPacker.cpp
@@ -0,0 +1,82 @@
+#include "stdafx.h"
+#include "opus/opus.h"
+#include "VoicePacketsPacker.h"
+#include "SoundVoiceChat.h"
+#include "VoicePacket.h"
+
+#define OPUS_BITRATE 16000
+
+CVoicePacketsPacker::CVoicePacketsPacker()
+{
+	int error;
+	m_pEncoder = opus_encoder_create(VOICE_SAMPLE_RATE, 1, OPUS_APPLICATION_VOIP, &error);
+	if (error != OPUS_OK)
+	{
+		opus_encoder_destroy(m_pEncoder);
+		R_ASSERT2(0, "Opus error");
+	}
+
+	opus_encoder_ctl(m_pEncoder, OPUS_SET_BITRATE(OPUS_BITRATE));
+	opus_encoder_ctl(m_pEncoder, OPUS_SET_SIGNAL(OPUS_SIGNAL_VOICE));
+
+	for (int i = 0; i < MAX_VOICE_PACKETS; ++i)
+	{
+		m_voicePackets[i] = xr_new<VoicePacket>();
+	}
+}
+
+CVoicePacketsPacker::~CVoicePacketsPacker()
+{
+	if (m_pEncoder != nullptr)
+	{
+		opus_encoder_destroy(m_pEncoder);
+		m_pEncoder = nullptr;
+	}
+
+	for (int i = 0; i < MAX_VOICE_PACKETS; ++i)
+		xr_delete(m_voicePackets[i]);
+}
+
+void CVoicePacketsPacker::AddSender(IVoicePacketSender* ref)
+{
+	m_senders.push_back(ref);
+}
+
+void CVoicePacketsPacker::RemoveSender(IVoicePacketSender* ref)
+{
+	m_senders.erase(std::remove(m_senders.begin(), m_senders.end(), ref));
+}
+
+void CVoicePacketsPacker::AddPacket(const void* data, const int length)
+{
+	if (m_packetsCount >= MAX_VOICE_PACKETS)
+		return;
+
+	VoicePacket* packet = m_voicePackets[m_packetsCount];
+	packet->length = opus_encode(m_pEncoder,
+		(opus_int16*)data,
+		length / sizeof(opus_int16),
+		packet->data,
+		VoicePacket::MAX_DATA_SIZE
+	);
+
+	packet->time = GetTickCount();
+	++m_packetsCount;
+}
+
+void CVoicePacketsPacker::Update()
+{
+	if (m_packetsCount > 0)
+	{
+		VoicePacket* lastPacket = m_voicePackets[m_packetsCount - 1];
+		if (m_packetsCount > MAX_VOICE_PACKETS - 1 || (lastPacket->time + 50) < GetTickCount())
+		{
+			for (auto it = m_senders.begin(); it != m_senders.end(); ++it)
+			{
+				(*it)->Send(m_voicePackets, m_packetsCount);
+				m_packetsCount = 0;
+			}
+			m_packetsCount = 0;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/xrSound/VoicePacketsPacker.h b/src/xrSound/VoicePacketsPacker.h
new file mode 100644
index 00000000000..76d33faf179
--- /dev/null
+++ b/src/xrSound/VoicePacketsPacker.h
@@ -0,0 +1,26 @@
+#pragma once
+#include "VoicePacket.h"
+#include "IVoicePacketSender.h"
+
+struct OpusEncoder;
+
+class CVoicePacketsPacker
+{
+public:
+	CVoicePacketsPacker();
+	~CVoicePacketsPacker();
+
+	virtual void AddSender(IVoicePacketSender* ref);
+	virtual void RemoveSender(IVoicePacketSender* ref);
+
+	void AddPacket(const void* data, const int length);
+	void Update();
+
+private:
+	static constexpr size_t MAX_VOICE_PACKETS = 4;
+	xr_vector<IVoicePacketSender*> m_senders;
+
+	OpusEncoder* m_pEncoder = nullptr;
+	VoicePacket* m_voicePackets[MAX_VOICE_PACKETS];
+	u8 m_packetsCount = 0;
+};
\ No newline at end of file
diff --git a/src/xrSound/xrSound.vcxproj b/src/xrSound/xrSound.vcxproj
index b23ca399f16..f33b070bb4e 100644
--- a/src/xrSound/xrSound.vcxproj
+++ b/src/xrSound/xrSound.vcxproj
@@ -21,11 +21,12 @@
   <PropertyGroup Label="UserMacros" />
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(xrSdkDir)include\AL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(xrSdkDir)include\AL;$(xrSdkDir)include\speex;$(xrSdkDir)include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_USRDLL;XRSOUND_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DebugInformationFormat Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;libvorbisfile.lib;OpenAL32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;libvorbisfile.lib;OpenAL32.lib;opus.lib;speexdsp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ImageHasSafeExceptionHandlers Condition="'$(Platform)'=='Win32'" />
     </Link>
   </ItemDefinitionGroup>
@@ -44,13 +45,26 @@
     <ClInclude Include="SoundRender_Target.h" />
     <ClInclude Include="SoundRender_TargetA.h" />
     <ClInclude Include="stdafx.h" />
+    <ClInclude Include="ISoundRecorder.h" />
+    <ClInclude Include="ISoundVoiceChat.h" />
+    <ClInclude Include="IStreamPlayer.h" />
+    <ClInclude Include="IVoicePacketSender.h" />
+    <ClInclude Include="VoicePacket.h" />
+    <ClInclude Include="SpeexPreprocess.h" />
+    <ClInclude Include="VoicePacketsPacker.h" />
+    <ClInclude Include="RingBuffer.h" />
+    <ClInclude Include="SoundRecorderA.h" />
+    <ClInclude Include="StreamPlayerA.h" />
+    <ClInclude Include="SoundVoiceChat.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="guids.cpp">
       <PrecompiledHeader>
       </PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="OpenALDeviceList.cpp" />
+    <ClCompile Include="OpenALDeviceList.cpp">
+      <DebugInformationFormat Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
     <ClCompile Include="Sound.cpp" />
     <ClCompile Include="SoundRender_Core.cpp" />
     <ClCompile Include="SoundRender_CoreA.cpp" />
@@ -69,6 +83,11 @@
     <ClCompile Include="stdafx.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
+    <ClCompile Include="SpeexPreprocess.cpp" />
+    <ClCompile Include="VoicePacketsPacker.cpp" />
+    <ClCompile Include="SoundRecorderA.cpp" />
+    <ClCompile Include="StreamPlayerA.cpp" />
+    <ClCompile Include="SoundVoiceChat.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionDir)xrCore\xrCore.vcxproj">
@@ -94,6 +113,12 @@
     <CopyFileToFolders Include="..\..\sdk\binaries\$(PlatformShortName)\OpenAL32.dll">
       <FileType>Document</FileType>
     </CopyFileToFolders>
+    <CopyFileToFolders Include="..\..\sdk\binaries\$(PlatformShortName)\msys-opus-0.dll">
+      <FileType>Document</FileType>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="..\..\sdk\binaries\$(PlatformShortName)\libspeexdsp-1.dll">
+      <FileType>Document</FileType>
+    </CopyFileToFolders>
   </ItemGroup>
   <ItemGroup>
     <Natvis Include="..\OpenXRay.natvis" />
diff --git a/src/xrSound/xrSound.vcxproj.filters b/src/xrSound/xrSound.vcxproj.filters
index 04c1619480b..5f34653e773 100644
--- a/src/xrSound/xrSound.vcxproj.filters
+++ b/src/xrSound/xrSound.vcxproj.filters
@@ -78,6 +78,17 @@
     <ClInclude Include="SoundRender_Scene.h">
       <Filter>Scene</Filter>
     </ClInclude>
+    <ClInclude Include="ISoundRecorder.h" />
+    <ClInclude Include="ISoundVoiceChat.h" />
+    <ClInclude Include="IStreamPlayer.h" />
+    <ClInclude Include="IVoicePacketSender.h" />
+    <ClInclude Include="VoicePacket.h" />
+    <ClInclude Include="SpeexPreprocess.h" />
+    <ClInclude Include="VoicePacketsPacker.h" />
+    <ClInclude Include="RingBuffer.h" />
+    <ClInclude Include="SoundRecorderA.h" />
+    <ClInclude Include="StreamPlayerA.h" />
+    <ClInclude Include="SoundVoiceChat.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="guids.cpp">
@@ -134,6 +145,11 @@
     <ClCompile Include="SoundRender_Scene.cpp">
       <Filter>Scene</Filter>
     </ClCompile>
+    <ClCompile Include="SpeexPreprocess.cpp" />
+    <ClCompile Include="VoicePacketsPacker.cpp" />
+    <ClCompile Include="SoundRecorderA.cpp" />
+    <ClCompile Include="StreamPlayerA.cpp" />
+    <ClCompile Include="SoundVoiceChat.cpp" />
   </ItemGroup>
   <ItemGroup>
     <Natvis Include="..\OpenXRay.natvis" />
@@ -141,5 +157,7 @@
   <ItemGroup>
     <CopyFileToFolders Include="..\..\sdk\binaries\$(PlatformShortName)\soft_oal.dll" />
     <CopyFileToFolders Include="..\..\sdk\binaries\$(PlatformShortName)\OpenAL32.dll" />
+    <CopyFileToFolders Include="..\..\sdk\binaries\$(PlatformShortName)\libspeexdsp-1.dll" />
+    <CopyFileToFolders Include="..\..\sdk\binaries\$(PlatformShortName)\msys-opus-0.dll" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/xrUICore/ListBox/UIListBox.cpp b/src/xrUICore/ListBox/UIListBox.cpp
index 5964ded1f9f..8824b440d03 100644
--- a/src/xrUICore/ListBox/UIListBox.cpp
+++ b/src/xrUICore/ListBox/UIListBox.cpp
@@ -42,7 +42,7 @@ CUIListBoxItem* CUIListBox::AddTextItem(LPCSTR text)
 
     pItem->SetWndSize(Fvector2().set(GetDesiredChildWidth(), m_def_item_height));
     pItem->SetTextColor(m_text_color);
-    pItem->SetText(StringTable().translate(text).c_str());
+    pItem->SetText(text);
     pItem->GetTextItem()->SetWidth(GetDesiredChildWidth());
     return pItem;
 }