From c95a2a32dc7bc614f0d3e5686900a00299aa7dff Mon Sep 17 00:00:00 2001 From: dijunkun Date: Wed, 22 May 2024 14:04:43 +0800 Subject: [PATCH] 1.Not specify vcpkg::libnice version and it makes compiling process easier; 2.Remove ffmpeg from thirdparty --- .../video/decode/dav1d/dav1d_av1_decoder.h | 25 +-- thirdparty/ffmpeg/xmake.lua | 207 ------------------ thirdparty/xmake.lua | 8 +- xmake.lua | 14 +- 4 files changed, 9 insertions(+), 245 deletions(-) delete mode 100644 thirdparty/ffmpeg/xmake.lua diff --git a/src/media/video/decode/dav1d/dav1d_av1_decoder.h b/src/media/video/decode/dav1d/dav1d_av1_decoder.h index 8af2795..adcfa4c 100644 --- a/src/media/video/decode/dav1d/dav1d_av1_decoder.h +++ b/src/media/video/decode/dav1d/dav1d_av1_decoder.h @@ -7,24 +7,9 @@ #ifndef _DAV1D_AV1_DECODER_H_ #define _DAV1D_AV1_DECODER_H_ -#include "dav1d/dav1d.h" - -#ifdef _WIN32 -extern "C" { -#include "libavcodec/avcodec.h" -}; -#else -#ifdef __cplusplus -extern "C" { -#endif -#include -#ifdef __cplusplus -}; -#endif -#endif - #include +#include "dav1d/dav1d.h" #include "video_decoder.h" class Dav1dAv1Decoder : public VideoDecoder { @@ -38,14 +23,6 @@ class Dav1dAv1Decoder : public VideoDecoder { std::function on_receive_decoded_frame); private: - AVCodecID codec_id_; - const AVCodec *codec_; - AVCodecContext *codec_ctx_ = nullptr; - AVPacket *packet_ = nullptr; - AVFrame *frame_ = nullptr; - AVFrame *frame_nv12_ = nullptr; - struct SwsContext *img_convert_ctx = nullptr; - VideoFrame *decoded_frame_yuv_ = nullptr; VideoFrame *decoded_frame_nv12_ = nullptr; diff --git a/thirdparty/ffmpeg/xmake.lua b/thirdparty/ffmpeg/xmake.lua deleted file mode 100644 index bf6a493..0000000 --- a/thirdparty/ffmpeg/xmake.lua +++ /dev/null @@ -1,207 +0,0 @@ -package("ffmpeg") - - set_homepage("https://www.ffmpeg.org") - set_description("A collection of libraries to process multimedia content such as audio, video, subtitles and related metadata.") - set_license("LGPL-3.0") - - if is_plat("windows", "mingw") then - add_urls("https://www.gyan.dev/ffmpeg/builds/packages/ffmpeg-$(version)-full_build-shared.7z") - add_versions("5.1.2", "d9eb97b72d7cfdae4d0f7eaea59ccffb8c364d67d88018ea715d5e2e193f00e9") - add_versions("5.0.1", "ded28435b6f04b74f5ef5a6a13761233bce9e8e9f8ecb0eabe936fd36a778b0c") - - add_configs("shared", {description = "Download shared binaries.", default = true, type = "boolean", readonly = true}) - add_configs("vs_runtime", {description = "Set vs compiler runtime.", default = "MD", readonly = true}) - else - add_urls("https://ffmpeg.org/releases/ffmpeg-$(version).tar.bz2", {alias = "home"}) - add_urls("https://github.com/FFmpeg/FFmpeg/archive/n$(version).zip", {alias = "github"}) - add_urls("https://git.ffmpeg.org/ffmpeg.git", "https://github.com/FFmpeg/FFmpeg.git", {alias = "git"}) - add_versions("home:5.1.2", "39a0bcc8d98549f16c570624678246a6ac736c066cebdb409f9502e915b22f2b") - add_versions("home:5.1.1", "cd0e16f903421266d5ccddedf7b83b9e5754aef4b9f7a7f06ce9e4c802f0545b") - add_versions("home:5.0.1", "28df33d400a1c1c1b20d07a99197809a3b88ef765f5f07dc1ff067fac64c59d6") - add_versions("home:4.0.2", "346c51735f42c37e0712e0b3d2f6476c86ac15863e4445d9e823fe396420d056") - add_versions("github:5.1.2", "0c99f3609160f40946e2531804175eea16416320c4b6365ad075e390600539db") - add_versions("github:5.1.1", "a886fcc94792764c27c88ebe71dffbe5f0d37df8f06f01efac4833ac080c11bf") - add_versions("github:5.0.1", "f9c2e06cafa4381df8d5c9c9e14d85d9afcbc10c516c6a206f821997cc7f6440") - add_versions("github:4.0.2", "4df1ef0bf73b7148caea1270539ef7bd06607e0ea8aa2fbf1bb34062a097f026") - add_versions("git:5.1.2", "n5.1.2") - add_versions("git:5.1.1", "n5.1.1") - add_versions("git:5.0.1", "n5.0.1") - add_versions("git:4.0.2", "n4.0.2") - - add_configs("gpl", {description = "Enable GPL code", default = false, type = "boolean"}) - add_configs("ffprobe", {description = "Enable ffprobe program.", default = false, type = "boolean"}) - add_configs("ffmpeg", {description = "Enable ffmpeg program.", default = true, type = "boolean"}) - add_configs("ffplay", {description = "Enable ffplay program.", default = false, type = "boolean"}) - add_configs("zlib", {description = "Enable zlib compression library.", default = false, type = "boolean"}) - add_configs("lzma", {description = "Enable liblzma compression library.", default = false, type = "boolean"}) - add_configs("bzlib", {description = "Enable bzlib compression library.", default = false, type = "boolean"}) - add_configs("libx264", {description = "Enable libx264 decoder.", default = false, type = "boolean"}) - add_configs("libx265", {description = "Enable libx265 decoder.", default = false, type = "boolean"}) - add_configs("iconv", {description = "Enable libiconv library.", default = false, type = "boolean"}) - add_configs("vaapi", {description = "Enable vaapi 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("asm", {description = "Enable asm", default = false, type = "boolean"}) - add_configs("libopenh264", {description = "Enable libopenh264", default = false, type = "boolean"}) - end - - add_links("avfilter", "avdevice", "avformat", "avcodec", "swscale", "swresample", "avutil", "postproc") - 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") - end - - if is_plat("linux", "macosx") then - add_deps("yasm") - end - - if on_fetch then - on_fetch("mingw", "linux", "macosx", function (package, opt) - import("lib.detect.find_tool") - if opt.system then - local result - for _, name in ipairs({"libavcodec", "libavdevice", "libavfilter", "libavformat", "libavutil", "libpostproc", "libswresample", "libswscale"}) do - local pkginfo = package:find_package("pkgconfig::" .. name, opt) - if pkginfo then - pkginfo.version = nil - if not result then - result = pkginfo - else - result = result .. pkginfo - end - else - return - end - end - local ffmpeg = find_tool("ffmpeg", {check = "-help", version = true, command = "-version", parse = "%d+%.?%d+%.?%d+", force = true}) - if ffmpeg then - result.version = ffmpeg.version - end - return result - end - end) - end - - on_load("linux", "macosx", "android", function (package) - local configdeps = {zlib = "zlib", - bzlib = "bzip2", - lzma = "xz", - libx264 = "x264", - libx265 = "x265", - iconv = "libiconv"} - for name, dep in pairs(configdeps) do - if package:config(name) then - package:add("deps", dep) - end - end - -- https://www.ffmpeg.org/platform.html#toc-Advanced-linking-configuration - if package:config("pic") ~= false and not package:is_plat("macosx") then - package:add("shflags", "-Wl,-Bsymbolic") - package:add("ldflags", "-Wl,-Bsymbolic") - end - if not package:config("gpl") then - package:set("license", "LGPL-3.0") - end - end) - - on_install("windows|x64", "mingw|x86_64", function (package) - os.cp("bin", package:installdir()) - os.cp("include", package:installdir()) - os.cp("lib", package:installdir()) - package:addenv("PATH", "bin") - end) - - on_install("linux", "macosx", "android@linux,macosx", function (package) - local configs = {"--enable-version3", - "--disable-doc"} - if package:config("gpl") then - table.insert(configs, "--enable-gpl") - end - if package:is_plat("macosx") and macos.version():ge("10.8") then - table.insert(configs, "--enable-videotoolbox") - end - for name, enabled in pairs(package:configs()) do - if not package:extraconf("configs", name, "builtin") then - if enabled then - table.insert(configs, "--enable-" .. name) - else - table.insert(configs, "--disable-" .. name) - end - end - end - if package:config("shared") then - table.insert(configs, "--enable-shared") - table.insert(configs, "--disable-static") - else - table.insert(configs, "--enable-static") - table.insert(configs, "--disable-shared") - end - if package:debug() then - table.insert(configs, "--enable-debug") - else - table.insert(configs, "--disable-debug") - end - if package:is_plat("android") then - import("core.base.option") - import("core.tool.toolchain") - local ndk = toolchain.load("ndk", {plat = package:plat(), arch = package:arch()}) - local bin = ndk:bindir() - local ndk_sdkver = ndk:config("ndk_sdkver") - local arch, cpu, triple, cross_prefix - if package:is_arch("arm64-v8a") then - arch = "arm64" - cpu = "armv8-a" - triple = "aarch64-linux-android" - cross_prefix = path.join(bin, "aarch64-linux-android-") - elseif package:arch():startswith("arm") then - arch = "arm" - cpu = "armv7-a" - triple = "armv7a-linux-androideabi" - cross_prefix = path.join(bin, "arm-linux-androideabi-") - else - raise("unknown arch(%s) for android!", package:arch()) - end - local sysroot = path.join(path.directory(bin), "sysroot") - local cflags = table.join(table.wrap(package:config("cxflags")), table.wrap(package:config("cflags")), table.wrap(get_config("cxflags")), get_config("cflags")) - local cxxflags = table.join(table.wrap(package:config("cxflags")), table.wrap(package:config("cxxflags")), table.wrap(get_config("cxflags")), get_config("cxxflags")) - assert(os.isdir(sysroot), "we do not support old version ndk!") - if package:is_arch("arm64-v8a") then - table.insert(cflags, "-mfpu=neon") - table.insert(cflags, "-mfloat-abi=soft") - else - table.insert(cflags, "-mfpu=neon") - table.insert(cflags, "-mfloat-abi=soft") - end - table.insert(configs, "--enable-neon") - table.insert(configs, "--enable-asm") - table.insert(configs, "--enable-jni") - table.insert(configs, "--target-os=android") - table.insert(configs, "--enable-cross-compile") - table.insert(configs, "--disable-avdevice") - table.insert(configs, "--arch=" .. arch) - table.insert(configs, "--cpu=" .. cpu) - table.insert(configs, "--cc=" .. path.join(bin, triple .. ndk_sdkver .. "-clang")) - table.insert(configs, "--cxx=" .. path.join(bin, triple .. ndk_sdkver .. "-clang++")) - table.insert(configs, "--extra-cflags=" .. table.concat(cflags, ' ')) - table.insert(configs, "--extra-cxxflags=" .. table.concat(cxxflags, ' ')) - table.insert(configs, "--sysroot=" .. sysroot) - table.insert(configs, "--cross-prefix=" .. cross_prefix) - table.insert(configs, "--prefix=" .. package:installdir()) - os.vrunv("./configure", configs) - local argv = {"-j4"} - if option.get("verbose") then - table.insert(argv, "V=1") - end - os.vrunv("make", argv) - os.vrun("make install") - else - import("package.tools.autoconf").install(package, configs) - end - package:addenv("PATH", "bin") - end) - - on_test(function (package) - assert(package:has_cfuncs("avformat_open_input", {includes = "libavformat/avformat.h"})) - end) \ No newline at end of file diff --git a/thirdparty/xmake.lua b/thirdparty/xmake.lua index 782bda0..40e3c60 100644 --- a/thirdparty/xmake.lua +++ b/thirdparty/xmake.lua @@ -1,7 +1 @@ -includes("openfec", "libyuv") -if is_plat("windows") then -elseif is_plat("linux") then - includes("ffmpeg") -elseif is_plat("macosx") then - includes("ffmpeg") -end \ No newline at end of file +includes("openfec", "libyuv") \ No newline at end of file diff --git a/xmake.lua b/xmake.lua index 25ae245..f8c932a 100644 --- a/xmake.lua +++ b/xmake.lua @@ -17,24 +17,24 @@ add_packages("asio", "nlohmann_json", "spdlog", "openfec", "libopus", "dav1d", " includes("thirdparty") if is_os("windows") then - add_requires("vcpkg::libnice 0.1.21") + add_requires("vcpkg::libnice", {configs = {shared = false}}) add_requires("openh264 2.1.1", {configs = {shared = false}}) - add_requires("vcpkg::aom") + add_requires("vcpkg::aom 3.8.1") add_packages("vcpkg::libnice", "openh264", "vcpkg::aom", "cuda") add_defines("_WEBSOCKETPP_CPP11_INTERNAL_") add_requires("cuda") elseif is_os("linux") then add_requires("glib", {system = true}) - add_requires("vcpkg::libnice 0.1.21") + add_requires("vcpkg::libnice", {configs = {shared = false}}) add_requires("openh264 2.1.1", {configs = {shared = false}}) - add_requires("vcpkg::aom") + add_requires("vcpkg::aom 3.8.1") add_packages("glib", "vcpkg::libnice", "openh264", "cuda") add_cxflags("-fPIC") add_syslinks("pthread") elseif is_os("macosx") then add_requires("vcpkg::libnice", {configs = {shared = false}}) add_requires("vcpkg::openh264", {configs = {shared = false}}) - add_requires("vcpkg::aom") + add_requires("vcpkg::aom 3.8.1") add_packages("vcpkg::libnice", "vcpkg::openh264", "vcpkg::aom") add_ldflags("-Wl,-ld_classic") end @@ -196,8 +196,8 @@ target("projectx") add_linkdirs("thirdparty/nvcodec/Lib/x64") add_links("nice", "glib-2.0", "gio-2.0", "gmodule-2.0", "gobject-2.0", "pcre2-8", "pcre2-16", "pcre2-32", "pcre2-posix", - "zlib", "ffi", "libcrypto", "libssl", "intl", "iconv", "charset", "bz2", - "Shell32", "Advapi32", "Dnsapi", "Shlwapi", "Iphlpapi", + "zlib", "ffi", "libcrypto", "libssl", "intl", "iconv", + "Shell32", "Advapi32", "Dnsapi", "Shlwapi", "cuda", "nvencodeapi", "nvcuvid", "ws2_32", "Bcrypt", "windowsapp", "User32", "Strmiids", "Mfuuid", "Secur32", "Bcrypt")