From c9e41194283f65bfd28e4faa251ef1afa347d8d7 Mon Sep 17 00:00:00 2001 From: "chss95cs@gmail.com" Date: Sat, 13 Aug 2022 13:43:45 -0700 Subject: [PATCH] Add branch of ffmpeg with non-recursive split_radix_permutation Add branch of disruptorplus with working blocking_wait_stategy Switch back to blocking wait for timer queue --- .gitmodules | 4 ++-- src/xenia/base/threading_timer_queue.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index a73061e22..3e780194f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -48,7 +48,7 @@ url = https://github.com/fmtlib/fmt.git [submodule "third_party/disruptorplus"] path = third_party/disruptorplus - url = https://github.com/xenia-project/disruptorplus.git + url = https://github.com/chrisps/disruptorpus.git [submodule "third_party/DirectXShaderCompiler"] path = third_party/DirectXShaderCompiler url = https://github.com/microsoft/DirectXShaderCompiler.git @@ -63,7 +63,7 @@ url = https://github.com/Cyan4973/xxHash.git [submodule "third_party/FFmpeg"] path = third_party/FFmpeg - url = https://github.com/xenia-project/FFmpeg.git + url = https://github.com/chrisps/FFmpeg_radixsplit.git [submodule "third_party/premake-androidndk"] path = third_party/premake-androidndk url = https://github.com/Triang3l/premake-androidndk.git diff --git a/src/xenia/base/threading_timer_queue.cc b/src/xenia/base/threading_timer_queue.cc index 5cd7bf1d2..8e19b50dd 100644 --- a/src/xenia/base/threading_timer_queue.cc +++ b/src/xenia/base/threading_timer_queue.cc @@ -36,7 +36,7 @@ using WaitItem = TimerQueueWaitItem; edit: actually had to change it back, when i was testing it only worked because i fixed disruptorplus' code to compile (it gives wrong args to condition_variable::wait_until) but now builds */ -using WaitStrat = dp::spin_wait_strategy;//dp::blocking_wait_strategy; +using WaitStrat = dp::blocking_wait_strategy; class TimerQueue { public: