From 90d3732247476dbfa1a8f16dd51ed497d09591de Mon Sep 17 00:00:00 2001 From: Quinn Damerell Date: Tue, 13 Feb 2018 09:31:01 -0800 Subject: [PATCH] obs-output: Update ftl-sdk version and ftl logging values --- plugins/obs-outputs/CMakeLists.txt | 2 ++ plugins/obs-outputs/ftl-sdk | 2 +- plugins/obs-outputs/ftl-stream.c | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/plugins/obs-outputs/CMakeLists.txt b/plugins/obs-outputs/CMakeLists.txt index 4177efd46..1bde00a58 100644 --- a/plugins/obs-outputs/CMakeLists.txt +++ b/plugins/obs-outputs/CMakeLists.txt @@ -22,6 +22,8 @@ endif() if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ftl-sdk/CMakeLists.txt") find_package(Libcurl REQUIRED) + add_definitions(-DFTL_STATIC_COMPILE) + include_directories(${LIBCURL_INCLUDE_DIRS}) set(ftl_SOURCES diff --git a/plugins/obs-outputs/ftl-sdk b/plugins/obs-outputs/ftl-sdk index d39456c07..4d58e0655 160000 --- a/plugins/obs-outputs/ftl-sdk +++ b/plugins/obs-outputs/ftl-sdk @@ -1 +1 @@ -Subproject commit d39456c07527a5cb0580c98870c871b2f366ef2e +Subproject commit 4d58e0655ed6020f55c2ad187fb652348a60de1b diff --git a/plugins/obs-outputs/ftl-stream.c b/plugins/obs-outputs/ftl-stream.c index eeb98ed80..1ea06deeb 100644 --- a/plugins/obs-outputs/ftl-stream.c +++ b/plugins/obs-outputs/ftl-stream.c @@ -930,7 +930,7 @@ static void *status_thread(void *data) p->nack_reqs -stream->last_nack_count; stream->last_nack_count = p->nack_reqs; - int log_level = p->nack_reqs > 2 ? LOG_INFO : LOG_DEBUG; + int log_level = p->nack_reqs > 0 ? LOG_INFO : LOG_DEBUG; blog(log_level, "Avg packet send per second %3.1f, " "total nack requests %d", @@ -941,7 +941,7 @@ static void *status_thread(void *data) ftl_packet_stats_instant_msg_t *p = &status.msg.ipkt_stats; - int log_level = p->avg_rtt > 200 ? LOG_INFO : LOG_DEBUG; + int log_level = p->avg_rtt > 20 ? LOG_INFO : LOG_DEBUG; blog(log_level, "avg transmit delay %dms " "(min: %d, max: %d), " @@ -954,7 +954,7 @@ static void *status_thread(void *data) ftl_video_frame_stats_msg_t *v = &status.msg.video_stats; - int log_level = v->queue_fullness > 5 ? + int log_level = v->queue_fullness > 0 ? LOG_INFO : LOG_DEBUG; blog(log_level, "Queue an average of %3.2f fps "