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

Disable ffmpeg openh264 codec

Browse Source
This commit is contained in:
dijunkun
2023-11-29 22:57:03 -08:00
parent 079ceddae7
commit 3eef1f8d84
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
thirdparty/ffmpeg/xmake.lua vendored
View File

@@ -42,14 +42,15 @@ package("ffmpeg")
add_configs("vdpau", {description = "Enable vdpau library.", default = false, type = "boolean"}) add_configs("vdpau", {description = "Enable vdpau library.", default = false, type = "boolean"})
add_configs("hardcoded-tables", {description = "Enable hardcoded tables.", default = true, type = "boolean"}) add_configs("hardcoded-tables", {description = "Enable hardcoded tables.", default = true, type = "boolean"})
add_configs("asm", {description = "Enable asm", default = false, type = "boolean"}) add_configs("asm", {description = "Enable asm", default = false, type = "boolean"})
add_configs("libopenh264", {description = "Enable libopenh264", default = true, type = "boolean"}) add_configs("libopenh264", {description = "Enable libopenh264", default = false, type = "boolean"})
end end
add_links("avfilter", "avdevice", "avformat", "avcodec", "swscale", "swresample", "avutil") add_links("avfilter", "avdevice", "avformat", "avcodec", "swscale", "swresample", "avutil")
if is_plat("macosx") then if is_plat("macosx") then
add_frameworks("CoreFoundation", "Foundation", "CoreVideo", "CoreMedia", "AudioToolbox", "VideoToolbox", "Security") add_frameworks("CoreFoundation", "Foundation", "CoreVideo", "CoreMedia", "AudioToolbox", "VideoToolbox", "Security")
elseif is_plat("linux") then elseif is_plat("linux") then
add_syslinks("pthread", "openh264") -- add_syslinks("pthread", "openh264")
add_syslinks("pthread")
end end
if is_plat("linux", "macosx") then if is_plat("linux", "macosx") then

18
xmake.lua
View File

@@ -11,8 +11,8 @@ add_defines("ASIO_STANDALONE", "ASIO_HAS_STD_TYPE_TRAITS", "ASIO_HAS_STD_SHARED_
"ASIO_HAS_STD_ADDRESSOF", "ASIO_HAS_STD_ATOMIC", "ASIO_HAS_STD_CHRONO", "ASIO_HAS_STD_ADDRESSOF", "ASIO_HAS_STD_ATOMIC", "ASIO_HAS_STD_CHRONO",
"ASIO_HAS_CSTDINT", "ASIO_HAS_STD_ARRAY", "ASIO_HAS_STD_SYSTEM_ERROR") "ASIO_HAS_CSTDINT", "ASIO_HAS_STD_ARRAY", "ASIO_HAS_STD_SYSTEM_ERROR")
add_requires("asio 1.24.0", "nlohmann_json", "spdlog 1.11.0", "openfec", "libopus 1.4", "sdl2") add_requires("asio 1.24.0", "nlohmann_json", "spdlog 1.11.0", "openfec", "libopus 1.4")
add_packages("asio", "nlohmann_json", "spdlog", "openfec", "libopus", "sdl2") add_packages("asio", "nlohmann_json", "spdlog", "openfec", "libopus")
includes("thirdparty") includes("thirdparty")
@@ -267,10 +267,10 @@ target("projectx")
-- add_files("tests/fec/simple_server.cpp") -- add_files("tests/fec/simple_server.cpp")
-- add_includedirs("tests/fec") -- add_includedirs("tests/fec")
target("opus_test") -- target("opus_test")
set_kind("binary") -- set_kind("binary")
add_packages("libopus", "sdl2") -- add_packages("libopus", "sdl2")
add_files("tests/opus/OpusEncoderImpl.cpp", -- add_files("tests/opus/OpusEncoderImpl.cpp",
"tests/opus/OpusDecoderImpl.cpp", -- "tests/opus/OpusDecoderImpl.cpp",
"tests/opus/main.cpp") -- "tests/opus/main.cpp")
add_includedirs("tests/opus") -- add_includedirs("tests/opus")