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

Fix AV1 codec on MacOS

Browse Source
This commit is contained in:
dijunkun
2024-05-10 14:44:34 +08:00
parent 1439751ae3
commit 6df90ff55a
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/media/video/decode/video_decoder_factory.cpp
View File

@@ -1,6 +1,7 @@
#include "video_decoder_factory.h" #include "video_decoder_factory.h"
#if __APPLE__ #if __APPLE__
#include "dav1d/dav1d_av1_decoder.h"
#include "ffmpeg/ffmpeg_video_decoder.h" #include "ffmpeg/ffmpeg_video_decoder.h"
#include "openh264/openh264_decoder.h" #include "openh264/openh264_decoder.h"
#else #else

1
src/media/video/encode/video_encoder_factory.cpp
View File

@@ -1,6 +1,7 @@
#include "video_encoder_factory.h" #include "video_encoder_factory.h"
#if __APPLE__ #if __APPLE__
#include "aom/aom_av1_encoder.h"
#include "ffmpeg/ffmpeg_video_encoder.h" #include "ffmpeg/ffmpeg_video_encoder.h"
#include "openh264/openh264_encoder.h" #include "openh264/openh264_encoder.h"
#else #else

22
xmake.lua
View File

@@ -19,9 +19,9 @@ includes("thirdparty")
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_requires("vcpkg::libnice 0.1.21") add_requires("vcpkg::libnice 0.1.21")
add_requires("vcpkg::aom")
add_requires("openh264 2.1.1", {configs = {shared = false}}) add_requires("openh264 2.1.1", {configs = {shared = false}})
add_packages("vcpkg::ffmpeg", "vcpkg::libnice", "vcpkg::aom", "openh264", "cuda") add_requires("vcpkg::aom")
add_packages("vcpkg::ffmpeg", "vcpkg::libnice", "openh264", "vcpkg::aom", "cuda")
add_defines("_WEBSOCKETPP_CPP11_INTERNAL_") add_defines("_WEBSOCKETPP_CPP11_INTERNAL_")
add_requires("cuda") add_requires("cuda")
elseif is_os("linux") then elseif is_os("linux") then
@@ -29,6 +29,7 @@ elseif is_os("linux") then
add_requires("glib", {system = true}) add_requires("glib", {system = true})
add_requires("vcpkg::libnice 0.1.21") add_requires("vcpkg::libnice 0.1.21")
add_requires("openh264 2.1.1", {configs = {shared = false}}) add_requires("openh264 2.1.1", {configs = {shared = false}})
add_requires("vcpkg::aom")
add_packages("ffmpeg", "glib", "vcpkg::libnice", "openh264", "cuda") add_packages("ffmpeg", "glib", "vcpkg::libnice", "openh264", "cuda")
add_cxflags("-fPIC") add_cxflags("-fPIC")
add_syslinks("pthread") add_syslinks("pthread")
@@ -36,7 +37,8 @@ elseif is_os("macosx") then
add_requires("ffmpeg 5.1.2", {system = false}) add_requires("ffmpeg 5.1.2", {system = false})
add_requires("vcpkg::libnice", {configs = {shared = false}}) add_requires("vcpkg::libnice", {configs = {shared = false}})
add_requires("vcpkg::openh264", {configs = {shared = false}}) add_requires("vcpkg::openh264", {configs = {shared = false}})
add_packages("ffmpeg", "vcpkg::libnice", "vcpkg::openh264") add_requires("vcpkg::aom")
add_packages("ffmpeg", "vcpkg::libnice", "vcpkg::openh264", "vcpkg::aom")
add_ldflags("-Wl,-ld_classic") add_ldflags("-Wl,-ld_classic")
end end
@@ -143,7 +145,9 @@ target("media")
"src/media/video/encode/ffmpeg/*.cpp", "src/media/video/encode/ffmpeg/*.cpp",
"src/media/video/decode/ffmpeg/*.cpp", "src/media/video/decode/ffmpeg/*.cpp",
"src/media/video/encode/openh264/*.cpp", "src/media/video/encode/openh264/*.cpp",
"src/media/video/decode/openh264/*.cpp") "src/media/video/decode/openh264/*.cpp",
"src/media/video/encode/aom/*.cpp",
"src/media/video/decode/dav1d/*.cpp")
add_includedirs("src/media/video/encode", add_includedirs("src/media/video/encode",
"src/media/video/decode", "src/media/video/decode",
"src/media/video/encode/nvcodec", "src/media/video/encode/nvcodec",
@@ -152,6 +156,8 @@ target("media")
"src/media/video/decode/ffmpeg", "src/media/video/decode/ffmpeg",
"src/media/video/encode/openh264", "src/media/video/encode/openh264",
"src/media/video/decode/openh264", "src/media/video/decode/openh264",
"src/media/video/encode/aom",
"src/media/video/decode/dav1d",
"thirdparty/nvcodec/Interface", "thirdparty/nvcodec/Interface",
"thirdparty/nvcodec/Samples", {public = true}) "thirdparty/nvcodec/Samples", {public = true})
elseif is_os("macosx") then elseif is_os("macosx") then
@@ -160,13 +166,17 @@ target("media")
"src/media/video/encode/ffmpeg/*.cpp", "src/media/video/encode/ffmpeg/*.cpp",
"src/media/video/decode/ffmpeg/*.cpp", "src/media/video/decode/ffmpeg/*.cpp",
"src/media/video/encode/openh264/*.cpp", "src/media/video/encode/openh264/*.cpp",
"src/media/video/decode/openh264/*.cpp") "src/media/video/decode/openh264/*.cpp",
"src/media/video/encode/aom/*.cpp",
"src/media/video/decode/dav1d/*.cpp")
add_includedirs("src/media/video/encode", add_includedirs("src/media/video/encode",
"src/media/video/decode", "src/media/video/decode",
"src/media/video/encode/ffmpeg", "src/media/video/encode/ffmpeg",
"src/media/video/decode/ffmpeg", "src/media/video/decode/ffmpeg",
"src/media/video/encode/openh264", "src/media/video/encode/openh264",
"src/media/video/decode/openh264", {public = true}) "src/media/video/decode/openh264",
"src/media/video/encode/aom",
"src/media/video/decode/dav1d", {public = true})
end end
add_files("src/media/audio/encode/*.cpp", add_files("src/media/audio/encode/*.cpp",
"src/media/audio/decode/*.cpp") "src/media/audio/decode/*.cpp")