YangWX/crossdesk
1
0
Fork 0
mirror of https://github.com/kunkundi/crossdesk.git synced 2025-10-26 20:25:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Nice connection supports MacOSx

Browse Source
This commit is contained in:
dijunkun
2023-10-16 13:56:21 +08:00
parent a1940c9cf7
commit 027780160e
4 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/remote_desk/xmake.lua
View File

@@ -53,7 +53,7 @@ target("screen_capture")
target("remote_desk") target("remote_desk")
set_kind("binary") set_kind("binary")
add_deps("projectx", "screen_capture") add_deps("projectx", "screen_capture")
add_packages("log", "imgui", "sdl2") add_packages("log", "imgui", "sdl2", "ffmpeg")
add_files("remote_desk_gui/*.cpp") add_files("remote_desk_gui/*.cpp")
add_includedirs("../../src/interface") add_includedirs("../../src/interface")
if is_os("windows") then if is_os("windows") then

6
src/ice/libnice/ice_agent.cpp
View File

@@ -22,7 +22,7 @@ IceAgent::~IceAgent() {
g_thread_join(gexamplethread_); g_thread_join(gexamplethread_);
} }
void *IceAgent::CreateNcieAgent(void *data) { void *IceAgent::CreateNiceAgent(void *data) {
if (!data) { if (!data) {
return nullptr; return nullptr;
} }
@@ -89,10 +89,10 @@ int IceAgent::CreateIceAgent(nice_cb_state_changed_t on_state_changed,
// gloop_ = g_main_loop_new(NULL, FALSE); // gloop_ = g_main_loop_new(NULL, FALSE);
exit_thread_ = FALSE; exit_thread_ = FALSE;
// gexamplethread_ = g_thread_new("example thread", &CreateNcieAgent, this); // gexamplethread_ = g_thread_new("example thread", &CreateNiceAgent, this);
// g_main_loop_run(gloop_); // g_main_loop_run(gloop_);
g_thread_.reset(new std::thread(std::bind(&IceAgent::CreateNcieAgent, this))); g_thread_.reset(new std::thread(std::bind(&IceAgent::CreateNiceAgent, this)));
LOG_INFO("Nice agent init finish"); LOG_INFO("Nice agent init finish");
g_usleep(100000); g_usleep(100000);

2
src/ice/libnice/ice_agent.h
View File

@@ -48,7 +48,7 @@ class IceAgent {
int Send(const char* data, size_t size); int Send(const char* data, size_t size);
static void* CreateNcieAgent(void* data); static void* CreateNiceAgent(void* data);
public: public:
std::string stun_ip_ = ""; std::string stun_ip_ = "";

34
xmake.lua
View File

@@ -7,18 +7,20 @@ set_languages("c++17")
add_rules("mode.release", "mode.debug") add_rules("mode.release", "mode.debug")
add_requires("asio 1.24.0", "nlohmann_json", "spdlog 1.11.0", "vcpkg::libnice 0.1.21") add_requires("asio 1.24.0", "nlohmann_json", "spdlog 1.11.0")
add_requires("libjuice", {system = false}) add_requires("libjuice", {system = false})
if is_os("windows") then if is_os("windows") then
add_requires("vcpkg::ffmpeg 5.1.2", {configs = {shared = false}}) add_requires("vcpkg::ffmpeg 5.1.2", {configs = {shared = false}})
add_packages("vcpkg::ffmpeg") add_packages("vcpkg::ffmpeg")
add_requires("vcpkg::libnice 0.1.21")
add_packages("vcpkg::libnice")
elseif is_os("linux") then elseif is_os("linux") then
add_requires("ffmpeg 5.1.2", {system = false}) add_requires("ffmpeg 5.1.2", {system = false})
add_packages("ffmpeg") add_packages("ffmpeg")
elseif is_os("macosx") then elseif is_os("macosx") then
add_requires("ffmpeg 5.1.2", {system = false}) add_requires("ffmpeg 5.1.2", {system = false})
add_packages("ffmpeg") add_requires("brew::libnice", "brew::glib")
end end
add_defines("JUICE_STATIC") add_defines("JUICE_STATIC")
@@ -87,18 +89,28 @@ target("rtp")
target("ice") target("ice")
set_kind("static") set_kind("static")
add_deps("log", "common", "ws") add_deps("log", "common", "ws")
add_packages("asio", "nlohmann_json", "libjuice", "vcpkg::libnice") add_packages("asio", "nlohmann_json", "libjuice")
add_files("src/ice/libjuice/*.cpp")
add_files("src/ice/libnice/*.cpp") add_files("src/ice/libnice/*.cpp")
add_includedirs("src/ws", "src/ice/libjuice", "src/ice/libnice", {public = true}) add_includedirs("src/ws", "src/ice/libnice", {public = true})
add_includedirs("thirdparty/libjuice/include", {public = true}) if is_os("windows") then
add_includedirs("E:/SourceCode/vcpkg/installed/x64-windows-static/include/glib-2.0", {public = true}) add_includedirs("E:/SourceCode/vcpkg/installed/x64-windows-static/include/glib-2.0", {public = true})
add_includedirs("E:/SourceCode/vcpkg/installed/x64-windows-static/lib/glib-2.0/include", {public = true}) add_includedirs("E:/SourceCode/vcpkg/installed/x64-windows-static/lib/glib-2.0/include", {public = true})
add_linkdirs("E:/SourceCode/vcpkg/installed/x64-windows-static/lib") add_linkdirs("E:/SourceCode/vcpkg/installed/x64-windows-static/lib")
add_links("nice", "glib-2.0", "gio-2.0", "gmodule-2.0", "gobject-2.0", "gthread-2.0", add_links("nice", "glib-2.0", "gio-2.0", "gmodule-2.0", "gobject-2.0", "gthread-2.0",
"pcre2-8", "pcre2-16", "pcre2-32", "pcre2-posix", "pcre2-8", "pcre2-16", "pcre2-32", "pcre2-posix",
"zlib", "ffi", "libcrypto", "libssl", "intl", "iconv", "charset", "bz2", "zlib", "ffi", "libcrypto", "libssl", "intl", "iconv", "charset", "bz2",
"Shell32", "Advapi32", "Dnsapi", "Shlwapi", "Iphlpapi") "Shell32", "Advapi32", "Dnsapi", "Shlwapi", "Iphlpapi")
elseif is_os("macosx") then
add_packages("glib", "libnice")
add_includedirs("/usr/local/Cellar/glib/2.78.0/include/glib-2.0", {public = true})
add_includedirs("/usr/local/Cellar/glib/2.78.0/lib/glib-2.0/include", {public = true})
add_includedirs("/usr/local/Cellar/glib/2.78.0/include", {public = true})
add_includedirs("/usr/local/Cellar/libnice/0.1.21/include", {public = true})
add_linkdirs("/usr/local/Cellar/libnice/0.1.21/lib")
add_linkdirs("/usr/local/Cellar/glib/2.78.0/lib")
add_links("nice", "glib-2.0", "gio-2.0", "gobject-2.0")
end
target("ws") target("ws")
set_kind("static") set_kind("static")
@@ -147,6 +159,7 @@ target("media")
add_linkdirs("thirdparty/nvcodec/Lib/x64") add_linkdirs("thirdparty/nvcodec/Lib/x64")
add_links("cuda", "nvidia-encode", "nvcuvid") add_links("cuda", "nvidia-encode", "nvcuvid")
elseif is_os("macosx") then elseif is_os("macosx") then
add_packages("ffmpeg")
add_files("src/media/video/encode/*.cpp", add_files("src/media/video/encode/*.cpp",
"src/media/video/decode/*.cpp", "src/media/video/decode/*.cpp",
"src/media/video/encode/ffmpeg/*.cpp", "src/media/video/encode/ffmpeg/*.cpp",
@@ -204,7 +217,6 @@ target("guest")
target("nicetest") target("nicetest")
set_kind("binary") set_kind("binary")
add_packages("vcpkg::libnice")
add_files("tests/peerconnection/nice.cpp") add_files("tests/peerconnection/nice.cpp")
add_includedirs("E:/SourceCode/vcpkg/installed/x64-windows-static/include/glib-2.0") add_includedirs("E:/SourceCode/vcpkg/installed/x64-windows-static/include/glib-2.0")
add_includedirs("E:/SourceCode/vcpkg/installed/x64-windows-static/lib/glib-2.0/include") add_includedirs("E:/SourceCode/vcpkg/installed/x64-windows-static/lib/glib-2.0/include")