From 3eef1f8d8490dae1b5d4e52b95ecc313e3d9931b Mon Sep 17 00:00:00 2001 From: dijunkun Date: Wed, 29 Nov 2023 22:57:03 -0800 Subject: [PATCH] Disable ffmpeg openh264 codec --- thirdparty/ffmpeg/xmake.lua | 5 +++-- xmake.lua | 18 +++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/thirdparty/ffmpeg/xmake.lua b/thirdparty/ffmpeg/xmake.lua index b775580..32b7e02 100644 --- a/thirdparty/ffmpeg/xmake.lua +++ b/thirdparty/ffmpeg/xmake.lua @@ -42,14 +42,15 @@ package("ffmpeg") 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("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 add_links("avfilter", "avdevice", "avformat", "avcodec", "swscale", "swresample", "avutil") if is_plat("macosx") then add_frameworks("CoreFoundation", "Foundation", "CoreVideo", "CoreMedia", "AudioToolbox", "VideoToolbox", "Security") elseif is_plat("linux") then - add_syslinks("pthread", "openh264") + -- add_syslinks("pthread", "openh264") + add_syslinks("pthread") end if is_plat("linux", "macosx") then diff --git a/xmake.lua b/xmake.lua index 89f3824..8e5eff1 100644 --- a/xmake.lua +++ b/xmake.lua @@ -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_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_packages("asio", "nlohmann_json", "spdlog", "openfec", "libopus", "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") includes("thirdparty") @@ -267,10 +267,10 @@ target("projectx") -- add_files("tests/fec/simple_server.cpp") -- add_includedirs("tests/fec") -target("opus_test") - set_kind("binary") - add_packages("libopus", "sdl2") - add_files("tests/opus/OpusEncoderImpl.cpp", - "tests/opus/OpusDecoderImpl.cpp", - "tests/opus/main.cpp") - add_includedirs("tests/opus") \ No newline at end of file +-- target("opus_test") +-- set_kind("binary") +-- add_packages("libopus", "sdl2") +-- add_files("tests/opus/OpusEncoderImpl.cpp", +-- "tests/opus/OpusDecoderImpl.cpp", +-- "tests/opus/main.cpp") +-- add_includedirs("tests/opus") \ No newline at end of file