Compare commits
48 Commits
Author | SHA1 | Date |
---|---|---|
|
35c9a9d865 | 2 years ago |
|
a9e5bec5aa | 2 years ago |
|
7fbae54cc1 | 2 years ago |
|
8747434e7b | 2 years ago |
|
06511a4f68 | 2 years ago |
|
8e8cf809dd | 2 years ago |
|
9eaa09282d | 2 years ago |
|
a055769313 | 2 years ago |
|
e2d36036b1 | 2 years ago |
|
9d65d79255 | 2 years ago |
|
5653a2018a | 2 years ago |
|
04b0f11b65 | 2 years ago |
|
d23b2639c9 | 2 years ago |
|
7951eed7e4 | 2 years ago |
|
f8e7d7d523 | 2 years ago |
|
1ddabb8511 | 2 years ago |
|
28f2c7cf7d | 2 years ago |
|
d5453a9e31 | 2 years ago |
|
20a1799624 | 2 years ago |
|
fdc592be0c | 2 years ago |
|
29a5afe1eb | 2 years ago |
|
35d8c07494 | 2 years ago |
|
43fd7f8230 | 2 years ago |
|
c80d104c40 | 2 years ago |
|
380e7884fa | 2 years ago |
|
c477d31581 | 2 years ago |
|
dcf980ed7c | 2 years ago |
|
1c26694bc0 | 2 years ago |
|
b15ce31ddd | 2 years ago |
|
2b54bdd654 | 2 years ago |
|
81b7a4c81c | 2 years ago |
|
06c5c20de5 | 2 years ago |
|
d3dfa588a9 | 2 years ago |
|
1dbf5b4e1c | 2 years ago |
|
31452e62cb | 2 years ago |
|
4210da881f | 2 years ago |
|
2d4345e569 | 2 years ago |
|
d50c542bf1 | 2 years ago |
|
bc15a8a57e | 2 years ago |
|
481286292e | 2 years ago |
|
ea2e660f54 | 2 years ago |
|
aae7d8a0f6 | 2 years ago |
|
c758101b9e | 2 years ago |
|
59e3f31679 | 2 years ago |
|
a532ce9156 | 2 years ago |
|
d68ee49a82 | 2 years ago |
|
4e1371b673 | 2 years ago |
|
0bfaeed7fa | 2 years ago |
3 changed files with 143 additions and 0 deletions
@ -0,0 +1,61 @@ |
||||
diff --git a/Source/Lib/Common/Codec/EbThreads.c b/Source/Lib/Common/Codec/EbThreads.c
|
||||
index ea403ae..4f99818 100644
|
||||
--- a/Source/Lib/Common/Codec/EbThreads.c
|
||||
+++ b/Source/Lib/Common/Codec/EbThreads.c
|
||||
@@ -121,11 +121,13 @@ EbHandle svt_create_thread(void *thread_function(void *), void *thread_context)
|
||||
* the thread priority will __always__ fail the thread sanitizer.
|
||||
* https://github.com/google/sanitizers/issues/1088
|
||||
*/
|
||||
+#if 0
|
||||
if (!EB_THREAD_SANITIZER_ENABLED && !geteuid()) {
|
||||
if (pthread_setschedparam(*th, SCHED_FIFO, &(struct sched_param){.sched_priority = 99}))
|
||||
SVT_WARN("Failed to set thread priority\n");
|
||||
// ignore if this failed
|
||||
}
|
||||
+#endif
|
||||
thread_handle = th;
|
||||
#endif // _WIN32
|
||||
|
||||
diff --git a/Source/Lib/Common/Codec/EbThreads.h b/Source/Lib/Common/Codec/EbThreads.h
|
||||
index 8506c7f..6ed7125 100644
|
||||
--- a/Source/Lib/Common/Codec/EbThreads.h
|
||||
+++ b/Source/Lib/Common/Codec/EbThreads.h
|
||||
@@ -83,7 +83,6 @@ extern EbErrorType svt_destroy_mutex(EbHandle mutex_handle);
|
||||
do { \
|
||||
pointer = svt_create_thread(thread_function, thread_context); \
|
||||
EB_ADD_MEM(pointer, 1, EB_THREAD); \
|
||||
- pthread_setaffinity_np(*((pthread_t *)pointer), sizeof(cpu_set_t), &svt_aom_group_affinity); \
|
||||
} while (0)
|
||||
#else
|
||||
#define EB_CREATE_THREAD(pointer, thread_function, thread_context) \
|
||||
diff --git a/Source/Lib/Decoder/Codec/EbDecHandle.c b/Source/Lib/Decoder/Codec/EbDecHandle.c
|
||||
index 952d889..4c1b954 100644
|
||||
--- a/Source/Lib/Decoder/Codec/EbDecHandle.c
|
||||
+++ b/Source/Lib/Decoder/Codec/EbDecHandle.c
|
||||
@@ -76,10 +76,6 @@ EbErrorType svt_aom_decode_multiple_obu(EbDecHandle *dec_handle_ptr, uint8_t **d
|
||||
uint32_t is_annexb);
|
||||
|
||||
static void dec_switch_to_real_time() {
|
||||
-#if !defined(_WIN32)
|
||||
- if (!geteuid())
|
||||
- (void)pthread_setschedparam(pthread_self(), SCHED_FIFO, &(struct sched_param){.sched_priority = 99});
|
||||
-#endif
|
||||
}
|
||||
|
||||
/***********************************
|
||||
diff --git a/Source/Lib/Encoder/Globals/EbEncHandle.c b/Source/Lib/Encoder/Globals/EbEncHandle.c
|
||||
index be068d9..1ddc2a6 100644
|
||||
--- a/Source/Lib/Encoder/Globals/EbEncHandle.c
|
||||
+++ b/Source/Lib/Encoder/Globals/EbEncHandle.c
|
||||
@@ -312,11 +312,6 @@ void svt_aom_init_intra_predictors_internal(void);
|
||||
void svt_av1_init_me_luts(void);
|
||||
|
||||
static void enc_switch_to_real_time(){
|
||||
-#if !defined(_WIN32)
|
||||
- if (!geteuid())
|
||||
- (void)pthread_setschedparam(
|
||||
- pthread_self(), SCHED_FIFO, &(struct sched_param){.sched_priority = 99});
|
||||
-#endif
|
||||
}
|
||||
#define SINGLE_CORE_COUNT 1
|
||||
#define CONS_CORE_COUNT 16
|
@ -0,0 +1,60 @@ |
||||
package("svt-av1") |
||||
set_homepage("https://gitlab.com/AOMediaCodec/SVT-AV1") |
||||
set_description("Scalable Video Technology for AV1 (SVT-AV1 Encoder and Decoder)") |
||||
|
||||
add_urls("https://gitlab.com/AOMediaCodec/SVT-AV1.git", |
||||
"https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v$(version)/SVT-AV1-v$(version).tar.gz") |
||||
add_versions("1.4.0", "0a4650b822c4eeb9656fbe96bd795e7a73cbfd1ab8c12546348ba88d8ed6b415") |
||||
add_versions("1.4.1", "e3f7fc194afc6c90b43e0b80fa24c09940cb03bea394e0e1f5d1ded18e9ab23f") |
||||
add_versions("1.5.0", "64e27b024eb43e4ba4e7b85584e0497df534043b2ce494659532c585819d0333") |
||||
add_versions("1.6.0", "3bc207247568ac713245063555082bfc905edc31df3bf6355e3b194cb73ad817") |
||||
|
||||
if is_plat("wasm", "android") then |
||||
add_patches("1.6.0", path.join(os.scriptdir(), "patches", "1.6.0", "pthread.patch"), "1875f99a581e00d9233b14ca66443289a805dadd55b4c81a4d253e6770516216") |
||||
end |
||||
|
||||
if is_plat("wasm") then |
||||
add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true}) |
||||
end |
||||
|
||||
if is_plat("linux", "wasm", "bsd") then |
||||
add_syslinks("pthread") |
||||
end |
||||
|
||||
add_deps("cmake") |
||||
|
||||
on_load(function (package) |
||||
if package:is_targetarch("x64", "x86", "x86_64") then |
||||
if is_host("windows") or package:is_plat("bsd") then |
||||
package:add("deps", "nasm") |
||||
else |
||||
package:add("deps", "yasm") |
||||
end |
||||
end |
||||
end) |
||||
|
||||
on_install(function (package) |
||||
local configs = {"-DBUILD_TESTING=OFF", "-DCOVERAGE=OFF", "-DBUILD_APPS=OFF"} |
||||
table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) |
||||
table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) |
||||
table.insert(configs, "-DLIB_INSTALL_DIR=" .. package:installdir("lib")) |
||||
if package:is_plat("wasm") then |
||||
io.replace("CMakeLists.txt", "if(MINGW)", "if(TRUE)\n check_both_flags_add(-pthread)\n elseif(MINGW)", {plain = true}) |
||||
io.replace("CMakeLists.txt", "set(CMAKE_EXE_LINKER_FLAGS \"${CMAKE_EXE_LINKER_FLAGS} -z noexecstack -z relro -z now\")", "", {plain = true}) |
||||
io.replace("Source/Lib/Decoder/CMakeLists.txt", "list(APPEND PLATFORM_LIBS Threads::Threads)", "", {plain = true}) |
||||
io.replace("Source/Lib/Encoder/CMakeLists.txt", "list(APPEND PLATFORM_LIBS Threads::Threads)", "", {plain = true}) |
||||
elseif package:is_plat("mingw") and package:is_arch("x64", "x86_64") then |
||||
table.insert(configs, "-DCMAKE_SYSTEM_PROCESSOR=AMD64") |
||||
elseif package:is_plat("android") then |
||||
io.replace("CMakeLists.txt", "CMAKE_C_COMPILER_ID MATCHES \"Clang\" AND UNIX AND NOT APPLE", "FALSE", {plain = true}) |
||||
io.replace("Source/Lib/Decoder/CMakeLists.txt", "list(APPEND PLATFORM_LIBS Threads::Threads)", "", {plain = true}) |
||||
io.replace("Source/Lib/Decoder/CMakeLists.txt", "set(LIBS_PRIVATE \"-lpthread -lm\")", "set(LIBS_PRIVATE \"-lm\")", {plain = true}) |
||||
io.replace("Source/Lib/Encoder/CMakeLists.txt", "list(APPEND PLATFORM_LIBS Threads::Threads)", "", {plain = true}) |
||||
io.replace("Source/Lib/Encoder/CMakeLists.txt", "set(LIBS_PRIVATE \"-lpthread -lm\")", "set(LIBS_PRIVATE \"-lm\")", {plain = true}) |
||||
end |
||||
import("package.tools.cmake").install(package, configs) |
||||
end) |
||||
|
||||
on_test(function (package) |
||||
assert(package:has_cfuncs("svt_av1_enc_init_handle", {includes = "svt-av1/EbSvtAv1Enc.h"})) |
||||
end) |
@ -0,0 +1,22 @@ |
||||
package("which") |
||||
|
||||
set_kind("binary") |
||||
set_homepage("https://www.gnu.org/software/which/") |
||||
set_description("shows the full path of (shell) commands") |
||||
|
||||
add_urls("https://ftp.gnu.org/gnu/which/which-$(version).tar.gz", |
||||
"https://carlowood.github.io/which/which-$(version).tar.gz", |
||||
"https://mirrors.ustc.edu.cn/gnu/which/which-$(version).tar.gz") |
||||
add_versions("2.16", "0ac8502e9985a3ac6b0e2aa4f2a60f91cad0dc0cca6dc9c1c142ebba4b8dd664") |
||||
add_versions("2.17", "176fe9c451487eda787dd58d9469d48c95509f49dbb34a574004a936905dd6da") |
||||
add_versions("2.19", "7d79b874f65118ac846a0deb31a8fbd6816cd81e74930299c82103765d45cd52") |
||||
add_versions("2.20", "d417b65c650d88ad26a208293c1c6e3eb60d4b6d847f01ff8f66aca63e2857f8") |
||||
add_versions("2.21", "f4a245b94124b377d8b49646bf421f9155d36aa7614b6ebf83705d3ffc76eaad") |
||||
|
||||
on_install("@bsd", "@linux", "@macosx", function (package) |
||||
import("package.tools.autoconf").install(package) |
||||
end) |
||||
|
||||
on_test(function (package) |
||||
os.vrun("which -v") |
||||
end) |
Loading…
Reference in new issue