mirror of
https://github.com/obsproject/obs-studio.git
synced 2024-09-20 13:08:50 +02:00
Merge pull request #1199 from mixer/ftl-update
obs-output: Update ftl-sdk version and ftl logging values
This commit is contained in:
commit
f3551ff5fa
@ -22,6 +22,8 @@ endif()
|
|||||||
if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ftl-sdk/CMakeLists.txt")
|
if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ftl-sdk/CMakeLists.txt")
|
||||||
find_package(Libcurl REQUIRED)
|
find_package(Libcurl REQUIRED)
|
||||||
|
|
||||||
|
add_definitions(-DFTL_STATIC_COMPILE)
|
||||||
|
|
||||||
include_directories(${LIBCURL_INCLUDE_DIRS})
|
include_directories(${LIBCURL_INCLUDE_DIRS})
|
||||||
|
|
||||||
set(ftl_SOURCES
|
set(ftl_SOURCES
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit d39456c07527a5cb0580c98870c871b2f366ef2e
|
Subproject commit 4d58e0655ed6020f55c2ad187fb652348a60de1b
|
@ -930,7 +930,7 @@ static void *status_thread(void *data)
|
|||||||
p->nack_reqs -stream->last_nack_count;
|
p->nack_reqs -stream->last_nack_count;
|
||||||
stream->last_nack_count = p->nack_reqs;
|
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, "
|
blog(log_level, "Avg packet send per second %3.1f, "
|
||||||
"total nack requests %d",
|
"total nack requests %d",
|
||||||
@ -941,7 +941,7 @@ static void *status_thread(void *data)
|
|||||||
ftl_packet_stats_instant_msg_t *p =
|
ftl_packet_stats_instant_msg_t *p =
|
||||||
&status.msg.ipkt_stats;
|
&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 "
|
blog(log_level, "avg transmit delay %dms "
|
||||||
"(min: %d, max: %d), "
|
"(min: %d, max: %d), "
|
||||||
@ -954,7 +954,7 @@ static void *status_thread(void *data)
|
|||||||
ftl_video_frame_stats_msg_t *v =
|
ftl_video_frame_stats_msg_t *v =
|
||||||
&status.msg.video_stats;
|
&status.msg.video_stats;
|
||||||
|
|
||||||
int log_level = v->queue_fullness > 5 ?
|
int log_level = v->queue_fullness > 0 ?
|
||||||
LOG_INFO : LOG_DEBUG;
|
LOG_INFO : LOG_DEBUG;
|
||||||
|
|
||||||
blog(log_level, "Queue an average of %3.2f fps "
|
blog(log_level, "Queue an average of %3.2f fps "
|
||||||
|
Loading…
Reference in New Issue
Block a user