From 90888a29195266c78754e2f01e241b74308e612d Mon Sep 17 00:00:00 2001
From: Azur Ponjavic <azur.ponjavic@rwth-aachen.de>
Date: Wed, 30 Aug 2023 15:19:23 +0200
Subject: [PATCH] minor correction
---
ext/assimp | 2 +-
scenes | 2 +-
src/encoder/nvidia_encoder.cpp | 4 ++--
src/encoder/nvidia_encoder.hpp | 2 +-
src/transport/webrtc_transport.cpp | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ext/assimp b/ext/assimp
index 5b7ff294..67eae8ee 160000
--- a/ext/assimp
+++ b/ext/assimp
@@ -1 +1 @@
-Subproject commit 5b7ff294b83335557f2786ffe70642318851ae17
+Subproject commit 67eae8ee5afa149b11267de8ec87de1538fa80b6
diff --git a/scenes b/scenes
index bfbe8b10..e2a9bbb8 160000
--- a/scenes
+++ b/scenes
@@ -1 +1 @@
-Subproject commit bfbe8b10960580d1c6243034d119a95055de0635
+Subproject commit e2a9bbb8d4b01f09028d90dd8ce87b8171ec86a9
diff --git a/src/encoder/nvidia_encoder.cpp b/src/encoder/nvidia_encoder.cpp
index 70dcd9ea..c2d5cc4d 100644
--- a/src/encoder/nvidia_encoder.cpp
+++ b/src/encoder/nvidia_encoder.cpp
@@ -26,7 +26,7 @@ PFN_vkGetMemoryWin32HandleKHR vkGetMemoryWin32HandleKHR_Func = nullptr;
PFN_vkGetSemaphoreWin32HandleKHR vkGetSemaphoreWin32HandleKHR_Func = nullptr;
#endif
-NvidiaEncoder::NvidiaEncoder() : worker_pool(10)
+NvidiaEncoder::NvidiaEncoder() : worker_pool(1)
{
}
@@ -346,7 +346,7 @@ void NvidiaEncoder::read_frame(NvidiaEncoderFrame::Ptr frame)
#if NVIDIA_ENDODER_ENABLE_SUBFRAMES
lock_stream.doNotWait = 1;
#else
- lock_stream.doNotWait = 1;
+ lock_stream.doNotWait = 0;
#endif
lock_stream.getRCStats = 0;
lock_stream.reservedBitFields = 0;
diff --git a/src/encoder/nvidia_encoder.hpp b/src/encoder/nvidia_encoder.hpp
index ceb40737..84b758ff 100644
--- a/src/encoder/nvidia_encoder.hpp
+++ b/src/encoder/nvidia_encoder.hpp
@@ -11,7 +11,7 @@
#include "encoder.hpp"
-#define NVIDIA_ENCODER_FRAMES 10
+#define NVIDIA_ENCODER_FRAMES 2
struct NvidiaEncoderFrame
{
diff --git a/src/transport/webrtc_transport.cpp b/src/transport/webrtc_transport.cpp
index 1ca2640f..c9f50e56 100644
--- a/src/transport/webrtc_transport.cpp
+++ b/src/transport/webrtc_transport.cpp
@@ -268,7 +268,7 @@ shared_ptr<rtc::PeerConnection> createPeerConnection(weak_ptr<rtc::WebSocket> ww
if (tr->get_state() == TRANSPORT_STATE_CONNECTED) {
TransformId transform_id = (std::to_integer<long long>(msg[1]) | std::to_integer<long long>(msg[2]) << 8 | std::to_integer<long long>(msg[3]) << 16 | std::to_integer<long long>(msg[4]) << 24 | std::to_integer<long long>(msg[5]) << 32 | std::to_integer<long long>(msg[6]) << 40 | std::to_integer<long long>(msg[7]) << 48 | std::to_integer<long long>(msg[8]) << 56);
float htr[16];
- //memcpy(&htr, &msg[9], 64);
+ memcpy(&htr, &msg[9], 64);
//texting only:
auto time = std::chrono::system_clock::now(); // get the current time
--
GitLab